[Pkg-bazaar-commits] r137 ./bzr-builddeb/people/jdw/merge_upstream: Tidy up, thanks to pyflakes.

[James Westby]

------------------------------------------------------------
revno: 137
committer: James Westby <jw+debian at jameswestby.net>
branch nick: merge_upstream
timestamp: Sun 2007-07-01 15:23:31 +0100
message:
  Tidy up, thanks to pyflakes.
modified:
  __init__.py
  config.py
  repack_tarball.py
  tests/__init__.py
  tests/test_builder.py
  tests/test_merge_upstream.py
  util.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2007-06-30 14:17:45 +0000
+++ b/__init__.py	2007-07-01 14:23:31 +0000
@@ -25,13 +25,10 @@
 import os
 
 from bzrlib.commands import Command, register_command
+from bzrlib.errors import BzrCommandError
+from bzrlib.option import Option
 from bzrlib.trace import info, warning
-from bzrlib.option import Option
 from bzrlib.workingtree import WorkingTree
-from bzrlib.bzrdir import BzrDir
-from bzrlib.errors import NoSuchFile, BzrCommandError, NotBranchError
-from bzrlib.trace import info, mutter
-import bzrlib.transport
 
 from builder import (DebBuild,
                      DebMergeBuild,
@@ -43,9 +40,7 @@
 from errors import (ChangedError,
                     StopBuild,
                     )
-from merge_upstream import merge_upstream
 from properties import BuildProperties
-from repack_tarball import repack_tarball
 from util import goto_branch, find_changelog, is_clean
 
 dont_purge_opt = Option('dont-purge',

=== modified file 'config.py'
--- a/config.py	2007-06-18 21:12:43 +0000
+++ b/config.py	2007-07-01 14:23:31 +0000
@@ -18,7 +18,6 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-import os
 from StringIO import StringIO
 
 from bzrlib.config import ConfigObj, IniBasedConfig #, TreeConfig

=== modified file 'repack_tarball.py'
--- a/repack_tarball.py	2007-06-24 10:12:45 +0000
+++ b/repack_tarball.py	2007-07-01 14:23:31 +0000
@@ -22,7 +22,6 @@
 import os
 import shutil
 import tarfile
-import zipfile
 
 from bzrlib.errors import (NoSuchFile,
                            FileExists,

=== modified file 'tests/__init__.py'
--- a/tests/__init__.py	2007-06-24 21:21:25 +0000
+++ b/tests/__init__.py	2007-07-01 14:23:31 +0000
@@ -18,8 +18,6 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-import changes
-import config
 import shutil
 import tarfile
 import zipfile

=== modified file 'tests/test_builder.py'
--- a/tests/test_builder.py	2007-06-23 10:31:23 +0000
+++ b/tests/test_builder.py	2007-07-01 14:23:31 +0000
@@ -183,7 +183,7 @@
 
   def write_changelog(self, changelog, filename):
     f = open(filename, 'w')
-    c.write_to_open_file(f)
+    changelog.write_to_open_file(f)
     f.close()
 
   def get_arch(self):

=== modified file 'tests/test_merge_upstream.py'
--- a/tests/test_merge_upstream.py	2007-06-25 21:37:31 +0000
+++ b/tests/test_merge_upstream.py	2007-07-01 14:23:31 +0000
@@ -19,17 +19,14 @@
 #
 
 import os
-import shutil
 
 from debian_bundle.changelog import Changelog, Version
 
 from bzrlib.errors import (BzrCommandError,
-                           InvalidRevisionSpec,
                            NoSuchFile,
                            NoSuchTag,
                            TagAlreadyExists,
                            )
-from bzrlib.revisionspec import RevisionSpec
 from bzrlib.tests import TestCaseWithTransport
 
 from merge_upstream import merge_upstream

=== modified file 'util.py'
--- a/util.py	2007-06-18 21:57:14 +0000
+++ b/util.py	2007-07-01 14:23:31 +0000
@@ -21,10 +21,7 @@
 import shutil
 import os
 
-from bzrlib.atomicfile import AtomicFile
-from bzrlib.ignores import parse_ignore_file
 from bzrlib.trace import info, mutter
-from bzrlib.workingtree import WorkingTree
 
 from debian_bundle.changelog import Changelog