← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/library_state.py

  • Committer: Jelmer Vernooij
  • Date: 2011-02-08 16:06:21 UTC
  • mto: (5582.12.2 weave-plugin)
  • mto: This revision was merged to the branch mainline in revision 5718.
  • Revision ID: jelmer@samba.org-20110208160621-ncf1hsd30ksk7thz
Clean up patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/library_state.py
20
20
    'BzrLibraryState',
21
21
    ]
22
22
 
 
23
import sys
 
24
 
23
25
import bzrlib
24
26
 
25
27
 
78
80
            self.cleanups.add_cleanup(warning_cleanup)
79
81
        self._trace.__enter__()
80
82
 
81
 
        from bzrlib import ui
82
 
        self._orig_ui = ui.ui_factory
83
 
        ui.ui_factory = self._ui
 
83
        self._orig_ui = bzrlib.ui.ui_factory
 
84
        bzrlib.ui.ui_factory = self._ui
84
85
        self._ui.__enter__()
85
86
 
86
87
        self.saved_state = bzrlib.global_state
89
90
 
90
91
    def __exit__(self, exc_type, exc_val, exc_tb):
91
92
        self.cleanups.cleanup_now()
92
 
        from bzrlib import (osutils, trace, ui)
93
 
        trace._flush_stdout_stderr()
94
 
        trace._flush_trace()
95
 
        osutils.report_extension_load_failures()
 
93
        import bzrlib.ui
 
94
        bzrlib.trace._flush_stdout_stderr()
 
95
        bzrlib.trace._flush_trace()
 
96
        import bzrlib.osutils
 
97
        bzrlib.osutils.report_extension_load_failures()
96
98
        self._ui.__exit__(None, None, None)
97
99
        self._trace.__exit__(None, None, None)
98
 
        ui.ui_factory = self._orig_ui
 
100
        bzrlib.ui.ui_factory = self._orig_ui
99
101
        global global_state
100
102
        global_state = self.saved_state
101
103
        return False # propogate exceptions.