Changes to make running py2exe exe happy.

pyfpdb/Configuration.py

@@ -166,10 +166,6 @@ if LOCALE_ENCODING == "US-ASCII":
 
 
 # needs LOCALE_ENCODING (above), imported for sqlite setup in Config class below
-
-FROZEN = hasattr(sys, "frozen")
-EXEC_PATH = get_exec_path()
-
 import Charset
 
 
@@ -617,8 +613,7 @@ class Config:
     def save(self, file = None):
         if file is None:
             file = self.file
-            shutil.move(file, file+".backup", ignore_errors = True)
-
+        shutil.move(file, file+".backup")
         with open(file, 'w') as f:
             self.doc.writexml(f)
 
@@ -1035,9 +1030,3 @@ if __name__== "__main__":
             PrettyPrint(site_node, stream=sys.stdout, encoding="utf-8")
     except:
         print "xml.dom.ext needs PyXML to be installed!"
-
-    print "FROZEN =", FROZEN
-    print "EXEC_PATH =", EXEC_PATH
-
-    print "press enter to end"
-    sys.stdin.readline()

pyfpdb/GuiAutoImport.py

@@ -193,11 +193,7 @@ class GuiAutoImport (threading.Thread):
                 self.doAutoImportBool = True
                 widget.set_label(u'  _Stop Autoimport  ')
                 if self.pipe_to_hud is None:
-                    if Configuration.FROZEN:
-                        path = Configuration.EXEC_PATH
-                        command = "HUD_main.exe"
-                        bs = 0
-                    elif os.name == 'nt':
+                    if os.name == 'nt':
                         path = sys.path[0].replace('\\','\\\\')
                         command = 'python "'+path+'\\HUD_main.py" ' + self.settings['cl_options']
                         bs = 0
@@ -207,7 +203,6 @@ class GuiAutoImport (threading.Thread):
                         bs = 1
 
                     try:
-                        print "opening pipe to HUD"
                         self.pipe_to_hud = subprocess.Popen(command, bufsize=bs,
                                                             stdin=subprocess.PIPE,
                                                             universal_newlines=True)