From e00640e7dd4d8feca8070ea1314e79d7f8f226c2 Mon Sep 17 00:00:00 2001 From: ababyduck Date: Wed, 24 Apr 2019 09:35:56 -0700 Subject: [PATCH] Handle TypeError exception when no ImageMagick install is present Fixes an error introduced in 1a6e0a7 where a TypeError exception was raised when calling `_check_method()` with no ImageMagick installation present. --- beets/util/artresizer.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/beets/util/artresizer.py b/beets/util/artresizer.py index 49dc21a93..ad1521bcf 100644 --- a/beets/util/artresizer.py +++ b/beets/util/artresizer.py @@ -227,9 +227,12 @@ class ArtResizer(six.with_metaclass(Shareable, object)): @staticmethod def _check_method(): """Return a tuple indicating an available method and its version.""" - version, isLegacy = get_im_version() - if version: - return IMAGEMAGICK, version, isLegacy + try: + version, isLegacy = get_im_version() + if version: + return IMAGEMAGICK, version, isLegacy + except TypeError: + pass version = get_pil_version() if version: