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
This commit is contained in:
Ben Hutchings 2018-10-01 21:45:35 +01:00
parent 9cfb948048
commit 169ec06045
10 changed files with 14 additions and 22 deletions

View File

@ -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/"

View File

@ -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):

View File

@ -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

View File

@ -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

View File

@ -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'):

View File

@ -1,7 +1,6 @@
#!/usr/bin/python3
import codecs
import errno
import io
import os
import os.path

View File

@ -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):

1
debian/changelog vendored
View File

@ -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

View File

@ -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(),

View File

@ -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):