From 52794432f02112eb7c912ef8855c6a6fe82a99d1 Mon Sep 17 00:00:00 2001 From: Latosha Maltba Date: Mon, 22 Mar 2021 18:17:40 +0000 Subject: [PATCH] Make code for ImageMagick/GraphicsMagick more symmetric --- Tests/helper.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Tests/helper.py b/Tests/helper.py index ad8138ccc..59ba0dd15 100644 --- a/Tests/helper.py +++ b/Tests/helper.py @@ -259,11 +259,12 @@ def netpbm_available(): def magick_command(): if sys.platform == "win32": - imagemagick = os.environ.get("MAGICK_HOME", "") - if imagemagick: - imagemagick = [os.path.join(imagemagick, "convert.exe")] - graphicsmagick = [os.path.join(imagemagick, "gm.exe"), "convert"] + magickhome = os.environ.get("MAGICK_HOME", "") + if magickhome: + imagemagick = [os.path.join(magickhome, "convert.exe")] + graphicsmagick = [os.path.join(magickhome, "gm.exe"), "convert"] else: + imagemagick = None graphicsmagick = None else: imagemagick = ["convert"]