Rev 5330: (jameinel) fixed trace import in bzrlib_initialize (Parth Malwankar) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5330 [merge]
revision-id: pqm at pqm.ubuntu.com-20100702224400-o0b4bj0efc5scb5p
parent: pqm at pqm.ubuntu.com-20100701045817-169zszf3yzg5gcxj
parent: parth.malwankar at gmail.com-20100702022338-x3glz6xogiqlpsv2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-07-02 23:44:00 +0100
message:
  (jameinel) fixed trace import in bzrlib_initialize (Parth Malwankar)
modified:
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2010-07-01 03:11:55 +0000
+++ b/bzrlib/__init__.py	2010-07-02 22:44:00 +0000
@@ -168,7 +168,7 @@
         otherwise stopping use of bzrlib. Advanced callers can use
         BzrLibraryState directly.
     """
-    import bzrlib.library_state
+    from bzrlib import library_state, trace
     if setup_ui:
         import bzrlib.ui
         stdin = stdin or sys.stdin
@@ -177,8 +177,8 @@
         ui_factory = bzrlib.ui.make_ui_for_terminal(stdin, stdout, stderr)
     else:
         ui_factory = None
-    tracer = bzrlib.trace.DefaultConfig()
-    return bzrlib.library_state.BzrLibraryState(ui=ui_factory, trace=tracer)
+    tracer = trace.DefaultConfig()
+    return library_state.BzrLibraryState(ui=ui_factory, trace=tracer)
 
 
 def test_suite():