Commits

Robert Brewer committed 81c92cb

A couple of Python 2.3 fixes

Comments (0)

Files changed (2)

cherrypy/test/helper.py

         if self.do_gc_test:
             self.getPage("/gc/stats")
             self.assertBody("Statistics:")
-    # Tell nose to run this last in each class
-    test_gc.compat_co_firstlineno = float('inf')
+    # Tell nose to run this last in each class.
+    # Prefer sys.maxint for Python 2.3, which didn't have float('inf')
+    test_gc.compat_co_firstlineno = getattr(sys, 'maxint', None) or float('inf')
     
     def prefix(self):
         return self.script_name.rstrip("/")

cherrypy/test/test_core.py

         
         class MultiHeader(Test):
             
-            @cherrypy.tools.append_headers(header_list=[
+            def header_list(self):
+                pass
+            header_list = cherrypy.tools.append_headers(header_list=[
                 (ntob('WWW-Authenticate'), ntob('Negotiate')),
                 (ntob('WWW-Authenticate'), ntob('Basic realm="foo"')),
-                ])
-            def header_list(self):
-                pass
+                ])(header_list)
             
             def commas(self):
                 cherrypy.response.headers['WWW-Authenticate'] = 'Negotiate,Basic realm="foo"'
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.