Remove profiling.py

[lyx.git] / lib / scripts / convertDefault.py

diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index cd69709a64c2678dcf95573f757dfb39991843f3..460f712fe3f028ac9526ead93721ff32be2d3313 100644 (file)
--- a/lib/scripts/convertDefault.py
+++ b/lib/scripts/convertDefault.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # file convertDefault.py
 # This file is part of LyX, the document processor.
 # Licence details can be found in the file COPYING.
@@ -16,29 +14,21 @@
 # replacement in ~/.lyx/scripts
 
 # converts an image $2 (format $1) to $4 (format $3)
-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
 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'
     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)
 
@@ -46,7 +36,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))
@@ -56,10 +46,12 @@ 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)
+    else:
+        version = (0,0,0)
 
 # IM >= 5.5.8 separates options for source and target files
 # See http://www.imagemagick.org/Usage/basics/#why
@@ -78,11 +70,11 @@ if sys.argv[3] == 'ppm' and (im and version >= (6,3,5) or gm):
     topts = '-flatten'
 
 # 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)
+if (im or gm) and os.system(r'{} {} "{}" {} "{}"'.format(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)
     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)
+elif not im and not gm and sys.platform == 'darwin' and os.system(fr'{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)
     sys.exit(1)