Ticket #309: localwrap.diff

test/helper.py

@@ -101 +101 @@
-        if body is not None:
-            body = StringIO.StringIO(body)
-        
+        cherrypy.request.purge__()
+        cherrypy.response.purge__()
+        cherrypy.threadData.purge__()
+        
-        cherrypy.server.request((self.HOST, self.PORT), self.HOST,
-                                requestLine, headers, body, "http")
-        

test/test_core.py

@@ -253 +253 @@
-
-    def upload(self, file):
-        return "Size: %s" % len(file.file.read())
+
+class ThreadData(Test):
+    
+    def index(self):
+        existing = repr(getattr(cherrypy.threadData, "asdf", None))
+        cherrypy.threadData.asdf = "hello"
+        return existing
+
-
-logFile = os.path.join(localDir, "error.log")
-logAccessFile = os.path.join(localDir, "access.log")
@@ -309 +317 @@
-            ('/foo/bar', 'baz', 'that2'),
-            ('/foo/nex', 'baz', 'that2'),
-        ]
+        cherrypy.request.purge__()
-        for path, key, expected in tests:
-            cherrypy.request.path = path
-            result = cherrypy.config.get(key, None)
@@ -668 +677 @@
-            self.getPage('/maxrequestsize/upload', h, "POST", b)
-            self.assertStatus("413 Request Entity Too Large")
-            self.assertInBody("Request Entity Too Large")
+    
+    def testEmptyThreadlocals(self):
+        results = []
+        for x in xrange(20):
+            self.getPage("/threaddata/")
+            results.append(self.body)
+        self.assertEqual(results, ["None"] * 20)
+
-
-if __name__ == '__main__':
-    helper.testmain()

_cphttpserver.py

@@ -81 +81 @@
-        if not self.parse_request(): # An error code has been sent, just exit
-            return
-        
+        cherrypy.request.purge__()
+        cherrypy.response.purge__()
+        cherrypy.threadData.purge__()
+        
-        cherrypy.request.multithread = cherrypy.config.get("server.threadPool") > 1
-        cherrypy.request.multiprocess = False
-        cherrypy.server.request(self.client_address,

_cpwsgi.py

@@ -88 +88 @@
-        sys.stderr = NullWriter()
-    
-    try:
+        cherrypy.request.purge__()
+        cherrypy.response.purge__()
+        cherrypy.threadData.purge__()
+        
-        # LOGON_USER is served by IIS, and is the name of the
-        # user after having been mapped to a local account.
-        # Both IIS and Apache set REMOTE_USER, when possible.

__init__.py

@@ -53 +53 @@
-    from threading import local
-except ImportError:
-    from cherrypy._cpthreadinglocal import local
+
+# Create a threadlocal object to hold the request, response,
+# and threadData objects. In this way, we can easily dump
+# those objects when we stop/start a new HTTP conversation.
+serving = local()
+
+class _AttributeDump:
+    pass
-
+class _ThreadLocalWrapper:
+    
+    def __init__(self, attrname):
+        self.__dict__["__attrname__"] = attrname
+    
+    def purge__(self):
+        """Make a new, emtpy proxied object in cherrypy.serving."""
+        setattr(serving, self.__attrname__, _AttributeDump())
+    
+    def __getattr__(self, name):
+        childobject = getattr(serving, self.__attrname__)
+        return getattr(childobject, name)
+    
+    def __setattr__(self, name, value):
+        childobject = getattr(serving, self.__attrname__)
+        setattr(childobject, name, value)
+    
+    def __delattr__(self, name):
+        childobject = getattr(serving, self.__attrname__)
+        delattr(childobject, name)
+
+
-# Create request and response object (the same objects will be used
-
-
-
+
+
+
+
-
-# Create threadData object as a thread-specific all-purpose storage
-local(
+_ThreadLocalWrapper('threadData'
-
-# Create variables needed for session (see lib/sessionfilter.py for more info)
-from lib.filter import sessionfilter