[LyX/2.3.x] Remove code that is redudant.

Richard Kimberly Heck rikiheck at lyx.org
Tue Feb 25 23:06:10 UTC 2020


commit 20996d46fc8f05f54a74ead4e6e4752d4440736e
Author: José Matos <jamatos at lyx.org>
Date:   Tue Jun 4 18:26:13 2019 +0100

    Remove code that is redudant.
    
    Both for python2 and python3 output is always a string.
    
    (cherry picked from commit 4268a9e8121b08f06706d733e8488e163286eab8)
---
 lib/scripts/convertDefault.py |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index 8678965..413c944 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,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)
 


More information about the lyx-cvs mailing list