[Python-checkins] r76091 - in python/branches/release31-maint: Lib/test/test_wsgiref.py
antoine.pitrou
python-checkins at python.org
Tue Nov 3 18:21:14 CET 2009
Author: antoine.pitrou
Date: Tue Nov 3 18:21:14 2009
New Revision: 76091
Log:
Merged revisions 76090 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r76090 | antoine.pitrou | 2009-11-03 18:20:10 +0100 (mar., 03 nov. 2009) | 9 lines
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/release31-maint/ (props changed)
python/branches/release31-maint/Lib/test/test_wsgiref.py
Modified: python/branches/release31-maint/Lib/test/test_wsgiref.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_wsgiref.py (original)
+++ python/branches/release31-maint/Lib/test/test_wsgiref.py Tue Nov 3 18:21:14 2009
@@ -9,7 +9,9 @@
from wsgiref.simple_server import make_server
from io import StringIO, BytesIO, BufferedReader
from socketserver import BaseServer
-import re, sys
+import os
+import re
+import sys
from test import support
@@ -444,6 +446,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__(
More information about the Python-checkins
mailing list