PluginCxFreeze.py

changeset 127
a76379d552f2
parent 125
13f16f4e355a
child 130
c15aad5f55cf
--- a/PluginCxFreeze.py	Tue Jun 23 19:23:45 2020 +0200
+++ b/PluginCxFreeze.py	Wed Oct 14 18:42:59 2020 +0200
@@ -24,7 +24,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "7.0.0"
+version = "7.1.0"
 className = "CxFreezePlugin"
 packageName = "CxFreeze"
 shortDescription = "Show the CxFreeze dialogs."
@@ -178,20 +178,17 @@
         _exePy3 = set()
         versionArgs = ["-c", "import sys; print(sys.version_info[0])"]
         for exe in exes:
-            try:
-                f = open(exe, "r")
+            with open(exe, "r") as f:
                 line0 = f.readline()
-                program = line0.replace("#!", "").strip()
-                process = QProcess()
-                process.start(program, versionArgs)
-                process.waitForFinished(5000)
-                # get a QByteArray of the output
-                versionBytes = process.readAllStandardOutput()
-                versionStr = str(versionBytes, encoding='utf-8').strip()
-                if versionStr == "3":
-                    _exePy3.add(exe)
-            finally:
-                f.close()
+            program = line0.replace("#!", "").strip()
+            process = QProcess()
+            process.start(program, versionArgs)
+            process.waitForFinished(5000)
+            # get a QByteArray of the output
+            versionBytes = process.readAllStandardOutput()
+            versionStr = str(versionBytes, encoding='utf-8').strip()
+            if versionStr == "3":
+                _exePy3.add(exe)
         
         executables = _exePy3
     
@@ -373,7 +370,7 @@
         from CxFreeze.CxfreezeConfigDialog import CxfreezeConfigDialog
         parms = project.getData('PACKAGERSPARMS', "CXFREEZE")
         dlg = CxfreezeConfigDialog(project, exe, parms)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             args, parms = dlg.generateParameters()
             project.setData('PACKAGERSPARMS', "CXFREEZE", parms)
             
@@ -384,7 +381,7 @@
             res = dia.start(args, parms, project.ppath,
                             project.getMainScript())
             if res:
-                dia.exec_()
+                dia.exec()
 
 #
 # eflag: noqa = M801

eric ide

mercurial