From 79d602b2a01c60575c10153f8f4d24db5d053fb3 Mon Sep 17 00:00:00 2001 From: Jack Wilsdon Date: Wed, 27 Apr 2016 20:33:21 +0100 Subject: [PATCH] Use correct methods for ImageMagick and PIL info --- beetsplug/thumbnails.py | 4 ++-- test/test_thumbnails.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/beetsplug/thumbnails.py b/beetsplug/thumbnails.py index 3977c78ef..0e7fbc6e0 100644 --- a/beetsplug/thumbnails.py +++ b/beetsplug/thumbnails.py @@ -92,11 +92,11 @@ class ThumbnailsPlugin(BeetsPlugin): if not os.path.exists(dir): os.makedirs(dir) - if has_IM(): + if get_im_version(): self.write_metadata = write_metadata_im tool = "IM" else: - assert has_PIL() # since we're local + assert get_pil_version() # since we're local self.write_metadata = write_metadata_pil tool = "PIL" self._log.debug(u"using {0} to write metadata", tool) diff --git a/test/test_thumbnails.py b/test/test_thumbnails.py index 5dd9551b7..30c5bb234 100644 --- a/test/test_thumbnails.py +++ b/test/test_thumbnails.py @@ -66,8 +66,8 @@ class ThumbnailsTest(unittest.TestCase, TestHelper): @patch('beetsplug.thumbnails.os') @patch('beetsplug.thumbnails.ArtResizer') - @patch('beetsplug.thumbnails.has_IM') - @patch('beetsplug.thumbnails.has_PIL') + @patch('beetsplug.thumbnails.get_im_version') + @patch('beetsplug.thumbnails.get_pil_version') @patch('beetsplug.thumbnails.GioURI') def test_check_local_ok(self, mock_giouri, mock_pil, mock_im, mock_artresizer, mock_os):