Merge with 3.5. Fix test_wsgiref execution from the test module.
This commit is contained in:
commit
b541e58b7a
|
@ -1,11 +1,10 @@
|
||||||
from __future__ import nested_scopes # Backward compat for 2.1
|
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
from wsgiref.util import setup_testing_defaults
|
from wsgiref.util import setup_testing_defaults
|
||||||
from wsgiref.headers import Headers
|
from wsgiref.headers import Headers
|
||||||
from wsgiref.handlers import BaseHandler, BaseCGIHandler
|
from wsgiref.handlers import BaseHandler, BaseCGIHandler
|
||||||
from wsgiref import util
|
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
|
||||||
from wsgiref.simple_server import make_server
|
from wsgiref.simple_server import make_server
|
||||||
from io import StringIO, BytesIO, BufferedReader
|
from io import StringIO, BytesIO, BufferedReader
|
||||||
from socketserver import BaseServer
|
from socketserver import BaseServer
|
||||||
|
@ -14,8 +13,8 @@ from platform import python_implementation
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import sys
|
import sys
|
||||||
|
import unittest
|
||||||
|
|
||||||
from test import support
|
|
||||||
|
|
||||||
class MockServer(WSGIServer):
|
class MockServer(WSGIServer):
|
||||||
"""Non-socket HTTP server"""
|
"""Non-socket HTTP server"""
|
||||||
|
|
Loading…
Reference in New Issue