traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch wsgiref to io.{StringIO,BytesIO}. This shuts up the test failures. 

(I'm not sure about it actually working though.)
This commit is contained in:
Guido van Rossum 2007-08-08 17:01:45 +00:00
parent 0269b91030
commit 6a10e02aa6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_wsgiref.py
View File

@ -7,7 +7,7 @@ from wsgiref import util
from wsgiref.validate import validator from wsgiref.validate import validator
from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, demo_app from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, demo_app
from wsgiref.simple_server import make_server from wsgiref.simple_server import make_server
from StringIO import StringIO from io import StringIO, BytesIO
from SocketServer import BaseServer from SocketServer import BaseServer
import re, sys import re, sys
@ -47,9 +47,9 @@ def hello_app(environ,start_response):
]) ])
return ["Hello, world!"] 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) 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 sys.stderr = err
try: try:

2
Lib/wsgiref/simple_server.py
View File

@ -163,7 +163,7 @@ class WSGIRequestHandler(BaseHTTPRequestHandler):
def demo_app(environ,start_response): def demo_app(environ,start_response):
from StringIO import StringIO from io import StringIO
stdout = StringIO() stdout = StringIO()
print("Hello world!", file=stdout) print("Hello world!", file=stdout)
print(file=stdout) print(file=stdout)

2
Lib/wsgiref/util.py
View File

@ -149,7 +149,7 @@ def setup_testing_defaults(environ):
environ.setdefault('wsgi.multithread', 0) environ.setdefault('wsgi.multithread', 0)
environ.setdefault('wsgi.multiprocess', 0) environ.setdefault('wsgi.multiprocess', 0)
from StringIO import StringIO from io import StringIO
environ.setdefault('wsgi.input', StringIO("")) environ.setdefault('wsgi.input', StringIO(""))
environ.setdefault('wsgi.errors', StringIO()) environ.setdefault('wsgi.errors', StringIO())
environ.setdefault('wsgi.url_scheme',guess_scheme(environ)) environ.setdefault('wsgi.url_scheme',guess_scheme(environ))