[Python-checkins] r78369 - in python/branches/py3k: Lib/wsgiref/handlers.py Lib/wsgiref/headers.py Lib/wsgiref/simple_server.py Lib/wsgiref/util.py Misc/NEWS

Tue Feb 23 07:00:04 CET 2010

Author: tarek.ziade
Date: Tue Feb 23 07:00:04 2010
New Revision: 78369
Log:
Merged revisions 78367 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r78367 | tarek.ziade | 2010年02月23日 00:53:05 -0500 (2010年2月23日) | 1 line
 
 fixed #5801: removed spurious empty lines in wsgiref
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/wsgiref/handlers.py
 python/branches/py3k/Lib/wsgiref/headers.py
 python/branches/py3k/Lib/wsgiref/simple_server.py
 python/branches/py3k/Lib/wsgiref/util.py
 python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/wsgiref/handlers.py
==============================================================================

--- python/branches/py3k/Lib/wsgiref/handlers.py	(original)
+++ python/branches/py3k/Lib/wsgiref/handlers.py	Tue Feb 23 07:00:04 2010
@@ -20,7 +20,6 @@
 )
 
 
-
 class BaseHandler:
 """Manage the invocation of a WSGI application"""
 
@@ -55,13 +54,6 @@
 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 @@
 raise NotImplementedError
 
 
-
-
-
-
-
-
-
-
-
 class SimpleHandler(BaseHandler):
 """Handler that's just initialized with streams, environment, etc.
 
@@ -430,23 +413,6 @@
 origin_server = False
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 class CGIHandler(BaseCGIHandler):
 
 """CGI-based invocation via sys.stdin/stdout/stderr and os.environ
@@ -471,20 +437,3 @@
 self, sys.stdin, sys.stdout, sys.stderr, dict(os.environ.items()),
 multithread=False, multiprocess=True
 )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
Modified: python/branches/py3k/Lib/wsgiref/headers.py
==============================================================================
--- python/branches/py3k/Lib/wsgiref/headers.py	(original)
+++ python/branches/py3k/Lib/wsgiref/headers.py	Tue Feb 23 07:00:04 2010
@@ -25,18 +25,6 @@
 return param
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 class Headers:
 
 """Manage a collection of HTTP response headers"""
@@ -87,10 +75,6 @@
 """
 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 @@
 """
 return [k for k, v in self._headers]
 
-
-
-
 def values(self):
 """Return a list of all header values.
 
@@ -171,7 +152,6 @@
 else:
 return result
 
-
 def add_header(self, _name, _value, **_params):
 """Extended header setting.
 
@@ -200,19 +180,3 @@
 v = self._convert_string_type(v)
 parts.append(_formatparam(k.replace('_', '-'), v))
 self._headers.append((self._convert_string_type(_name), "; ".join(parts)))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
Modified: python/branches/py3k/Lib/wsgiref/simple_server.py
==============================================================================
--- python/branches/py3k/Lib/wsgiref/simple_server.py	(original)
+++ python/branches/py3k/Lib/wsgiref/simple_server.py	Tue Feb 23 07:00:04 2010
@@ -38,8 +38,6 @@
 
 
 
-
-
 class WSGIServer(HTTPServer):
 
 """BaseHTTPServer that implements the Python WSGI protocol"""
@@ -69,18 +67,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 class WSGIRequestHandler(BaseHTTPRequestHandler):
 
 server_version = "WSGIServer/" + __version__
@@ -139,29 +125,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 def demo_app(environ,start_response):
 from io import StringIO
 stdout = StringIO()
@@ -190,16 +153,3 @@
 import webbrowser
 webbrowser.open('http://localhost:8000/xyz?abc')
 httpd.handle_request() # serve one request, then exit
-
-
-
-
-
-
-
-
-
-
-
-
-#
Modified: python/branches/py3k/Lib/wsgiref/util.py
==============================================================================
--- python/branches/py3k/Lib/wsgiref/util.py	(original)
+++ python/branches/py3k/Lib/wsgiref/util.py	Tue Feb 23 07:00:04 2010
@@ -32,13 +32,6 @@
 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 @@
 
 
 
-
 _hoppish = {
 'connection':1, 'keep-alive':1, 'proxy-authenticate':1,
 'proxy-authorization':1, 'te':1, 'trailers':1, 'transfer-encoding':1,
@@ -171,35 +163,3 @@
 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())
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Tue Feb 23 07:00:04 2010
@@ -254,6 +254,8 @@
 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.
 
