← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/cleanup.py

  • Committer: Robert Collins
  • Date: 2010-06-28 02:41:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5324.
  • Revision ID: robertc@robertcollins.net-20100628024122-g951fzp74f3u6wst
Sanity check that new_trace_file in pop_log_file is valid, and also fix a test that monkey patched get_terminal_encoding.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/cleanup.py
188
188
                # but don't propagate them.
189
189
                _run_cleanup(cleanup, *c_args, **kwargs)
190
190
        if exc_info is not None:
191
 
            try:
192
 
                raise exc_info[0], exc_info[1], exc_info[2]
193
 
            finally:
194
 
                del exc_info
 
191
            raise exc_info[0], exc_info[1], exc_info[2]
195
192
        # No error, so we can return the result
196
193
        return result
197
194