diff options
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 |