Replaced the use of "exit()" with "sys.exit()", as this probably

Czarek · Czarek · commit f53391e3c135 · 2013-07-11T10:03:45.000+02:00
the cause of a strange "NameError: exit" when using py2exe, see this topic: https://groups.google.com/d/topic/cefpython/6ucGMZsFojg/discussion
diff --git a/cefpython/.gitignore b/cefpython/.gitignore
@@ -38,3 +38,6 @@ cefpython_py27.so
 cefpython_py32.so
 
 cython_includes/compile_time_constants.pxi
+
+debug_32bit/
+debug_64bit/
diff --git a/cefpython/cef1/linux/compile.py b/cefpython/cef1/linux/compile.py
@@ -46,21 +46,21 @@
 if ret != 0:
     what = raw_input("make failed, press 'y' to continue, 'n' to stop: ")
     if what != "y":
-        exit()
+        sys.exit()
 
 os.chdir("./../cef1/client_handler/")
 ret = subprocess.call("make -f Makefile", shell=True)
 if ret != 0:
     what = raw_input("make failed, press 'y' to continue, 'n' to stop: ")
     if what != "y":
-        exit()
+        sys.exit()
 
 os.chdir("./../v8function_handler/")
 ret = subprocess.call("make -f Makefile", shell=True)
 if ret != 0:
     what = raw_input("make failed, press 'y' to continue, 'n' to stop: ")
     if what != "y":
-        exit()
+        sys.exit()
 
 os.chdir("./../linux/")
 
diff --git a/cefpython/cef1/linux/setup/fix_includes.py b/cefpython/cef1/linux/setup/fix_includes.py
@@ -23,6 +23,7 @@
 import os
 import re
 import shutil
+import sys
 
 def ExceptAllMissing(content):
 
@@ -60,15 +61,15 @@ def ExceptAllMissing(content):
 
 pyxfiles = glob.glob("../../../*.pyx")
 if not len(pyxfiles):
-    exit(1)
+    sys.exit(1)
 pyxfiles = [file for file in pyxfiles if file.find(mainfile) == -1]
 # Now, pyxfiles contains all pyx files except the mainfile (cefpython.pyx),
 # we do not fix includes in mainfile.
 
 # So that this is the right directory we're in.
 if os.path.exists("setup"):
     print("Wrong directory, we should be inside setup!")
-    exit()
+    sys.exit(1)
 
 # Remove old pyx files in setup directory.
 oldpyxfiles = glob.glob("./*.pyx")
@@ -94,7 +95,7 @@ def ExceptAllMissing(content):
         if lineNumber:
             print("WARNING: 'except *' missing in a cdef/cpdef function, "
                   "in file %s on line %d" % (os.path.basename(pyxfile), lineNumber))
-            exit(1)
+            sys.exit(1)
         # Do not remove the newline - so that line numbers are exact with originals.
         (content, subs) = re.subn(r"^include[\t ]+[\"'][^\"'\n\r]+[\"'][\t ]*", "", content, flags=re.MULTILINE)
         if subs:
diff --git a/cefpython/cef1/windows/setup/fix_includes.py b/cefpython/cef1/windows/setup/fix_includes.py
@@ -23,6 +23,7 @@
 import os
 import re
 import shutil
+import sys
 
 def ExceptAllMissing(content):
 
@@ -60,15 +61,15 @@ def ExceptAllMissing(content):
 
 pyxfiles = glob.glob("../../../*.pyx")
 if not len(pyxfiles):
-    exit(1)
+    sys.exit(1)
 pyxfiles = [file for file in pyxfiles if file.find(mainfile) == -1]
 # Now, pyxfiles contains all pyx files except the mainfile (cefpython.pyx),
 # we do not fix includes in mainfile.
 
 # So that this is the right directory we're in.
 if os.path.exists("setup"):
     print("Wrong directory, we should be inside setup!")
-    exit()
+    sys.exit(1)
 
 # Remove old pyx files in setup directory.
 oldpyxfiles = glob.glob("./*.pyx")
@@ -94,7 +95,7 @@ def ExceptAllMissing(content):
         if lineNumber:
             print("WARNING: 'except *' missing in a cdef/cpdef function, "
                   "in file %s on line %d" % (os.path.basename(pyxfile), lineNumber))
