Mercurial Repositories > cx_freeze Packager / changeset

--- a/.hgtags	Sun Apr 14 14:35:08 2013 +0200
+++ b/.hgtags	Sun Apr 28 18:06:40 2013 +0200
@@ -8,4 +8,8 @@
 bbcf4437e32afc9617bedc28f967c2032b10eb26 release-5.0.5
 caf61887223eba7b44d5e83e779da1f84ea7ca3f release-5.0.6
 94949c60ef54ec495366f7817780edd90009f78f release-5.1.0
+<<<<<<< local
+394efa0e059cd225f2afa7c171f028c0a14607cd release-5.1.1
+=======
 27dcfe29985b53e7a0036a88e868262d62520c79 release-5.1.1
+>>>>>>> other

--- a/ChangeLog	Sun Apr 14 14:35:08 2013 +0200
+++ b/ChangeLog	Sun Apr 28 18:06:40 2013 +0200
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 5.1.1:
+- bug fix
+
 Version 5.1.0:
 - bug fix
 - modified code to do lazy import

--- a/CxFreeze/CxfreezeConfigDialog.py	Sun Apr 14 14:35:08 2013 +0200
+++ b/CxFreeze/CxfreezeConfigDialog.py	Sun Apr 28 18:06:40 2013 +0200
@@ -80,7 +80,7 @@
             d = QDir(os.path.join(modpath, 'initscripts'))
             initList = d.entryList(['*.py'])
             initList.insert(0, '')
-            self.initscriptCombo.addItems(initList)
+            self.initscriptCombo.addItems([os.path.splitext(i)[0] for i in initList])
         
         self.targetDirCompleter = E5DirCompleter(self.targetDirEdit)
         self.extListFileCompleter = E5FileCompleter(self.extListFileEdit)

--- a/PluginCxFreeze.py	Sun Apr 14 14:35:08 2013 +0200
+++ b/PluginCxFreeze.py	Sun Apr 28 18:06:40 2013 +0200
@@ -130,15 +130,18 @@
         # step 2: determine the Python 3 variant
         found = False
         if Utilities.isMacPlatform():
-            checkStr = "Python.framework/Versions/3".lower()
+            checkStrings = ["Python.framework/Versions/3".lower(),
+                            "python3"]
         else:
-            checkStr = "python3"
+            checkStrings = ["python3"]
         for exe in exes:
             try:
                 f = open(exe, "r")
                 line0 = f.readline()
-                if checkStr in line0.lower():
-                    found = True
+                for checkStr in checkStrings:
+                    if checkStr in line0.lower():
+                        found = True
+                        break
             finally:
                 f.close()
             if found:

Binary file PluginCxFreeze.zip has changed