Ticket #581: macexecv.patch

cherrypy/_cpengine.py

@@ -112 +112 @@
-        
-        if sys.platform == "win32":
-            args = ['"%s"' % arg for arg in args]
+        elif sys.platform == "darwin":
+            # Can't call "execv" on darwin with more than one active thread
+            for thread in threading.enumerate():
+                if thread == threading.currentThread() or not thread.isAlive():
+                    continue
+                if hasattr(thread, 'cancel'):
+                    cherrypy.log("Quitting thread: %s" % thread, "ENGINE")
+                    thread.cancel()
+                    thread.join()
+                else:
+                    cherrypy.log("Can't quit thread: %s" % thread, "ENGINE")
+
+            try:
+                os.execv(sys.executable, args)
+            except:
+                cherrypy.log("Couldn't restart, retrying...", "ENGINE")
+                os.execv(sys.executable, args)
-        os.execv(sys.executable, args)
-    
-    def autoreload(self):