Rev 2563: Allow 'from debug import debug_flags' in sftp://rookery/~/public_html/baz2.0/debug-test-isolation

[Robert Collins]

At sftp://rookery/~/public_html/baz2.0/debug-test-isolation

------------------------------------------------------------
revno: 2563
revision-id: robertc at robertcollins.net-20070628080025-nc7i3aax1hz39dkw
parent: robertc at robertcollins.net-20070628075053-uzqfrh5jvizm2fzf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: debug-test-isolation
timestamp: Thu 2007-06-28 18:00:25 +1000
message:
  Allow 'from debug import debug_flags'
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2007-06-28 07:48:23 +0000
+++ b/bzrlib/tests/__init__.py	2007-06-28 08:00:25 +0000
@@ -760,8 +760,8 @@
         Tests that want to use debug flags can just set them in the
         debug_flags set during setup/teardown.
         """
-        self._preserved_debug_flags = debug.debug_flags
-        debug.debug_flags = set()
+        self._preserved_debug_flags = set(debug.debug_flags)
+        debug.debug_flags.clear()
         self.addCleanup(self._restore_debug_flags)
 
     def _clear_hooks(self):
@@ -1117,7 +1117,8 @@
         self.__old_env[name] = osutils.set_or_unset_env(name, newvalue)
 
     def _restore_debug_flags(self):
-        debug.debug_flags = self._preserved_debug_flags
+        debug.debug_flags.clear()
+        debug.debug_flags.update(self._preserved_debug_flags)
 
     def _restoreEnvironment(self):
         for name, value in self.__old_env.iteritems():