anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Converters: slightly more pythonic code.

Browse Source
This commit is contained in:
Thibaut Cuvelier 2020-09-16 04:02:51 +02:00
parent 15dbc2b9ab
commit e4065cc1b1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/scripts/convertDefault.py
View File

@ -25,7 +25,7 @@ re_version = re.compile(r'^Version:.*ImageMagick\s*(\d*)\.(\d*)\.(\d*).*$')
command = 'magick'
fout = os.popen('magick -version 2>&1')
output = fout.readline()
if fout.close() != None:
if fout.close() is not None:
# older versions
# caution: windows has a convert.exe for converting file systems
command = 'convert'
@ -39,7 +39,7 @@ version = re_version.match(output)
im = False
gm = False
if version != None:
if version is not None:
major = int(version.group(1))
minor = int(version.group(2))
patch = int(version.group(3))
@ -49,7 +49,7 @@ else:
# Try GraphicsMagick
re_version = re.compile(r'^GraphicsMagick.*http:..www.GraphicsMagick.org.*$')
version = re_version.match(output)
if version != None:
if version is not None:
gm = True
# we need version to be a valid integer 3-tuple
version = (1,0,0)
@ -72,10 +72,10 @@ if sys.argv[3] == 'ppm' and (im and version >= (6,3,5) or gm):
# print (command, sys.argv[2], sys.argv[4], file= sys.stdout)
if (im or gm) and os.system(r'%s %s "%s" %s "%s"' % (command, sopts, sys.argv[2], topts, sys.argv[3] + ':' + sys.argv[4])) != 0:
print (sys.argv[0], 'ERROR', file= sys.stderr)
print ('Execution of "%s" failed.' % command, file= sys.stderr)
print(sys.argv[0], 'ERROR', file= sys.stderr)
print('Execution of "%s" failed.' % command, file= sys.stderr)
sys.exit(1)
elif not im and not gm and sys.platform == 'darwin' and os.system(r'%s "%s" "%s"' % (command, sys.argv[2], sys.argv[4])) != 0:
print (sys.argv[0], 'ERROR', file= sys.stderr)
print ('Execution of "%s" failed.' % command, file= sys.stderr)
print(sys.argv[0], 'ERROR', file= sys.stderr)
print('Execution of "%s" failed.' % command, file=sys.stderr)
sys.exit(1)