-            exit(1)
+            sys.exit(1)
         # Do not remove the newline - so that line numbers are exact with originals.
         (content, subs) = re.subn(r"^include[\t ]+[\"'][^\"'\n\r]+[\"'][\t ]*", "", content, flags=re.MULTILINE)
         if subs:
diff --git a/cefpython/cef3/linux/binaries_32bit/wxpython.py b/cefpython/cef3/linux/binaries_32bit/wxpython.py
@@ -53,7 +53,7 @@ def ExceptHook(excType, excValue, traceObject):
     import traceback, os, time, codecs
     # This hook does the following: in case of exception write it to
     # the "error.log" file, display it to the console, shutdown CEF
-    # and exit application immediately by ignoring "finally" (_exit()).
+    # and exit application immediately by ignoring "finally" (os._exit()).
     errorMsg = "\n".join(traceback.format_exception(excType, excValue,
             traceObject))
     errorFile = GetApplicationPath("error.log")
diff --git a/cefpython/cef3/linux/binaries_64bit/wxpython.py b/cefpython/cef3/linux/binaries_64bit/wxpython.py
@@ -53,7 +53,7 @@ def ExceptHook(excType, excValue, traceObject):
     import traceback, os, time, codecs
     # This hook does the following: in case of exception write it to
     # the "error.log" file, display it to the console, shutdown CEF
-    # and exit application immediately by ignoring "finally" (_exit()).
+    # and exit application immediately by ignoring "finally" (os._exit()).
     errorMsg = "\n".join(traceback.format_exception(excType, excValue,
             traceObject))
     errorFile = GetApplicationPath("error.log")
diff --git a/cefpython/cef3/linux/compile.py b/cefpython/cef3/linux/compile.py
@@ -47,21 +47,21 @@
 if ret != 0:
     what = raw_input("make failed, press 'y' to continue, 'n' to stop: ")
     if what != "y":
-        exit()
+        sys.exit(1)
 
 os.chdir("./../cef3/client_handler/")
 ret = subprocess.call("make -f Makefile", shell=True)
 if ret != 0:
     what = raw_input("make failed, press 'y' to continue, 'n' to stop: ")
     if what != "y":
-        exit()
+        sys.exit(1)
 
 os.chdir("./../subprocess/")
 ret = subprocess.call("make -f Makefile", shell=True)
 if ret != 0:
     what = raw_input("make failed, press 'y' to continue, 'n' to stop: ")
     if what != "y":
-        exit()
+        sys.exit(1)
 subprocess_exe = "./../linux/binaries_%s/subprocess" % (BITS)
 shutil.copyfile("./subprocess", subprocess_exe)
 st = os.stat(subprocess_exe)
@@ -72,7 +72,7 @@
 # if ret != 0:
 #     what = raw_input("make failed, press 'y' to continue, 'n' to stop: ")
 #     if what != "y":
-#         exit()
+#         sys.exit(1)
 
 os.chdir("./../linux/")
 
diff --git a/cefpython/cef3/linux/setup/fix_includes.py b/cefpython/cef3/linux/setup/fix_includes.py
@@ -23,6 +23,7 @@
 import os
 import re
 import shutil
+import sys
 
 def ExceptAllMissing(content):
 
@@ -60,15 +61,15 @@ def ExceptAllMissing(content):
 
 pyxfiles = glob.glob("../../../*.pyx")
 if not len(pyxfiles):
-    exit(1)
+    sys.exit(1)
 pyxfiles = [file for file in pyxfiles if file.find(mainfile) == -1]
 # Now, pyxfiles contains all pyx files except the mainfile (cefpython.pyx),
 # we do not fix includes in mainfile.
 
 # So that this is the right directory we're in.
 if os.path.exists("setup"):
     print("Wrong directory, we should be inside setup!")
-    exit()
+    sys.exit(1)
 
 # Remove old pyx files in setup directory.
 oldpyxfiles = glob.glob("./*.pyx")
@@ -94,7 +95,7 @@ def ExceptAllMissing(content):
         if lineNumber:
             print("WARNING: 'except *' missing in a cdef/cpdef function, "
                   "in file %s on line %d" % (os.path.basename(pyxfile), lineNumber))
