anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove code that is redudant.

Browse Source 
Both for python2 and python3 output is always a string.
This commit is contained in:
José Matos 2019-06-04 18:26:13 +01:00
parent 2519666166
commit 4268a9e812
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/scripts/convertDefault.py
View File

@ -19,8 +19,6 @@
from __future__ import print_function from __future__ import print_function
import os, re, sys import os, re, sys
PY2 = sys.version_info[0] == 2
# We may need some extra options only supported by recent convert versions # We may need some extra options only supported by recent convert versions
re_version = re.compile(r'^Version:.*ImageMagick\s*(\d*)\.(\d*)\.(\d*).*$') re_version = re.compile(r'^Version:.*ImageMagick\s*(\d*)\.(\d*)\.(\d*).*$')
# imagemagick 7 # imagemagick 7
@ -34,11 +32,6 @@ if fout.close() != None:
fout = os.popen('convert -version 2>&1') fout = os.popen('convert -version 2>&1')
output = fout.readline() output = fout.readline()
fout.close() 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) version = re_version.match(output)