[Python-checkins] r75466 - python/trunk/Lib/test/regrtest.py
nick.coghlan
python-checkins at python.org
Sat Oct 17 17:48:17 CEST 2009
Author: nick.coghlan
Date: Sat Oct 17 17:48:16 2009
New Revision: 75466
Log:
Also check and restore identity of sys.path, sys.argv and os.environ rather than just their values (this picked up a few more misbehaving tests)
Modified:
python/trunk/Lib/test/regrtest.py
Modified: python/trunk/Lib/test/regrtest.py
==============================================================================
--- python/trunk/Lib/test/regrtest.py (original)
+++ python/trunk/Lib/test/regrtest.py Sat Oct 17 17:48:16 2009
@@ -683,9 +683,10 @@
'os.environ', 'sys.path')
def get_sys_argv(self):
- return sys.argv[:]
+ return id(sys.argv), sys.argv, sys.argv[:]
def restore_sys_argv(self, saved_argv):
- sys.argv[:] = saved_argv
+ sys.argv = saved_argv[1]
+ sys.argv[:] = saved_argv[2]
def get_cwd(self):
return os.getcwd()
@@ -708,15 +709,17 @@
sys.stdin = saved_stdin
def get_os_environ(self):
- return dict(os.environ)
+ return id(os.environ), os.environ, dict(os.environ)
def restore_os_environ(self, saved_environ):
+ os.environ = saved_environ[1]
os.environ.clear()
- os.environ.update(saved_environ)
+ os.environ.update(saved_environ[2])
def get_sys_path(self):
- return sys.path[:]
+ return id(sys.path), sys.path, sys.path[:]
def restore_sys_path(self, saved_path):
- sys.path[:] = saved_path
+ sys.path = saved_path[1]
+ sys.path[:] = saved_path[2]
def resource_info(self):
for name in self.resources:
More information about the Python-checkins
mailing list