Robert Brewer avatar Robert Brewer committed bc568ce

A few Python 2.3 fixes.

Comments (0)

Files changed (3)

cherrypy/_cpdispatch.py

     classtype = type
 
 import cherrypy
+from cherrypy._cpcompat import set
 
 
 class PageHandler(object):

cherrypy/lib/gctools.py

         if len(refs) > self.maxparents:
             return [("[%s referrers]" % len(refs), [])]
 
+        try:
+            ascendcode = self.ascend.__code__
+        except AttributeError:
+            ascendcode = self.ascend.im_func.func_code
         for parent in refs:
-            if inspect.isframe(parent) and parent.f_code is self.ascend.__code__:
+            if inspect.isframe(parent) and parent.f_code is ascendcode:
                 continue
             if parent in self.ignore:
                 continue

cherrypy/test/test_request_obj.py

                 if show_mismatched_params:
                     self.assertInBody(msg)
                 else:
-                    self.assertInBody("Bad Request")
+                    self.assertInBody("400 Bad")
 
 
         # even if body parameters are wrong, if we get the uri wrong, then 
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.