Revert changes made to environment in test_httpservers
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 228d82b..73354e3 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -50,6 +50,7 @@
class BaseTestCase(unittest.TestCase):
def setUp(self):
+ os.environ = test_support.EnvironmentVarGuard()
self.lock = threading.Lock()
self.thread = TestServerThread(self, self.request_handler)
self.thread.start()
@@ -58,6 +59,8 @@
def tearDown(self):
self.lock.release()
self.thread.stop()
+ os.environ.__exit__()
+ os.environ = os.environ._environ
def request(self, uri, method='GET', body=None, headers={}):
self.connection = httplib.HTTPConnection('localhost', self.PORT)
@@ -390,9 +393,9 @@
try:
cwd = os.getcwd()
test_support.run_unittest(BaseHTTPServerTestCase,
- SimpleHTTPServerTestCase,
- CGIHTTPServerTestCase
- )
+ SimpleHTTPServerTestCase,
+ CGIHTTPServerTestCase
+ )
finally:
os.chdir(cwd)