Rev 2875: (Andrew Bennetts) Remove unused imports in builtins.py revealed by pyflakes, and fix one undefined name. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2875
revision-id: pqm at pqm.ubuntu.com-20071002082143-hkducdw42q0cel4l
parent: pqm at pqm.ubuntu.com-20071002074820-0o6n138uq5uh7snb
parent: andrew.bennetts at canonical.com-20071002052647-0fbgkhnjyc441e90
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-10-02 09:21:43 +0100
message:
  (Andrew Bennetts) Remove unused imports in builtins.py revealed by pyflakes, and fix one undefined name.
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 2872.2.1
    merged: andrew.bennetts at canonical.com-20071002052647-0fbgkhnjyc441e90
    parent: pqm at pqm.ubuntu.com-20070928041435-uls0r9txks111272
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: import-nits
    timestamp: Tue 2007-10-02 15:26:47 +1000
    message:
      Remove unused imports in builtins.py revealed by pyflakes, and fix one undefined name.
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-10-02 06:13:56 +0000
+++ b/bzrlib/builtins.py	2007-10-02 08:21:43 +0000
@@ -22,14 +22,11 @@
 from bzrlib.lazy_import import lazy_import
 lazy_import(globals(), """
 import codecs
-import errno
 import sys
-import tempfile
 import time
 
 import bzrlib
 from bzrlib import (
-    branch,
     bugtracker,
     bundle,
     bzrdir,
@@ -43,10 +40,7 @@
     merge_directive,
     osutils,
     reconfigure,
-    registry,
-    repository,
     revision as _mod_revision,
-    revisionspec,
     symbol_versioning,
     transport,
     tree as _mod_tree,
@@ -62,8 +56,7 @@
 
 from bzrlib.commands import Command, display_command
 from bzrlib.option import ListOption, Option, RegistryOption, custom_help
-from bzrlib.progress import DummyProgress, ProgressPhase
-from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
+from bzrlib.trace import mutter, note, warning, is_quiet, info
 
 
 def tree_files(file_list, default_branch=u'.'):
@@ -2254,10 +2247,6 @@
     def run(self, message=None, file=None, verbose=False, selected_list=None,
             unchanged=False, strict=False, local=False, fixes=None,
             author=None, show_diff=False):
-        from bzrlib.commit import (
-            NullCommitReporter,
-            ReportCommitToLog
-        )
         from bzrlib.errors import (
             PointlessCommit,
             ConflictsInTree,
@@ -2638,7 +2627,7 @@
     
     @display_command
     def run(self, branch, other):
-        from bzrlib.revision import ensure_null, MultipleRevisionSources
+        from bzrlib.revision import ensure_null
         
         branch1 = Branch.open_containing(branch)[0]
         branch2 = Branch.open_containing(other)[0]
@@ -2729,7 +2718,6 @@
             uncommitted=False, pull=False,
             directory=None,
             ):
-        from bzrlib.tag import _merge_tags_if_possible
         # This is actually a branch (or merge-directive) *location*.
         location = branch
         del branch
@@ -2790,7 +2778,7 @@
                 return 0
             if pull:
                 if merger.interesting_files is not None:
-                    raise BzrCommandError('Cannot pull individual files')
+                    raise errors.BzrCommandError('Cannot pull individual files')
                 if (merger.base_rev_id == tree.last_revision()):
                     result = tree.pull(merger.other_branch, False,
                                        merger.other_rev_id)
@@ -3166,7 +3154,6 @@
             theirs_only=False, log_format=None, long=False, short=False, line=False, 
             show_ids=False, verbose=False, this=False, other=False):
         from bzrlib.missing import find_unmerged, iter_log_revisions
-        from bzrlib.log import log_formatter
 
         if this:
           mine_only = this
@@ -3481,7 +3468,6 @@
             dry_run=False, verbose=False,
             revision=None, force=False):
         from bzrlib.log import log_formatter, show_log
-        import sys
         from bzrlib.uncommit import uncommit
 
         if location is None:
@@ -3907,7 +3893,7 @@
 
     def _run(self, submit_branch, revision, public_branch, remember, format,
              no_bundle, no_patch, output, from_, mail_to, message):
-        from bzrlib.revision import ensure_null, NULL_REVISION
+        from bzrlib.revision import NULL_REVISION
         if output is None:
             outfile = StringIO()
         elif output == '-':