Remove unused imports and adjust formatting

Git-Dch: Ignore

diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py
index 9fe345c..28ceb2e 100644 (file)
--- a/gbp/scripts/import_dsc.py
+++ b/gbp/scripts/import_dsc.py
@@ -27,13 +27,13 @@ import pipes
 import time
 import gbp.command_wrappers as gbpc
 from gbp.pkg import UpstreamSource
-from gbp.deb import (debian_version_chars,
-                     parse_dsc, DscFile)
+from gbp.deb import  parse_dsc
 from gbp.deb.git import (DebianGitRepository, GitRepositoryError)
 from gbp.deb.changelog import ChangeLog
 from gbp.git import rfc822_date_to_git
 from gbp.git.modifier import GitModifier
-from gbp.config import GbpOptionParserDebian, GbpOptionGroup, no_upstream_branch_msg
+from gbp.config import (GbpOptionParserDebian, GbpOptionGroup,
+                        no_upstream_branch_msg)
 from gbp.errors import GbpError
 import gbp.log
 

diff --git a/gbp/scripts/import_dscs.py b/gbp/scripts/import_dscs.py
index cbd6b7a..0ba3335 100644 (file)
--- a/gbp/scripts/import_dscs.py
+++ b/gbp/scripts/import_dscs.py
@@ -21,7 +21,7 @@ import os
 import sys
 import tempfile
 import gbp.command_wrappers as gbpc
-from gbp.deb import parse_dsc, DscFile, DpkgCompareVersions
+from gbp.deb import parse_dsc, DpkgCompareVersions
 from gbp.errors import GbpError
 from gbp.git import GitRepository, GitRepositoryError
 from gbp.scripts import import_dsc
@@ -48,8 +48,10 @@ def fetch_snapshots(pkg, downloaddir):
     "Fetch snapshots using debsnap von snapshots.debian.org"
     dscs = None
 
-    gbp.log.info("Downloading snapshots of '%s' to '%s'..." % (pkg, downloaddir))
-    debsnap = gbpc.Command("debsnap", [ '--force', '--destdir=%s' % (downloaddir), pkg])
+    gbp.log.info("Downloading snapshots of '%s' to '%s'..." %
+                 (pkg, downloaddir))
+    debsnap = gbpc.Command("debsnap", [ '--force', '--destdir=%s' %
+                                        (downloaddir), pkg])
     try:
         debsnap()
     except gbpc.CommandExecFailed:
@@ -98,7 +100,7 @@ def main(argv):
         import_args = argv[1:]
 
         if '--verbose' in import_args:
-            verbose = True 
+            verbose = True
         gbp.log.setup(False, verbose)
 
         if '--ignore-repo-config' in import_args:
@@ -135,7 +137,8 @@ def main(argv):
             repo = GitRepository('.')
             (clean, out) = repo.is_clean()
             if not clean:
-                gbp.log.err("Repository has uncommitted changes, commit these first: ")
+                gbp.log.err("Repository has uncommitted changes, "
+                            "commit these first: ")
                 raise GbpError(out)
             else:
                 dirs['pkg'] = dirs['top']