From 791306a868eb29150359dfcaa77ebc23bf0a2736 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Wed, 3 Apr 2019 23:55:21 +0200 Subject: [PATCH] remove lots of unused imports These were reported by flake8 as "F401 [...] imported but unused". --- dak/archive_dedup_pool.py | 1 - dak/check_archive.py | 1 - dak/check_overrides.py | 1 - dak/clean_queues.py | 2 +- dak/clean_suites.py | 3 +-- dak/cruft_report.py | 1 - dak/dak.py | 1 - dak/dakdb/update101.py | 1 - dak/dakdb/update114.py | 1 - dak/dakdb/update116.py | 1 - dak/dakdb/update121.py | 1 - dak/examine_package.py | 1 - dak/external_overrides.py | 2 +- dak/generate_index_diffs.py | 1 - dak/generate_packages_sources2.py | 2 +- dak/generate_releases.py | 3 --- dak/import_keyring.py | 3 --- dak/new_security_install.py | 1 - dak/process_commands.py | 3 +-- dak/process_new.py | 7 ++----- dak/process_policy.py | 1 - dak/process_upload.py | 1 - dak/rm.py | 5 ----- dak/show_new.py | 7 ++----- daklib/archive.py | 3 --- daklib/dbconn.py | 11 ++--------- daklib/termcolor.py | 4 ---- daklib/utils.py | 10 ++-------- scripts/debian/link_morgue | 1 - 29 files changed, 13 insertions(+), 67 deletions(-) diff --git a/dak/archive_dedup_pool.py b/dak/archive_dedup_pool.py index 3f66632a..f0465dd3 100755 --- a/dak/archive_dedup_pool.py +++ b/dak/archive_dedup_pool.py @@ -28,7 +28,6 @@ from __future__ import print_function import apt_pkg import errno import os -import stat import sys from daklib.dbconn import DBConn diff --git a/dak/check_archive.py b/dak/check_archive.py index ab4e7850..931ab573 100755 --- a/dak/check_archive.py +++ b/dak/check_archive.py @@ -32,7 +32,6 @@ from __future__ import print_function -import commands import os import stat import sys diff --git a/dak/check_overrides.py b/dak/check_overrides.py index 83e387de..f8f48fef 100755 --- a/dak/check_overrides.py +++ b/dak/check_overrides.py @@ -56,7 +56,6 @@ from __future__ import print_function -import os import sys import apt_pkg diff --git a/dak/clean_queues.py b/dak/clean_queues.py index 1769a039..ea149b77 100755 --- a/dak/clean_queues.py +++ b/dak/clean_queues.py @@ -40,7 +40,7 @@ import os.path import stat import sys import time -from datetime import datetime, timedelta +from datetime import datetime import apt_pkg from daklib import utils from daklib import daklog diff --git a/dak/clean_suites.py b/dak/clean_suites.py index 068bb78a..de08a3e4 100755 --- a/dak/clean_suites.py +++ b/dak/clean_suites.py @@ -41,9 +41,8 @@ import os import sqlalchemy.sql as sql import stat import sys -import time import apt_pkg -from datetime import datetime, timedelta +from datetime import datetime from daklib.config import Config from daklib.dbconn import * diff --git a/dak/cruft_report.py b/dak/cruft_report.py index ba62846b..08016184 100755 --- a/dak/cruft_report.py +++ b/dak/cruft_report.py @@ -37,7 +37,6 @@ Check for obsolete binary packages from __future__ import print_function -import commands import functools import os import sys diff --git a/dak/dak.py b/dak/dak.py index 45cbdd32..3093db16 100755 --- a/dak/dak.py +++ b/dak/dak.py @@ -41,7 +41,6 @@ import traceback import daklib.utils from daklib.daklog import Logger -from daklib.config import Config from daklib.dak_exceptions import CantOpenError ################################################################################ diff --git a/dak/dakdb/update101.py b/dak/dakdb/update101.py index 17768695..66999153 100644 --- a/dak/dakdb/update101.py +++ b/dak/dakdb/update101.py @@ -29,7 +29,6 @@ from __future__ import print_function import psycopg2 from daklib.dak_exceptions import DBUpdateError -from daklib.config import Config ################################################################################ diff --git a/dak/dakdb/update114.py b/dak/dakdb/update114.py index e79a7586..9135b146 100755 --- a/dak/dakdb/update114.py +++ b/dak/dakdb/update114.py @@ -29,7 +29,6 @@ from __future__ import print_function import psycopg2 from daklib.dak_exceptions import DBUpdateError -from daklib.config import Config ################################################################################ diff --git a/dak/dakdb/update116.py b/dak/dakdb/update116.py index fc2af168..7f732f2f 100644 --- a/dak/dakdb/update116.py +++ b/dak/dakdb/update116.py @@ -10,7 +10,6 @@ from __future__ import print_function import psycopg2 from daklib.dak_exceptions import DBUpdateError -from daklib.config import Config def do_update(self): diff --git a/dak/dakdb/update121.py b/dak/dakdb/update121.py index 08d685c3..f5813fda 100644 --- a/dak/dakdb/update121.py +++ b/dak/dakdb/update121.py @@ -29,7 +29,6 @@ from __future__ import print_function import psycopg2 from daklib.dak_exceptions import DBUpdateError -from daklib.config import Config ################################################################################ diff --git a/dak/examine_package.py b/dak/examine_package.py index acb2f2e8..325e4718 100755 --- a/dak/examine_package.py +++ b/dak/examine_package.py @@ -50,7 +50,6 @@ import os import re import sys import apt_pkg -import apt_inst import shutil import subprocess import threading diff --git a/dak/external_overrides.py b/dak/external_overrides.py index 544a3a49..8c596052 100755 --- a/dak/external_overrides.py +++ b/dak/external_overrides.py @@ -26,7 +26,7 @@ from __future__ import print_function from daklib.dbconn import * from daklib.config import Config -from daklib import utils, daklog +from daklib import daklog import apt_pkg import sys diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py index 89b4a2c3..50c87fae 100755 --- a/dak/generate_index_diffs.py +++ b/dak/generate_index_diffs.py @@ -38,7 +38,6 @@ import os import tempfile import time import apt_pkg -import glob from daklib import utils from daklib.dbconn import Archive, Component, DBConn, Suite, get_suite, get_suite_architectures diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py index 5f7d4efa..c2b44587 100755 --- a/dak/generate_packages_sources2.py +++ b/dak/generate_packages_sources2.py @@ -383,7 +383,7 @@ def main(): logger = daklog.Logger('generate-packages-sources2') - from daklib.dbconn import Component, DBConn, get_suite, Suite, Archive + from daklib.dbconn import DBConn, get_suite, Suite, Archive session = DBConn().session() session.execute("SELECT add_missing_description_md5()") session.commit() diff --git a/dak/generate_releases.py b/dak/generate_releases.py index 65d773a3..47a384ae 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -35,15 +35,12 @@ from __future__ import print_function import sys import os import os.path -import stat import time import gzip import bz2 import errno import apt_pkg import subprocess -from tempfile import mkstemp, mkdtemp -import commands from sqlalchemy.orm import object_session from daklib import utils, daklog diff --git a/dak/import_keyring.py b/dak/import_keyring.py index 0f8c3dd6..b3895fef 100755 --- a/dak/import_keyring.py +++ b/dak/import_keyring.py @@ -23,10 +23,7 @@ from __future__ import print_function import sys -import os -import re import apt_pkg -import ldap from daklib.config import Config from daklib.dbconn import * diff --git a/dak/new_security_install.py b/dak/new_security_install.py index 2ce302ab..aa83e8cc 100755 --- a/dak/new_security_install.py +++ b/dak/new_security_install.py @@ -37,7 +37,6 @@ import commands import errno import fcntl -from daklib import queue from daklib import daklog from daklib import utils from daklib.dbconn import * diff --git a/dak/process_commands.py b/dak/process_commands.py index 258fb440..9b2e794b 100644 --- a/dak/process_commands.py +++ b/dak/process_commands.py @@ -25,10 +25,9 @@ import sys import time from daklib.config import Config -from daklib.command import CommandError, CommandFile +from daklib.command import CommandFile from daklib.daklog import Logger from daklib.fstransactions import FilesystemTransaction -from daklib.gpg import GpgException from daklib.utils import find_next_free diff --git a/dak/process_new.py b/dak/process_new.py index d7d527ce..0b0a1a6e 100755 --- a/dak/process_new.py +++ b/dak/process_new.py @@ -44,17 +44,14 @@ from __future__ import print_function -import copy import errno import os import readline import stat import sys -import time import contextlib import pwd import apt_pkg -import apt_inst import examine_package import subprocess import daklib.daksubprocess @@ -64,8 +61,8 @@ from daklib.dbconn import * from daklib.queue import * from daklib import daklog from daklib import utils -from daklib.regexes import re_no_epoch, re_default_answer, re_isanum, re_package -from daklib.dak_exceptions import CantOpenError, AlreadyLockedError, CantGetLockError +from daklib.regexes import re_default_answer, re_isanum +from daklib.dak_exceptions import CantOpenError, AlreadyLockedError from daklib.summarystats import SummaryStats from daklib.config import Config from daklib.policy import UploadCopy, PolicyQueueUploadHandler diff --git a/dak/process_policy.py b/dak/process_policy.py index f099cc0c..b55fd1d7 100755 --- a/dak/process_policy.py +++ b/dak/process_policy.py @@ -45,7 +45,6 @@ import sqlalchemy.sql as sql from daklib.dbconn import * from daklib import daklog from daklib import utils -from daklib.dak_exceptions import CantOpenError, AlreadyLockedError, CantGetLockError from daklib.externalsignature import check_upload_for_external_signature_request from daklib.config import Config from daklib.archive import ArchiveTransaction, source_component_from_package_list diff --git a/dak/process_upload.py b/dak/process_upload.py index 30670d2a..319f4a3b 100755 --- a/dak/process_upload.py +++ b/dak/process_upload.py @@ -169,7 +169,6 @@ import sys import traceback import apt_pkg import time -from sqlalchemy.orm.exc import NoResultFound from daklib import daklog from daklib.dbconn import * diff --git a/dak/rm.py b/dak/rm.py index a7d2dd22..f3eb98a4 100755 --- a/dak/rm.py +++ b/dak/rm.py @@ -42,21 +42,16 @@ from __future__ import print_function -import commands import functools import os import sys import apt_pkg -import apt_inst -from re import sub from daklib.config import Config from daklib.dbconn import * from daklib import utils from daklib.dak_exceptions import * from daklib.rm import remove -from daklib.regexes import re_strip_source_version, re_bin_only_nmu -import debianbts as bts ################################################################################ diff --git a/dak/show_new.py b/dak/show_new.py index 4ad3a603..c4f243aa 100755 --- a/dak/show_new.py +++ b/dak/show_new.py @@ -27,7 +27,6 @@ from __future__ import print_function -from copy import copy import os import sys import time @@ -36,11 +35,9 @@ import examine_package from daklib import policy from daklib.dbconn import * -from daklib import utils from daklib.config import Config -from daklib import daklog -from daklib.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS, PROC_STATUS_SIGNALRAISED -from multiprocessing import Manager, TimeoutError +from daklib.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS +from multiprocessing import Manager # Globals Cnf = None diff --git a/daklib/archive.py b/daklib/archive.py index ef04681e..441b9a2b 100644 --- a/daklib/archive.py +++ b/daklib/archive.py @@ -31,14 +31,11 @@ from daklib.fstransactions import FilesystemTransaction from daklib.regexes import re_changelog_versions, re_bin_only_nmu import daklib.daksubprocess -import apt_pkg -from datetime import datetime import os import shutil from sqlalchemy.orm.exc import NoResultFound from sqlalchemy.orm import object_session import sqlalchemy.exc -import tempfile import traceback diff --git a/daklib/dbconn.py b/daklib/dbconn.py index 86a3e250..07bae107 100755 --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -41,23 +41,17 @@ import functools import os from os.path import normpath import re -import psycopg2 import subprocess -import traceback -from datetime import datetime, timedelta from debian.debfile import Deb822 -from errno import ENOENT -from tempfile import mkstemp, mkdtemp from tarfile import TarFile from inspect import getargspec import sqlalchemy -from sqlalchemy import create_engine, Table, MetaData, Column, Integer, desc, \ - Text, ForeignKey +from sqlalchemy import create_engine, Table, desc from sqlalchemy.orm import sessionmaker, mapper, relation, object_session, \ - backref, MapperExtension, EXT_CONTINUE, object_mapper + backref, object_mapper import sqlalchemy.types from sqlalchemy.orm.collections import attribute_mapped_collection from sqlalchemy.ext.associationproxy import association_proxy @@ -71,7 +65,6 @@ from .aptversion import AptVersion # in the database from .config import Config from .textutils import fix_maintainer -from .dak_exceptions import DBUpdateError, NoSourceFieldError, FileExistsError # suppress some deprecation warnings in squeeze related to sqlalchemy import warnings diff --git a/daklib/termcolor.py b/daklib/termcolor.py index f0e725ff..0064fe96 100644 --- a/daklib/termcolor.py +++ b/daklib/termcolor.py @@ -24,10 +24,6 @@ TermColor utils for dak ############################################################################### -import sys - -############################################################################### - __all__ = [] ############################################################################### diff --git a/daklib/utils.py b/daklib/utils.py index 2fd78480..9b85f0ae 100644 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -30,17 +30,13 @@ import datetime import os import pwd import grp -import select import socket import shutil import sqlalchemy.sql as sql import sys import tempfile -import traceback -import stat import apt_inst import apt_pkg -import time import re import email as modemail import subprocess @@ -51,16 +47,14 @@ import functools import daklib.config as config import daklib.daksubprocess from .dbconn import DBConn, get_architecture, get_component, get_suite, \ - get_override_type, Keyring, session_wrapper, \ get_active_keyring_paths, \ - get_suite_architectures, get_or_set_metadatakey, DBSource, \ + get_suite_architectures, get_or_set_metadatakey, \ Component, Override, OverrideType -from sqlalchemy import desc from .dak_exceptions import * from .gpg import SignedFile from .textutils import fix_maintainer from .regexes import re_html_escaping, html_escaping, re_single_line_field, \ - re_multi_line_field, re_srchasver, re_taint_free, \ + re_multi_line_field, re_srchasver, \ re_re_mark, re_whitespace_comment, re_issource, \ re_build_dep_arch, re_parse_maintainer diff --git a/scripts/debian/link_morgue b/scripts/debian/link_morgue index f6f5a3e8..77abe931 100755 --- a/scripts/debian/link_morgue +++ b/scripts/debian/link_morgue @@ -17,7 +17,6 @@ # along with this program. If not, see . import argparse -import errno import gzip import hashlib import os -- GitLab