Rev 5584: Get rid of _restoreEnvironment, it's not needed anymore. in file:///home/vila/src/bzr/bugs/690563-better-env-isolation/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/690563-better-env-isolation/

------------------------------------------------------------
revno: 5584
revision-id: v.ladeuil+lp at free.fr-20101216155821-ahye2xf4kj98dran
parent: v.ladeuil+lp at free.fr-20101216155752-wgwwmu61y978m5ut
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 690563-better-env-isolation
timestamp: Thu 2010-12-16 16:58:21 +0100
message:
  Get rid of _restoreEnvironment, it's not needed anymore.
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2010-12-16 15:17:11 +0000
+++ b/bzrlib/tests/__init__.py	2010-12-16 15:58:21 +0000
@@ -1602,7 +1602,6 @@
             # use an env var so it propagates to subprocesses.
             'APPORT_DISABLE': '1',
         }
-        self.addCleanup(self._restoreEnvironment)
         for name, value in new_env.iteritems():
             self.overrideEnv(name, value)
 
@@ -1610,10 +1609,6 @@
         """Set an environment variable, and reset it when finished."""
         self._old_env[name] = osutils.set_or_unset_env(name, newvalue)
 
-    def _restoreEnvironment(self):
-        for name, value in self._old_env.iteritems():
-            osutils.set_or_unset_env(name, value)
-
     def _restoreHooks(self):
         for klass, (name, hooks) in self._preserved_hooks.items():
             setattr(klass, name, hooks)