Try to make test_wsgiref less fragile against environment changes by other tests

diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py
index db821398439bbe41b802c44ce9b5e3d9390f45bc..b6383916f1381c30091d9eb3d59df973407663f1 100755 (executable)
--- a/Lib/test/test_wsgiref.py
+++ b/Lib/test/test_wsgiref.py
@@ -9,7 +9,9 @@ from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, demo_app
 from wsgiref.simple_server import make_server
 from StringIO import StringIO
 from SocketServer import BaseServer
-import re, sys
+import os
+import re
+import sys
 
 from test import test_support
 
@@ -386,6 +388,11 @@ class HeaderTests(TestCase):
 class ErrorHandler(BaseCGIHandler):
     """Simple handler subclass for testing BaseHandler"""
 
+    # BaseHandler records the OS environment at import time, but envvars
+    # might have been changed later by other tests, which trips up
+    # HandlerTests.testEnviron().
+    os_environ = dict(os.environ.items())
+
     def __init__(self,**kw):
         setup_testing_defaults(kw)
         BaseCGIHandler.__init__(