Rev 5327: Sanity check that new_trace_file in pop_log_file is valid, and also fix a test that monkey patched get_terminal_encoding. in http://bazaar.launchpad.net/~lifeless/bzr/globalzapping

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/globalzapping

------------------------------------------------------------
revno: 5327
revision-id: robertc at robertcollins.net-20100628024122-g951fzp74f3u6wst
parent: robertc at robertcollins.net-20100626021526-m9z3q3r4tw5rdoo6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: globalzapping
timestamp: Mon 2010-06-28 12:41:22 +1000
message:
  Sanity check that new_trace_file in pop_log_file is valid, and also fix a test that monkey patched get_terminal_encoding.
=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- a/bzrlib/tests/blackbox/test_commit.py	2010-06-11 07:32:12 +0000
+++ b/bzrlib/tests/blackbox/test_commit.py	2010-06-28 02:41:22 +0000
@@ -129,7 +129,7 @@
         # by ui.text.show_warning
         default_get_terminal_enc = osutils.get_terminal_encoding
         try:
-            osutils.get_terminal_encoding = lambda: 'ascii'
+            osutils.get_terminal_encoding = lambda trace=None: 'ascii'
             file_name = u'foo\u1234'
             open(file_name, 'w').write('hello world')
             self.run_bzr(['add'])

=== modified file 'bzrlib/trace.py'
--- a/bzrlib/trace.py	2010-06-26 01:07:16 +0000
+++ b/bzrlib/trace.py	2010-06-28 02:41:22 +0000
@@ -368,7 +368,8 @@
 def pop_log_file((magic, old_handlers, new_handler, old_trace_file, new_trace_file)):
     """Undo changes to logging/tracing done by _push_log_file.
 
-    This flushes, but does not close the trace file.
+    This flushes, but does not close the trace file (so that anything that was
+    in it is output.
 
     Takes the memento returned from _push_log_file."""
     global _trace_file
@@ -379,7 +380,8 @@
     # file will likely already be closed underneath.
     new_handler.close()
     bzr_logger.handlers = old_handlers
-    new_trace_file.flush()
+    if new_trace_file is not None:
+        new_trace_file.flush()
 
 
 def log_exception_quietly():