Changeset 1163
- Timestamp:
- 06/27/06 12:11:19
- Files:
-
- trunk/cherrypy/_cptools.py (modified) (3 diffs)
- trunk/cherrypy/lib/caching.py (modified) (1 diff)
- trunk/cherrypy/lib/encoding.py (moved) (moved from trunk/cherrypy/lib/encodings.py) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cptools.py
r1161 r1163 145 145 # Builtin tools # 146 146 147 from cherrypy.lib import cptools, encoding s, static147 from cherrypy.lib import cptools, encoding, static 148 148 from cherrypy.lib import sessions as _sessions, xmlrpc as _xmlrpc 149 149 from cherrypy.lib import caching as _caching, wsgiapp as _wsgiapp … … 294 294 default_toolbox.err_redirect = ErrorTool(cptools.redirect) 295 295 default_toolbox.etags = Tool('before_finalize', cptools.validate_etags) 296 default_toolbox.decode = Tool('before_main', encoding s.decode)297 default_toolbox.encode = Tool('before_finalize', encoding s.encode)298 default_toolbox.gzip = Tool('before_finalize', encoding s.gzip)296 default_toolbox.decode = Tool('before_main', encoding.decode) 297 default_toolbox.encode = Tool('before_finalize', encoding.encode) 298 default_toolbox.gzip = Tool('before_finalize', encoding.gzip) 299 299 default_toolbox.staticdir = StaticDirTool(static.staticdir) 300 300 default_toolbox.staticfile = MainTool(static.staticfile) … … 305 305 306 306 307 del cptools, encoding s, static307 del cptools, encoding, static trunk/cherrypy/lib/caching.py
r1145 r1163 104 104 # Ignore POST, PUT, DELETE. 105 105 # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.10. 106 if cherrypy.request.method in cherrypy.config.get("tools.caching.invalid_methods", 107 ("POST", "PUT", "DELETE")): 106 invalid = cherrypy.config.get("tools.caching.invalid_methods", 107 ("POST", "PUT", "DELETE")) 108 if cherrypy.request.method in invalid: 108 109 cherrypy.request.cached = c = False 109 110 else: trunk/cherrypy/lib/encoding.py
r1145 r1163 6 6 7 7 def decode(encoding=None, default_encoding='utf-8'): 8 """Decode cherrypy.request.params .""" 8 9 if not encoding: 9 10 ct = cherrypy.request.headers.elements("Content-Type")
