debian/bin, debian/lib/python: Clean up imports based on pyflakes report

- Add explicit imports for all needed modules, rather than indirectly
  (accidentally!) importing them with "from ... import *"
- Replace all "from ... import *" statements, which inhibit static
  checking, with explicit lists of names to import
- Delete the remaining unneeded imports reported by pyflakes

2 files changed, 3 insertions, 3 deletions

diff --git a/debian/lib/python/debian_linux/config.py b/debian/lib/python/debian_linux/config.py
index 9d7c2f3cf401..430fbbc13b4e 100644
--- a/debian/lib/python/debian_linux/config.py
+++ b/debian/lib/python/debian_linux/config.py
@@ -4,7 +4,6 @@ import os.path
 import pickle
 import re
 import sys
-import textwrap
 
 from configparser import RawConfigParser
 
@@ -252,7 +251,6 @@ class ConfigParser(object):
 
 
 if __name__ == '__main__':
-    import sys
     sys.path.append('debian/lib/python')
     config = ConfigCoreDump(open('debian/config.defines.dump', 'rb'))
     for section, items in sorted(config.items(),
diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py
index 8a4be8f705c0..c9bd3efbc83e 100644
--- a/debian/lib/python/debian_linux/gencontrol.py
+++ b/debian/lib/python/debian_linux/gencontrol.py
@@ -1,7 +1,9 @@
 import codecs
+import re
 from collections import OrderedDict
 
-from .debian import *
+from .debian import Changelog, PackageArchitecture, PackageDescription, \
+    PackageRelation, Version
 
 
 class PackagesList(OrderedDict):