Changeset 1235

Timestamp:

08/11/06 15:27:04

Author:

fumanchu

Message:

More-explicit error when illegally passing positional arguments to tool decorators. Also, a new tool test for multiple decorators with kwargs.

Files:

• trunk/cherrypy/_cptools.py (modified) (2 diffs)
• trunk/cherrypy/test/test_tools.py (modified) (2 diffs)

trunk/cherrypy/_cptools.py

@@ -63 +63 @@
-        return conf
-    
-
+args, *
-        """Compile-time decorator (turn on the tool in config).
-        
@@ -73 +73 @@
-            whats_my_base.exposed = True
-        """
+        if args:
+            raise TypeError("The %r Tool does not accept positional "
+                            "arguments; you must use keyword arguments."
+                            % self._name)
-        def wrapper(f):
-            if not hasattr(f, "_cp_config"):

trunk/cherrypy/test/test_tools.py

@@ -85 +85 @@
-        pipe.exposed = True
-        pipe._cp_config = {'hooks.before_request_body': pipe_body}
+        
+        # Multiple decorators; include kwargs just for fun.
+        def decorated_euro(self):
+            yield u"Hello,"
+            yield u"world"
+            yield europoundUnicode
+        decorated_euro.exposed = True
+        decorated_euro = tools.gzip(compress_level=6)(decorated_euro)
+        decorated_euro = tools.encode(errors='ignore')(decorated_euro)
-    
-    root = Root()
@@ -222 +231 @@
-        self.getPage("/euro", headers=[("Accept-Encoding", "gzip")])
-        self.assertInBody(zbuf.getvalue()[:3])
+        
+        zbuf = StringIO.StringIO()
+        zfile = gzip.GzipFile(mode='wb', fileobj=zbuf, compresslevel=6)
+        zfile.write(expectedResult)
+        zfile.close()
+        
+        self.getPage("/decorated_euro", headers=[("Accept-Encoding", "gzip")])
+        self.assertInBody(zbuf.getvalue()[:3])
-    
-    def testBareHooks(self):