Changeset 1053

Timestamp:

04/22/06 12:18:36

Author:

fumanchu

Message:

Fixed decode, encode, gzip tools and tests.

Files:

• trunk/cherrypy/lib/encodings.py (modified) (1 diff)
• trunk/cherrypy/test/test_decodingencoding_filter.py (modified) (1 diff)
• trunk/cherrypy/test/test_gzip_filter.py (modified) (1 diff)
• trunk/cherrypy/tools.py (modified) (3 diffs)

trunk/cherrypy/lib/encodings.py

@@ +1 @@
+import struct
+import time
+import zlib
+
-import cherrypy
-

trunk/cherrypy/test/test_decodingencoding_filter.py

@@ -24 +24 @@
-            'server.log_to_screen': False,
-            'server.environment': 'production',
-encoding_filter
-decoding_filter.on': True
+tools.encode
+tools.decode.on': True,
-    })
-

trunk/cherrypy/test/test_gzip_filter.py

@@ -30 +30 @@
-                   'server.environment': 'production',
-                   'server.show_tracebacks': True,
-gzip_filter
+tools.gzip
-                   },
-        '/noshow_stream': {'stream_response': True},

trunk/cherrypy/tools.py

@@ -4 +4 @@
-may only offer one if they choose):
-    
-expose various callables that can be used
-wherever needed. The arguments are straightforward and should b
-etailed within the d
+are callables that can be used wherever needed.
+The arguments are straightforward and should be detailed within th
+
-    
-    Function decorators: if the tool exposes a "wrap" callable, that
@@ -26 +26 @@
-
-import cherrypy
-
+encodings, 
-
-# These modules are themselves Tools
@@ -97 +97 @@
-response_headers = Tool('before_finalize', cptools.response_headers)
-virtual_host = Tool('before_request_body', cptools.virtual_host)
+
+decode = Tool('before_main', encodings.decode)
+encode = Tool('before_finalize', encodings.encode)
+gzip = Tool('before_finalize', encodings.gzip)
+
-staticdir = MainTool(static.get_dir)
-staticfile = MainTool(static.get_file)