[Python-checkins] cpython (merge 3.4 -> 3.5): Merge with 3.5. Fix test_wsgiref execution from the test module.

[senthil.kumaran]

https://hg.python.org/cpython/rev/17acaef50c42
changeset:   97613:17acaef50c42
branch:      3.5
parent:      97607:ecd43087e826
parent:      97612:fdbec2800888
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Thu Sep 03 02:27:18 2015 -0700
summary:
  Merge with 3.5. Fix test_wsgiref execution from the test module.

files:
  Lib/test/test_wsgiref.py |  5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py
--- a/Lib/test/test_wsgiref.py
+++ b/Lib/test/test_wsgiref.py
@@ -1,11 +1,10 @@
-from __future__ import nested_scopes    # Backward compat for 2.1
 from unittest import TestCase
 from wsgiref.util import setup_testing_defaults
 from wsgiref.headers import Headers
 from wsgiref.handlers import BaseHandler, BaseCGIHandler
 from wsgiref import util
 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 io import StringIO, BytesIO, BufferedReader
 from socketserver import BaseServer
@@ -14,8 +13,8 @@
 import os
 import re
 import sys
+import unittest
 
-from test import support
 
 class MockServer(WSGIServer):
     """Non-socket HTTP server"""

-- 
Repository URL: https://hg.python.org/cpython