Author: guido.van.rossum
Date: Wed Aug 8 19:01:45 2007
New Revision: 56836
Modified:
python/branches/py3k-struni/Lib/test/test_wsgiref.py
python/branches/py3k-struni/Lib/wsgiref/simple_server.py
python/branches/py3k-struni/Lib/wsgiref/util.py
Log:
Switch wsgiref to io.{StringIO,BytesIO}. This shuts up the test failures.
(I'm not sure about it actually working though.)
Modified: python/branches/py3k-struni/Lib/test/test_wsgiref.py
==============================================================================
--- python/branches/py3k-struni/Lib/test/test_wsgiref.py (original)
+++ python/branches/py3k-struni/Lib/test/test_wsgiref.py Wed Aug 8
19:01:45 2007
@@ -7,7 +7,7 @@
from wsgiref.validate import validator
from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, demo_app
from wsgiref.simple_server import make_server
-from StringIO import StringIO
+from io import StringIO, BytesIO
from SocketServer import BaseServer
import re, sys
@@ -47,9 +47,9 @@
])
return ["Hello, world!"]
-def run_amock(app=hello_app, data="GET / HTTP/1.0\n\n"):
+def run_amock(app=hello_app, data=b"GET / HTTP/1.0\n\n"):
server = make_server("", 80, app, MockServer, MockHandler)
- inp, out, err, olderr = StringIO(data), StringIO(), StringIO(), sys.stderr
+ inp, out, err, olderr = BytesIO(data), StringIO(), StringIO(), sys.stderr
sys.stderr = err
try:
Modified: python/branches/py3k-struni/Lib/wsgiref/simple_server.py
==============================================================================
--- python/branches/py3k-struni/Lib/wsgiref/simple_server.py (original)
+++ python/branches/py3k-struni/Lib/wsgiref/simple_server.py Wed Aug 8
19:01:45 2007
@@ -163,7 +163,7 @@
def demo_app(environ,start_response):
- from StringIO import StringIO
+ from io import StringIO
stdout = StringIO()
print("Hello world!", file=stdout)
print(file=stdout)
Modified: python/branches/py3k-struni/Lib/wsgiref/util.py
==============================================================================
--- python/branches/py3k-struni/Lib/wsgiref/util.py (original)
+++ python/branches/py3k-struni/Lib/wsgiref/util.py Wed Aug 8 19:01:45 2007
@@ -149,7 +149,7 @@
environ.setdefault('wsgi.multithread', 0)
environ.setdefault('wsgi.multiprocess', 0)
- from StringIO import StringIO
+ from io import StringIO
environ.setdefault('wsgi.input', StringIO(""))
environ.setdefault('wsgi.errors', StringIO())
environ.setdefault('wsgi.url_scheme',guess_scheme(environ))
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
