Changeset 2066

Timestamp:

11/08/08 11:39:50

Author:

fumanchu

Message:

Backport of [2013] to branches/3.1.x.

Files:

• branches/cherrypy-3.1.x/cherrypy/_cptools.py (modified) (1 diff)
• branches/cherrypy-3.1.x/cherrypy/test/test_etags.py (modified) (4 diffs)

branches/cherrypy-3.1.x/cherrypy/_cptools.py

@@ -467 +467 @@
-_d.log_hooks = Tool('on_end_request', cptools.log_hooks, priority=100)
-_d.err_redirect = ErrorTool(cptools.redirect)
-
+, priority=75
-_d.decode = Tool('before_handler', encoding.decode)
-# the order of encoding, gzip, caching is important

branches/cherrypy-3.1.x/cherrypy/test/test_etags.py

@@ -18 +18 @@
-                raise cherrypy.HTTPError(code)
-        fail.exposed = True
+        
+        def unicoded(self):
+            return u'I am a \u1ee4nicode string.'
+        unicoded.exposed = True
+        unicoded._cp_config = {'tools.encode.on': True}
-    
-    conf = {'/': {'tools.etags.on': True,
-
+
+
-    cherrypy.tree.mount(Root(), config=conf)
-    cherrypy.config.update({'environment': 'test_suite'})
@@ -28 +34 @@
-class ETagTest(helper.CPWebCase):
-    
-ET
+_et
-        self.getPage("/resource")
-        self.assertStatus('200 OK')
@@ -54 +60 @@
-        self.getPage("/resource", headers=[('If-None-Match', "a bogus tag")])
-        self.assertStatus("200 OK")
+    
+    def test_errors(self):
+        self.getPage("/resource")
+        self.assertStatus(200)
+        etag = self.assertHeader('ETag')
-        
-        # Test raising errors in page handler
@@ -64 +75 @@
-        self.getPage("/fail/304", headers=[('If-None-Match', "*")])
-        self.assertStatus(304)
+    
+    def test_unicode_body(self):
+        self.getPage("/unicoded")
+        self.assertStatus(200)
+        etag1 = self.assertHeader('ETag')
+        self.getPage("/unicoded", headers=[('If-Match', etag1)])
+        self.assertStatus(200)
+        self.assertHeader('ETag', etag1)
-
-