[Python-checkins] r76087 - in python/branches/release26-maint: Lib/test/test_wsgiref.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Tue Nov  3 17:43:03 2009
New Revision: 76087

Log:
Merged revisions 76086 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76086 | antoine.pitrou | 2009-11-03 17:41:20 +0100 (mar., 03 nov. 2009) | 3 lines
  
  Try to make test_wsgiref less fragile against environment changes by other tests
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_wsgiref.py

Modified: python/branches/release26-maint/Lib/test/test_wsgiref.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_wsgiref.py	(original)
+++ python/branches/release26-maint/Lib/test/test_wsgiref.py	Tue Nov  3 17:43:03 2009
@@ -9,7 +9,9 @@
 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 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__(