Merged revisions 71875 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r71875 | walter.doerwald | 2009-04-25 14:15:07 +0200 (Sa, 25 Apr 2009) | 7 lines Issue #5837: Certain sequences of calls to set() and unset() for support.EnvironmentVarGuard objects restored the environment variables incorrectly on __exit__. Fix this by recording the initial value of each environment variable on the first access in set() or unset(). ........
This commit is contained in:
parent
be7b7bb902
commit
729df01045
|
@ -454,30 +454,32 @@ class EnvironmentVarGuard(object):
|
|||
a context manager."""
|
||||
|
||||
def __init__(self):
|
||||
self._environ = os.environ
|
||||
self._unset = set()
|
||||
self._reset = dict()
|
||||
self._changed = {}
|
||||
|
||||
def set(self, envvar, value):
|
||||
if envvar not in self._environ:
|
||||
self._unset.add(envvar)
|
||||
else:
|
||||
self._reset[envvar] = self._environ[envvar]
|
||||
self._environ[envvar] = value
|
||||
# Remember the initial value on the first access
|
||||
if envvar not in self._changed:
|
||||
self._changed[envvar] = os.environ.get(envvar)
|
||||
os.environ[envvar] = value
|
||||
|
||||
def unset(self, envvar):
|
||||
if envvar in self._environ:
|
||||
self._reset[envvar] = self._environ[envvar]
|
||||
del self._environ[envvar]
|
||||
# Remember the initial value on the first access
|
||||
if envvar not in self._changed:
|
||||
self._changed[envvar] = os.environ.get(envvar)
|
||||
if envvar in os.environ:
|
||||
del os.environ[envvar]
|
||||
|
||||
def __enter__(self):
|
||||
return self
|
||||
|
||||
def __exit__(self, *ignore_exc):
|
||||
for envvar, value in self._reset.iteritems():
|
||||
self._environ[envvar] = value
|
||||
for unset in self._unset:
|
||||
del self._environ[unset]
|
||||
for (k, v) in self._changed.items():
|
||||
if v is None:
|
||||
if k in os.environ:
|
||||
del os.environ[k]
|
||||
else:
|
||||
os.environ[k] = v
|
||||
|
||||
|
||||
class TransientResource(object):
|
||||
|
||||
|
|
|
@ -32,6 +32,13 @@ Library
|
|||
dispatcher now has an 'ignore_log_types' attribute for suppressing
|
||||
log messages, which is set to 'warning' by default.
|
||||
|
||||
Tests
|
||||
-----
|
||||
|
||||
- Issue #5837: Certain sequences of calls to set() and unset() for
|
||||
support.EnvironmentVarGuard objects restored the environment variables
|
||||
incorrectly on __exit__.
|
||||
|
||||
|
||||
What's New in Python 2.6.2 rc 1
|
||||
===============================
|
||||
|
|
Loading…
Reference in New Issue