Changeset 2445
- Timestamp:
- 06/14/09 19:17:11
- Files:
-
- trunk/cherrypy/__init__.py (modified) (2 diffs)
- trunk/cherrypy/lib/httputil.py (modified) (2 diffs)
- trunk/cherrypy/py3util.py (deleted)
- trunk/cherrypy/test/test_dynamicobjectmapping.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/__init__.py
r2437 r2445 128 128 newdoc = [cls.__doc__ or ""] 129 129 130 for name in sorted(dct.keys()): 130 dctkeys = dct.keys() 131 dctkeys.sort() 132 for name in dctkeys: 131 133 if name.endswith("__doc"): 132 134 # Remove the magic doc attribute. … … 152 154 153 155 154 from cherrypy.py3util import sorted155 156 from cherrypy._cperror import HTTPError, HTTPRedirect, InternalRedirect 156 157 from cherrypy._cperror import NotFound, CherryPyException, TimeoutError trunk/cherrypy/lib/httputil.py
r2431 r2445 20 20 'maintenance of the server.') 21 21 22 from cherrypy.py3util import sorted, reversed23 22 import re 24 23 import urllib … … 196 195 hv = HeaderElement.from_str(element) 197 196 result.append(hv) 198 199 return list(reversed(sorted(result))) 197 result.sort() 198 result.reverse() 199 return result 200 200 201 201 def decode_TEXT(value): trunk/cherrypy/test/test_dynamicobjectmapping.py
r2413 r2445 4 4 5 5 import cherrypy 6 from cherrypy.py3util import sorted7 6 8 7 script_names = ["", "/foo", "/users/fred/blog", "/corp/blog"] … … 99 98 100 99 def GET(self): 101 return unicode(sorted(user_lookup.keys())) 100 keys = user_lookup.keys() 101 keys.sort() 102 return unicode(keys) 102 103 103 104 def dynamic_dispatch(self, vpath):
