Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 78367 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78367 | tarek.ziade | 2010-02-23 00:53:05 -0500 (Tue, 23 Feb 2010) | 1 line

  fixed #5801: removed spurious empty lines in wsgiref
........
This commit is contained in:
Tarek Ziadé 2010-02-23 06:00:04 +00:00
parent c339978b1b
commit 8e615ae3bb
5 changed files with 2 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Lib/wsgiref/handlers.py
View File

@ -20,7 +20,6 @@ def format_date_time(timestamp):
)
class BaseHandler:
"""Manage the invocation of a WSGI application"""
@ -55,13 +54,6 @@ class BaseHandler:
headers = None
bytes_sent = 0
def run(self, application):
"""Invoke the application"""
# Note to self: don't move the close()! Asynchronous servers shouldn't
@ -351,15 +343,6 @@ class BaseHandler:
raise NotImplementedError
class SimpleHandler(BaseHandler):
"""Handler that's just initialized with streams, environment, etc.
@ -430,23 +413,6 @@ class BaseCGIHandler(SimpleHandler):
origin_server = False
class CGIHandler(BaseCGIHandler):
"""CGI-based invocation via sys.stdin/stdout/stderr and os.environ
@ -471,20 +437,3 @@ class CGIHandler(BaseCGIHandler):
self, sys.stdin, sys.stdout, sys.stderr, dict(os.environ.items()),
multithread=False, multiprocess=True
)
#

36
Lib/wsgiref/headers.py
View File

@ -25,18 +25,6 @@ def _formatparam(param, value=None, quote=1):
return param
class Headers:
"""Manage a collection of HTTP response headers"""
@ -87,10 +75,6 @@ class Headers:
"""
return self.get(name)
def __contains__(self, name):
"""Return true if the message contains the header."""
return self.get(name) is not None
@ -127,9 +111,6 @@ class Headers:
"""
return [k for k, v in self._headers]
def values(self):
"""Return a list of all header values.
@ -171,7 +152,6 @@ class Headers:
else:
return result
def add_header(self, _name, _value, **_params):
"""Extended header setting.
@ -200,19 +180,3 @@ class Headers:
v = self._convert_string_type(v)
parts.append(_formatparam(k.replace('_', '-'), v))
self._headers.append((self._convert_string_type(_name), "; ".join(parts)))
#

50
Lib/wsgiref/simple_server.py
View File

@ -38,8 +38,6 @@ class ServerHandler(SimpleHandler):
class WSGIServer(HTTPServer):
"""BaseHTTPServer that implements the Python WSGI protocol"""
@ -69,18 +67,6 @@ class WSGIServer(HTTPServer):
class WSGIRequestHandler(BaseHTTPRequestHandler):
server_version = "WSGIServer/" + __version__
@ -139,29 +125,6 @@ class WSGIRequestHandler(BaseHTTPRequestHandler):
def demo_app(environ,start_response):
from io import StringIO
stdout = StringIO()
@ -190,16 +153,3 @@ if __name__ == '__main__':
import webbrowser
webbrowser.open('http://localhost:8000/xyz?abc')
httpd.handle_request() # serve one request, then exit
#

40
Lib/wsgiref/util.py
View File

@ -32,13 +32,6 @@ class FileWrapper:
return data
raise StopIteration
def guess_scheme(environ):
"""Return a guess for whether 'wsgi.url_scheme' should be 'http' or 'https'
"""
@ -161,7 +154,6 @@ def setup_testing_defaults(environ):
_hoppish = {
'connection':1, 'keep-alive':1, 'proxy-authenticate':1,
'proxy-authorization':1, 'te':1, 'trailers':1, 'transfer-encoding':1,
@ -171,35 +163,3 @@ _hoppish = {
def is_hop_by_hop(header_name):
"""Return true if 'header_name' is an HTTP/1.1 "Hop-by-Hop" header"""
return _hoppish(header_name.lower())
#

2
Misc/NEWS
View File

@ -254,6 +254,8 @@ C-API
Library
-------
- Issue #5801: removed spurious empty lines in wsgiref.
- Issue #6666: fix bug in trace.py that applied the list of directories
to be ignored only to the first file. Noted by Bogdan Opanchuk.