Changeset 148

Timestamp:

02/13/05 08:24:13

Author:

rdelon

Message:

Fixed Ticket #106
Removed ThreadAwareClass? and included a backport of python-2.4's threading.local() implementation

Files:

• trunk/cherrypy/_cpserver.py (modified) (2 diffs)
• trunk/cherrypy/_cpthreadinglocal.py (added)
• trunk/cherrypy/_cputil.py (modified) (1 diff)

trunk/cherrypy/_cpserver.py

@@ -33 +33 @@
-"""
-
-
+, _cpthreadinglocal
-
-def start(configFile = None, parsedConfigFile = None, configMap = {}, initOnly = 0):
@@ -72 +72 @@
-    # Create request and response object (the same objects will be used
-    #   throughout the entire life of the webserver)
-util.ThreadAwareClass
-util.ThreadAwareClass
+threadinglocal.local
+threadinglocal.local
-    # Create threadData object as a thread-specific all-purpose storage
-util.ThreadAwareClass
+threadinglocal.local
-
-    # Initialize a few global variables

trunk/cherrypy/_cputil.py

@@ -41 +41 @@
-    pass
-
-class ThreadAwareClass:
-    """ A thread-safe class for storing/retrieving
-        thread-specific variables """
-
-    def __init__(self):
-        self.__dict__['threadMap'] = {} # Used to store variables
-
-    def __setattr__(self, name, value):
-        id = thread.get_ident()
-        if not self.__dict__['threadMap'].has_key(id):
-            self.__dict__['threadMap'][id] = {}
-        self.threadMap[id][name] = value
-
-    def __getattr__(self, name):
-        id = thread.get_ident()
-        return self.__dict__['threadMap'][id][name]
-
-def getSpecialFunction(name):
-    """ Return the special function """