From 20996d46fc8f05f54a74ead4e6e4752d4440736e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Matos?= Date: Tue, 4 Jun 2019 18:26:13 +0100 Subject: [PATCH] Remove code that is redudant. Both for python2 and python3 output is always a string. (cherry picked from commit 4268a9e8121b08f06706d733e8488e163286eab8) --- lib/scripts/convertDefault.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py index 8678965013..413c944823 100644 --- a/lib/scripts/convertDefault.py +++ b/lib/scripts/convertDefault.py @@ -19,8 +19,6 @@ from __future__ import print_function import os, re, sys -PY2 = sys.version_info[0] == 2 - # We may need some extra options only supported by recent convert versions re_version = re.compile(r'^Version:.*ImageMagick\s*(\d*)\.(\d*)\.(\d*).*$') # imagemagick 7 @@ -34,8 +32,6 @@ if fout.close() != None: fout = os.popen('convert -version 2>&1') output = fout.readline() fout.close() -if not PY2: - output = output.decode() version = re_version.match(output) -- 2.39.5