diff options
| author | Robert Brewer <fumanchu@aminus.org> | 2006-08-24 07:02:42 +0000 |
|---|---|---|
| committer | Robert Brewer <fumanchu@aminus.org> | 2006-08-24 07:02:42 +0000 |
| commit | e8f50e034080ee4c9f97c503d1ce806fb2b51aea (patch) | |
| tree | 57bcce766684de7ff4b91d4a6854a640aeea5a0a /cherrypy/lib | |
| parent | 27d3a90cc608f4efa0e6b6ca1ba48a995356b5ef (diff) | |
| download | cherrypy-git-e8f50e034080ee4c9f97c503d1ce806fb2b51aea.tar.gz | |
Overhaul of config system:
1. New docstring for config module!
2. Put all entries into a config namespace. New deadlock, log, request and response namespaces.
3. Request and response entries now directly modify attributes of cherrypy.request and .response, and consumer code looks up those attributes, not config. This also allows interactive inspection of defaults.
4. Removed 'log_config' config entry. Use engine.on_start_engine_list.append(config.log_config) instead.
5. Old 'dispatch' entry is now 'request.dispatch'.
6. New log entries: log.error.file, log.error.function, log.access.file, log.access.function, log.screen.
7. 'server.max_request_body_size' is now 'request.max_body_size'.
8. environments now only apply to globalconf.
9. The 'development' environment has been removed, since its settings were all the default anyway.
10. The 'embedded' environment has been removed, since it duplicates the 'production' environment now.
11. There's a new 'test_suite' environment.
12. Removed log_file_not_found (from static.py).
Something still needs to be done to config.wrap, so it can take dotted names as kwarg keys.
Diffstat (limited to 'cherrypy/lib')
| -rw-r--r-- | cherrypy/lib/encoding.py | 3 | ||||
| -rw-r--r-- | cherrypy/lib/static.py | 2 | ||||
| -rw-r--r-- | cherrypy/lib/wsgiapp.py | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/cherrypy/lib/encoding.py b/cherrypy/lib/encoding.py index 989c8460..2a6a8846 100644 --- a/cherrypy/lib/encoding.py +++ b/cherrypy/lib/encoding.py @@ -88,8 +88,7 @@ def find_acceptable_charset(encoding=None, default_encoding='utf-8', errors='str attempted_charsets = [] - stream = cherrypy.config.get("stream_response", False) - if stream: + if cherrypy.response.stream: encoder = encode_stream else: response.collapse_body() diff --git a/cherrypy/lib/static.py b/cherrypy/lib/static.py index fe61df15..83d9c272 100644 --- a/cherrypy/lib/static.py +++ b/cherrypy/lib/static.py @@ -38,8 +38,6 @@ def serve_file(path, content_type=None, disposition=None, name=None): try: stat = os.stat(path) except OSError: - if cherrypy.config.get('log_file_not_found', False): - cherrypy.log(" NOT FOUND file: %s" % path, "DEBUG") raise cherrypy.NotFound() if os.path.isdir(path): diff --git a/cherrypy/lib/wsgiapp.py b/cherrypy/lib/wsgiapp.py index 4003d7ac..9743fd43 100644 --- a/cherrypy/lib/wsgiapp.py +++ b/cherrypy/lib/wsgiapp.py @@ -17,7 +17,7 @@ def make_environ(): for hosting WSGI apps in non-WSGI environments (yikes!) """ - # create and populate the wsgi environment + # create and populate the wsgi environ environ = dict() environ["wsgi.version"] = (1,0) environ["wsgi.url_scheme"] = cherrypy.request.scheme |