Changeset 1733

Timestamp:

10/01/07 17:27:48

Author:

fumanchu

Message:

Bah. isAlive is a function, not a property.

Files:

• branches/cherrypy-3.0.x/cherrypy/wsgiserver/__init__.py (modified) (1 diff)
• trunk/cherrypy/wsgiserver/__init__.py (modified) (3 diffs)

branches/cherrypy-3.0.x/cherrypy/wsgiserver/__init__.py

@@ -971 +971 @@
-        while self._workerThreads:
-            worker = self._workerThreads.pop()
-
+()
-                try:
-                    worker.join()

trunk/cherrypy/wsgiserver/__init__.py

@@ -1036 +1036 @@
-        while self._workerThreads:
-            worker = self._workerThreads.pop()
-
+()
-                try:
-                    if timeout is None or timeout < 0:
@@ -1042 +1042 @@
-                    else:
-                        worker.join(timeout)
-
+()
-                            # We exhausted the timeout.
-                            # Forcibly shut down the socket.
@@ -1057 +1057 @@
-                        # See http://www.cherrypy.org/ticket/691.
-                        KeyboardInterrupt), exc1:
-                    print exc1
-                    pass
-