Remove code that is redudant.

Both for python2 and python3 output is always a string.

(cherry picked from commit 4268a9e8121b08f06706d733e8488e163286eab8)

diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index 8678965013a5aa22b0d0d73ab1c3779efebab848..413c944823cb2a0e66394aadbae0b31d1a65630d 100644 (file)
--- 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)