Changeset 1196

Timestamp:

07/10/06 23:13:50

Author:

fumanchu

Message:

Some tool optimizations.

Files:

• trunk/cherrypy/_cptools.py (modified) (10 diffs)

trunk/cherrypy/_cptools.py

@@ -52 +52 @@
-    
-    def _merged_args(self, d=None):
-
-
+
+
+
+
+
+
+
-        if "on" in conf:
-            del conf["on"]
@@ -113 +118 @@
-        return wrapper
-    
+    def _wrapper(self):
+        if self.callable(**self._merged_args()):
+            cherrypy.request.handler = None
+    
-    def _setup(self):
-        """Hook this tool into cherrypy.request.
@@ -119 +128 @@
-        method when the tool is "turned on" in config.
-        """
-        def wrapper():
-            if self.callable(**self._merged_args()):
-                cherrypy.request.handler = None
-        # Don't pass conf (or our wrapper will get wrapped!)
-
+self._
-
-
@@ -132 +138 @@
-        Tool.__init__(self, None, callable, name)
-    
+    def _wrapper(self):
+        self.callable(**self._merged_args())
+    
-    def _setup(self):
-        """Hook this tool into cherrypy.request.
@@ -138 +147 @@
-        method when the tool is "turned on" in config.
-        """
-
-
-
+
-
-
@@ -148 +155 @@
-from cherrypy.lib import sessions as _sessions, xmlrpc as _xmlrpc
-from cherrypy.lib import caching as _caching, wsgiapp as _wsgiapp
-
-
-class StaticDirTool(MainTool):
-    def _setup(self):
-        """Hook this tool into cherrypy.request using the given conf."""
-        conf = self._merged_args()
-        def wrapper():
-            if self.callable(**conf):
-                cherrypy.request.handler = None
-        # Don't pass conf (or our wrapper will get wrapped!)
-        cherrypy.request.hooks.attach(self._point, wrapper)
-
-
@@ -172 +168 @@
-                setattr(self, k, None)
-    
+    def _init(self):
+        conf = cherrypy.request.toolmap.get(self._name, {})
+        
+        s = cherrypy.request._session = _sessions.Session()
+        # Copy all conf entries onto Session object attributes
+        for k, v in conf.iteritems():
+            setattr(s, str(k), v)
+        s.init()
+        
+        if not hasattr(cherrypy, "session"):
+            cherrypy.session = _sessions.SessionWrapper()
+    
-    def _setup(self):
-        """Hook this tool into cherrypy.request using the given conf.
@@ -178 +186 @@
-        method when the tool is "turned on" in config.
-        """
-        def init():
-            conf = cherrypy.request.toolmap.get(self._name, {})
-            
-            s = cherrypy.request._session = _sessions.Session()
-            # Copy all conf entries onto Session object attributes
-            for k, v in conf.iteritems():
-                setattr(s, str(k), v)
-            s.init()
-            
-            if not hasattr(cherrypy, "session"):
-                cherrypy.session = _sessions.SessionWrapper()
-        # init must be bound after headers are read
-
+self._
-        cherrypy.request.hooks.attach('before_finalize', _sessions.save)
-        cherrypy.request.hooks.attach('on_end_request', _sessions.cleanup)
@@ -236 +233 @@
-        """Hook this tool into cherrypy.request using the given conf."""
-        request = cherrypy.request
+        # Guard against running this method twice.
-        if hasattr(request, 'xmlrpc'):
-            return
@@ -303 +301 @@
-default_toolbox.encode = Tool('before_finalize', encoding.encode)
-default_toolbox.gzip = Tool('before_finalize', encoding.gzip)
-StaticDir
+Main
-default_toolbox.staticfile = MainTool(static.staticfile)
-default_toolbox.sessions = SessionTool()