X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fscripts%2FconvertDefault.py;h=c9277131ac8811cdfcfa1ff764d6d5a7526edee3;hb=d6ce4abd40b2e45d5b3b4344c555cf5712135b31;hp=cd69709a64c2678dcf95573f757dfb39991843f3;hpb=639b5da1afe87ffe2fa4df3f738b838d6637f11a;p=lyx.git diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py index cd69709a64..c9277131ac 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,11 +32,6 @@ if fout.close() != None: fout = os.popen('convert -version 2>&1') output = fout.readline() fout.close() -if not PY2: - # Ensure we have a (unicode) string object in Python3 - # (not required for version >= 3.5). - # FIXME: Check whether this is required with any supported 3.x version! - output = str(output) version = re_version.match(output)