Merge lp:~spiv/bzr-builddeb/pyflakes-nits into lp:bzr-builddeb

[Andrew Bennetts]

This is just some trivial tidying up with trivial benefit :)

Mainly it removes some unused imports reported by pyflakes.

It also simplifies some of the code in cmd_import_upstream by replacing nested try/finally blocks with add_cleanup calls.

[James Westby (james-w)]

Thanks.

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2010-05-04 11:27:46 +0000
+++ cmds.py	2010-05-05 07:29:21 +0000
@@ -22,10 +22,6 @@
 #
 
 import commands
-try:
-    import hashlib as md5
-except ImportError:
-    import md5
 import os
 import shutil
 import subprocess
@@ -48,7 +44,6 @@
     )
 from bzrlib.option import Option
 from bzrlib.revisionspec import RevisionSpec
-from bzrlib import revision as mod_revision
 from bzrlib.tag import _merge_tags_if_possible
 from bzrlib.trace import note, warning
 from bzrlib.workingtree import WorkingTree
@@ -967,11 +962,10 @@
     takes_args = ['source']
 
     def run(self, source):
-        source_branch = target_branch = None
+        source_branch = None
         # Get the target branch.
         try:
             tree = WorkingTree.open_containing('.')[0]
-            target_branch = tree.branch
         except (NotBranchError, NoWorkingTree):
             raise BzrCommandError(
                 "There is no tree to merge the source branch in to")
@@ -982,28 +976,24 @@
             raise BzrCommandError("Invalid source branch URL?")
 
         tree.lock_write()
-        try:
-            this_config = debuild_config(tree, tree, False)
-            source_branch.lock_read()
-            try:
-                that_config = debuild_config(source_branch.basis_tree(),
-                        source_branch.basis_tree(), False)
-                if not (this_config.native or that_config.native):
-                    fix_ancestry_as_needed(tree, source_branch)
+        self.add_cleanup(tree.unlock)
+        source_branch.lock_read()
+        self.add_cleanup(source_branch.unlock)
+        this_config = debuild_config(tree, tree, False)
+        that_config = debuild_config(source_branch.basis_tree(),
+                source_branch.basis_tree(), False)
+        if not (this_config.native or that_config.native):
+            fix_ancestry_as_needed(tree, source_branch)
 
-                # Merge source packaging branch in to the target packaging branch.
-                _merge_tags_if_possible(source_branch, tree.branch)
-                conflicts = tree.merge_from_branch(source_branch)
-                if conflicts > 0:
-                    note('The merge resulted in %s conflicts. Please resolve these '
-                         'and commit the changes with "bzr commit".' % conflicts)
-                else:
-                    note('The merge resulted in no conflicts. You may commit the '
-                    'changes by running "bzr commit".')
-            finally:
-                source_branch.unlock()
-        finally:
-            tree.unlock()
+        # Merge source packaging branch in to the target packaging branch.
+        _merge_tags_if_possible(source_branch, tree.branch)
+        conflicts = tree.merge_from_branch(source_branch)
+        if conflicts > 0:
+            note('The merge resulted in %s conflicts. Please resolve these '
+                 'and commit the changes with "bzr commit".' % conflicts)
+        else:
+            note('The merge resulted in no conflicts. You may commit the '
+            'changes by running "bzr commit".')
 
 
 class cmd_dh_make(Command):
 
=== modified file 'dh_make.py'
--- dh_make.py	2010-05-03 03:03:34 +0000
+++ dh_make.py	2010-05-05 07:29:21 +0000
@@ -1,9 +1,4 @@
-try:
-    import hashlib as md5
-except ImportError:
-    import md5
 import os
-import shutil
 import sys
 import subprocess
 
 
=== modified file 'import_dsc.py'
--- import_dsc.py	2010-05-04 06:51:23 +0000
+++ import_dsc.py	2010-05-05 07:29:21 +0000
@@ -30,10 +30,6 @@
         standard_b64encode,
         )
 import errno
-try:
-    import hashlib as md5
-except ImportError:
-    import md5
 import os
 import re
 import shutil