From 09abd9802aa337f20ba83c3a0a6155cbf964b7c4 Mon Sep 17 00:00:00 2001 From: ababyduck Date: Thu, 25 Apr 2019 05:50:11 -0700 Subject: [PATCH] Make `get_im_version()` return same types across all conditions `get_im_version` should now always return a tuple containing: - index 0: a tuple representing the version - index 1: a bool or None, representing legacy status --- beets/util/artresizer.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/beets/util/artresizer.py b/beets/util/artresizer.py index 427a5411d..7ae5fd63f 100644 --- a/beets/util/artresizer.py +++ b/beets/util/artresizer.py @@ -232,9 +232,9 @@ class ArtResizer(six.with_metaclass(Shareable, object)): def _check_method(): """Return a tuple indicating an available method and its version.""" try: - version, im_legacy = get_im_version() - if version: - return IMAGEMAGICK, version, im_legacy + version, legacy = get_im_version() + if version > (0, 0, 0): + return IMAGEMAGICK, version, legacy except TypeError: pass @@ -274,7 +274,7 @@ def get_im_version(): except (subprocess.CalledProcessError, OSError) as exc: log.debug(u'ImageMagick version check failed: {}', exc) - return (0, None) + return ((0,), None) def get_pil_version():