-            exit(1)
+            sys.exit(1)
         # Do not remove the newline - so that line numbers are exact with originals.
         (content, subs) = re.subn(r"^include[\t ]+[\"'][^\"'\n\r]+[\"'][\t ]*", "", content, flags=re.MULTILINE)
         if subs:
diff --git a/cefpython/cef3/windows/binaries/pyqt.py b/cefpython/cef3/windows/binaries/pyqt.py
@@ -46,7 +46,7 @@ def ExceptHook(excType, excValue, traceObject):
     import traceback, os, time, codecs
     # This hook does the following: in case of exception write it to
     # the "error.log" file, display it to the console, shutdown CEF
-    # and exit application immediately by ignoring "finally" (_exit()).
+    # and exit application immediately by ignoring "finally" (os._exit()).
     errorMsg = "\n".join(traceback.format_exception(excType, excValue,
             traceObject))
     errorFile = GetApplicationPath("error.log")
diff --git a/cefpython/cef3/windows/binaries/pyside.py b/cefpython/cef3/windows/binaries/pyside.py
@@ -48,7 +48,7 @@ def ExceptHook(excType, excValue, traceObject):
     import traceback, os, time, codecs
     # This hook does the following: in case of exception write it to
     # the "error.log" file, display it to the console, shutdown CEF
-    # and exit application immediately by ignoring "finally" (_exit()).
+    # and exit application immediately by ignoring "finally" (os._exit()).
     errorMsg = "\n".join(traceback.format_exception(excType, excValue,
             traceObject))
     errorFile = GetApplicationPath("error.log")
diff --git a/cefpython/cef3/windows/binaries/wxpython.py b/cefpython/cef3/windows/binaries/wxpython.py
@@ -52,7 +52,7 @@ def ExceptHook(excType, excValue, traceObject):
     import traceback, os, time, codecs
     # This hook does the following: in case of exception write it to
     # the "error.log" file, display it to the console, shutdown CEF
-    # and exit application immediately by ignoring "finally" (_exit()).
+    # and exit application immediately by ignoring "finally" (os._exit()).
     errorMsg = "\n".join(traceback.format_exception(excType, excValue,
             traceObject))
     errorFile = GetApplicationPath("error.log")
diff --git a/cefpython/cef3/windows/setup/fix_includes.py b/cefpython/cef3/windows/setup/fix_includes.py
@@ -23,6 +23,7 @@
 import os
 import re
 import shutil
+import sys
 
 def ExceptAllMissing(content):
 
@@ -58,15 +59,15 @@ def ExceptAllMissing(content):
 
 pyxfiles = glob.glob("../../../*.pyx")
 if not len(pyxfiles):
-    exit(1)
+    sys.exit(1)
 pyxfiles = [file for file in pyxfiles if file.find(mainfile) == -1]
 # Now, pyxfiles contains all pyx files except the mainfile (cefpython.pyx),
 # we do not fix includes in mainfile.
 
 # So that this is the right directory we're in.
 if os.path.exists("setup"):
     print("Wrong directory, we should be inside setup!")
-    exit()
+    sys.exit(1)
 
 # Remove old pyx files in setup directory.
 oldpyxfiles = glob.glob("./*.pyx")
@@ -92,7 +93,7 @@ def ExceptAllMissing(content):
         if lineNumber:
             print("WARNING: 'except *' missing in a cdef/cpdef function, "
                   "in file %s on line %d" % (os.path.basename(pyxfile), lineNumber))
-            exit(1)
+            sys.exit(1)
         # Do not remove the newline - so that line numbers are exact with originals.
         (content, subs) = re.subn(r"^include[\t ]+[\"'][^\"'\n\r]+[\"'][\t ]*", "", content, flags=re.MULTILINE)
         if subs:
diff --git a/cefpython/cefpython.pyx b/cefpython/cefpython.pyx
@@ -159,7 +159,7 @@ def Initialize(applicationSettings=None):
         cdef int exitCode = CefExecuteProcess(cefMainArgs, cefApp)
         Debug("CefExecuteProcess(): exitCode = %s" % exitCode)
         if exitCode >= 0:
-            exit(exitCode)
+            sys.exit(exitCode)
 
     if not applicationSettings:
         applicationSettings = {}
