Changeset 1974

Timestamp:

06/04/08 00:11:33

Author:

fumanchu

Message:

Buried a couple socket, threading module imports for easier Google App Engine integration.

Files:

• trunk/cherrypy/_cpserver.py (modified) (2 diffs)
• trunk/cherrypy/process/servers.py (modified) (3 diffs)

trunk/cherrypy/_cpserver.py

@@ -1 +1 @@
-"""Manage HTTP servers with CherryPy."""
-
-import socket
-import warnings
-
@@ -101 +100 @@
-            # Look up the host name, which should be the
-            # safest thing to spit out in a URL.
+            import socket
-            host = socket.gethostname()
-        

trunk/cherrypy/process/servers.py

@@ -1 +1 @@
-"""Adapt an HTTP server."""
-
-import socket
-import threading
-import time
-
@@ -55 +53 @@
-            wait_for_free_port(*self.bind_addr)
-        
+        import threading
-        t = threading.Thread(target=self._start_http_thread)
-        t.setName("HTTPServer " + t.getName())
@@ -171 +170 @@
-    port = int(port)
-    
+    import socket
+    
-    # AF_INET or AF_INET6 socket
-    # Get the correct address family for our host (allows IPv6 addresses)