mirror of https://github.com/python/cpython
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:
parent
0269b91030
commit
6a10e02aa6
|
@ -7,7 +7,7 @@ from wsgiref import util
|
|||
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 @@ def hello_app(environ,start_response):
|
|||
])
|
||||
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:
|
||||
|
|
|
@ -163,7 +163,7 @@ class WSGIRequestHandler(BaseHTTPRequestHandler):
|
|||
|
||||
|
||||
def demo_app(environ,start_response):
|
||||
from StringIO import StringIO
|
||||
from io import StringIO
|
||||
stdout = StringIO()
|
||||
print("Hello world!", file=stdout)
|
||||
print(file=stdout)
|
||||
|
|
|
@ -149,7 +149,7 @@ def setup_testing_defaults(environ):
|
|||
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))
|
||||
|
|
Loading…
Reference in New Issue