diff options
| -rwxr-xr-x | debian/bin/abiupdate.py | 4 | ||||
| -rwxr-xr-x | debian/bin/buildcheck.py | 6 | ||||
| -rwxr-xr-x | debian/bin/gencontrol.py | 6 | ||||
| -rwxr-xr-x | debian/bin/gencontrol_signed.py | 4 | ||||
| -rwxr-xr-x | debian/bin/genpatch-lockdown | 4 | ||||
| -rwxr-xr-x | debian/bin/genpatch-rt | 1 | ||||
| -rwxr-xr-x | debian/bin/kconfig.py | 4 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/lib/python/debian_linux/config.py | 2 | ||||
| -rw-r--r-- | debian/lib/python/debian_linux/gencontrol.py | 4 |
10 files changed, 14 insertions, 22 deletions
diff --git a/debian/bin/abiupdate.py b/debian/bin/abiupdate.py index c9e5df75ab8b..4e88a0b4a554 100755 --- a/debian/bin/abiupdate.py +++ b/debian/bin/abiupdate.py @@ -10,8 +10,8 @@ from urllib.request import urlopen from urllib.error import HTTPError from debian_linux.abi import Symbols -from debian_linux.config import * -from debian_linux.debian import * +from debian_linux.config import ConfigCoreDump +from debian_linux.debian import Changelog, VersionLinux default_url_base = "http://deb.debian.org/debian/" default_url_base_incoming = "http://incoming.debian.org/debian-buildd/" diff --git a/debian/bin/buildcheck.py b/debian/bin/buildcheck.py index 5c999d0f87eb..163b4c6d2329 100755 --- a/debian/bin/buildcheck.py +++ b/debian/bin/buildcheck.py @@ -1,13 +1,13 @@ #!/usr/bin/python3 import sys -import fnmatch import glob -import stat +import os +import re from debian_linux.abi import Symbols from debian_linux.config import ConfigCoreDump -from debian_linux.debian import * +from debian_linux.debian import Changelog, VersionLinux class CheckAbi(object): diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index efe83012ac0c..480018e6725e 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -2,15 +2,15 @@ import sys import locale -import errno -import glob import io import os import os.path import subprocess +import re from debian_linux import config -from debian_linux.debian import * +from debian_linux.debian import PackageDescription, PackageRelation, \ + PackageRelationEntry, PackageRelationGroup, VersionLinux from debian_linux.gencontrol import Gencontrol as Base, merge_packages from debian_linux.utils import Templates, read_control diff --git a/debian/bin/gencontrol_signed.py b/debian/bin/gencontrol_signed.py index a7a781e1878b..6b53e064ffac 100755 --- a/debian/bin/gencontrol_signed.py +++ b/debian/bin/gencontrol_signed.py @@ -9,11 +9,9 @@ import re import ssl import subprocess import sys -import time from debian_linux.config import ConfigCoreDump -from debian_linux.debian import Changelog, PackageDescription, VersionLinux, \ - Package, PackageRelationGroup +from debian_linux.debian import VersionLinux from debian_linux.gencontrol import Gencontrol as Base, merge_packages from debian_linux.utils import Templates, read_control diff --git a/debian/bin/genpatch-lockdown b/debian/bin/genpatch-lockdown index ecaf71eea396..1aed0c735245 100755 --- a/debian/bin/genpatch-lockdown +++ b/debian/bin/genpatch-lockdown @@ -1,15 +1,11 @@ #!/usr/bin/python3 -import codecs -import errno import io import os import os.path import re -import shutil import subprocess import sys -import tempfile def main(repo, range='torvalds/master..dhowells/efi-lock-down'): diff --git a/debian/bin/genpatch-rt b/debian/bin/genpatch-rt index 972367c89449..76f71fea29b8 100755 --- a/debian/bin/genpatch-rt +++ b/debian/bin/genpatch-rt @@ -1,7 +1,6 @@ #!/usr/bin/python3 import codecs -import errno import io import os import os.path diff --git a/debian/bin/kconfig.py b/debian/bin/kconfig.py index 4b3fecab93d9..b34f861ffd03 100755 --- a/debian/bin/kconfig.py +++ b/debian/bin/kconfig.py @@ -1,11 +1,9 @@ #!/usr/bin/python3 import optparse -import os.path import re -import sys -from debian_linux.kconfig import * +from debian_linux.kconfig import KconfigFile def merge(output, configs, overrides): diff --git a/debian/changelog b/debian/changelog index a402a2f12568..89ebe2120802 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ linux (4.19~rc6-1~exp1) UNRELEASED; urgency=medium * debian/bin, debian/lib/python: Fix most errors reported by pycodestyle * debian/bin, debian/rules.real: Add symlink to Python package directory instead of editing path + * debian/bin, debian/lib/python: Clean up imports based on pyflakes report -- Ben Hutchings <ben@decadent.org.uk> Thu, 20 Sep 2018 02:40:54 +0100 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): |