From 0ac5174c7d39a3e49893df0d517d47bec1935555 Mon Sep 17 00:00:00 2001 From: Frazer Clews Date: Thu, 16 Jan 2020 16:55:18 +0000 Subject: bitbake: lib: remove unused imports removed unused imports which made the code harder to read, and slightly but less efficient (Bitbake rev: 4367692a932ac135c5aa4f9f2a4e4f0150f76697) Signed-off-by: Frazer Clews Signed-off-by: Richard Purdie --- bitbake/lib/bb/COW.py | 1 - bitbake/lib/bb/build.py | 1 - bitbake/lib/bb/cache.py | 1 - bitbake/lib/bb/checksum.py | 1 - bitbake/lib/bb/codeparser.py | 26 ++-------------------- bitbake/lib/bb/cooker.py | 4 ---- bitbake/lib/bb/event.py | 3 +-- bitbake/lib/bb/fetch2/bzr.py | 2 -- bitbake/lib/bb/fetch2/clearcase.py | 1 - bitbake/lib/bb/fetch2/cvs.py | 1 - bitbake/lib/bb/fetch2/gitannex.py | 2 -- bitbake/lib/bb/fetch2/gitsm.py | 1 - bitbake/lib/bb/fetch2/hg.py | 2 -- bitbake/lib/bb/fetch2/npm.py | 1 - bitbake/lib/bb/fetch2/osc.py | 2 -- bitbake/lib/bb/fetch2/perforce.py | 1 - bitbake/lib/bb/fetch2/ssh.py | 2 -- bitbake/lib/bb/fetch2/svn.py | 2 -- bitbake/lib/bb/fetch2/wget.py | 3 --- bitbake/lib/bb/monitordisk.py | 2 +- bitbake/lib/bb/msg.py | 2 -- bitbake/lib/bb/parse/ast.py | 4 ---- bitbake/lib/bb/parse/parse_py/BBHandler.py | 2 -- bitbake/lib/bb/progress.py | 1 - bitbake/lib/bb/runqueue.py | 4 +--- bitbake/lib/bb/server/xmlrpcclient.py | 3 --- bitbake/lib/bb/server/xmlrpcserver.py | 3 --- bitbake/lib/bb/tests/cooker.py | 1 - bitbake/lib/bb/tests/cow.py | 2 +- bitbake/lib/bb/tests/fetch.py | 1 - bitbake/lib/bb/tests/runqueue.py | 1 - bitbake/lib/bb/tinfoil.py | 4 ++-- bitbake/lib/bb/ui/knotty.py | 1 - bitbake/lib/bb/ui/ncurses.py | 3 +-- bitbake/lib/bb/ui/taskexp.py | 2 -- bitbake/lib/bb/utils.py | 1 - bitbake/lib/bs4/builder/_html5lib.py | 1 - bitbake/lib/bs4/dammit.py | 8 ------- bitbake/lib/bs4/element.py | 1 - bitbake/lib/bs4/testing.py | 1 - bitbake/lib/bs4/tests/test_docs.py | 4 ---- bitbake/lib/bs4/tests/test_htmlparser.py | 1 - bitbake/lib/bs4/tests/test_lxml.py | 8 +------ bitbake/lib/bs4/tests/test_soup.py | 6 +---- bitbake/lib/bs4/tests/test_tree.py | 11 ++------- bitbake/lib/hashserv/client.py | 1 - bitbake/lib/layerindexlib/cooker.py | 3 +-- bitbake/lib/layerindexlib/plugin.py | 3 --- bitbake/lib/layerindexlib/tests/cooker.py | 3 --- bitbake/lib/layerindexlib/tests/layerindexobj.py | 6 ----- bitbake/lib/layerindexlib/tests/restapi.py | 3 --- bitbake/lib/toaster/bldcollector/urls.py | 2 +- bitbake/lib/toaster/bldcollector/views.py | 8 ------- bitbake/lib/toaster/bldcontrol/admin.py | 1 - bitbake/lib/toaster/bldcontrol/bbcontroller.py | 4 +--- .../toaster/bldcontrol/localhostbecontroller.py | 11 ++++----- .../management/commands/checksettings.py | 4 +--- bitbake/lib/toaster/bldcontrol/models.py | 3 +-- .../toaster/orm/management/commands/lsupdates.py | 2 +- .../orm/migrations/0011_delete_layersource.py | 2 +- .../toaster/tests/browser/selenium_helpers_base.py | 1 - .../tests/browser/test_project_config_page.py | 3 --- .../tests/functional/test_functional_basic.py | 1 - bitbake/lib/toaster/toastergui/api.py | 3 --- bitbake/lib/toaster/toastergui/tables.py | 9 ++------ .../templatetags/objects_to_dictionaries_filter.py | 1 - .../toaster/toastergui/templatetags/projecttags.py | 2 +- bitbake/lib/toaster/toastergui/urls.py | 5 ++--- bitbake/lib/toaster/toastergui/views.py | 9 +++----- .../toastermain/management/commands/builddelete.py | 4 +--- .../toastermain/management/commands/buildimport.py | 6 ++--- .../toastermain/management/commands/buildslist.py | 3 +-- 72 files changed, 36 insertions(+), 202 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/COW.py b/bitbake/lib/bb/COW.py index d26e981951..bc20ce38e2 100644 --- a/bitbake/lib/bb/COW.py +++ b/bitbake/lib/bb/COW.py @@ -10,7 +10,6 @@ import copy -import types ImmutableTypes = ( bool, complex, diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 3d9cc10c8c..b6d23e6805 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py @@ -15,7 +15,6 @@ import os import sys import logging -import shlex import glob import time import stat diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index ead8abc5d8..a5aaf3b999 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py @@ -17,7 +17,6 @@ # import os -import sys import logging import pickle from collections import defaultdict diff --git a/bitbake/lib/bb/checksum.py b/bitbake/lib/bb/checksum.py index 677020f497..1d50a26426 100644 --- a/bitbake/lib/bb/checksum.py +++ b/bitbake/lib/bb/checksum.py @@ -9,7 +9,6 @@ import glob import operator import os import stat -import pickle import bb.utils import logging from bb.cache import MultiProcessCache diff --git a/bitbake/lib/bb/codeparser.py b/bitbake/lib/bb/codeparser.py index fd2c4734f0..25a7ac69d3 100644 --- a/bitbake/lib/bb/codeparser.py +++ b/bitbake/lib/bb/codeparser.py @@ -25,13 +25,11 @@ import ast import sys import codegen import logging -import pickle import bb.pysh as pysh -import os.path import bb.utils, bb.data import hashlib from itertools import chain -from bb.pysh import pyshyacc, pyshlex, sherrors +from bb.pysh import pyshyacc, pyshlex from bb.cache import MultiProcessCache logger = logging.getLogger('BitBake.CodeParser') @@ -58,30 +56,10 @@ def check_indent(codestr): return codestr - -# Basically pickle, in python 2.7.3 at least, does badly with data duplication -# upon pickling and unpickling. Combine this with duplicate objects and things -# are a mess. -# -# When the sets are originally created, python calls intern() on the set keys -# which significantly improves memory usage. Sadly the pickle/unpickle process -# doesn't call intern() on the keys and results in the same strings being duplicated -# in memory. This also means pickle will save the same string multiple times in -# the cache file. -# -# By having shell and python cacheline objects with setstate/getstate, we force -# the object creation through our own routine where we can call intern (via internSet). -# -# We also use hashable frozensets and ensure we use references to these so that -# duplicates can be removed, both in memory and in the resulting pickled data. -# -# By playing these games, the size of the cache file shrinks dramatically -# meaning faster load times and the reloaded cache files also consume much less -# memory. Smaller cache files, faster load times and lower memory usage is good. -# # A custom getstate/setstate using tuples is actually worth 15% cachesize by # avoiding duplication of the attribute names! + class SetCache(object): def __init__(self): self.setcache = {} diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index b74affa7ec..3d65b0cb74 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -10,7 +10,6 @@ # import sys, os, glob, os.path, re, time -import atexit import itertools import logging import multiprocessing @@ -18,14 +17,11 @@ import sre_constants import threading from io import StringIO, UnsupportedOperation from contextlib import closing -from functools import wraps from collections import defaultdict, namedtuple import bb, bb.exceptions, bb.command from bb import utils, data, parse, event, cache, providers, taskdata, runqueue, build import queue import signal -import subprocess -import errno import prserv.serv import pyinotify import json diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py index d44621edf4..42143e7407 100644 --- a/bitbake/lib/bb/event.py +++ b/bitbake/lib/bb/event.py @@ -10,8 +10,7 @@ BitBake build tools. # SPDX-License-Identifier: GPL-2.0-only # -import os, sys -import warnings +import sys import pickle import logging import atexit diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py index c56d875300..566ace9f05 100644 --- a/bitbake/lib/bb/fetch2/bzr.py +++ b/bitbake/lib/bb/fetch2/bzr.py @@ -14,8 +14,6 @@ BitBake 'Fetch' implementation for bzr. # import os -import sys -import logging import bb from bb.fetch2 import FetchMethod from bb.fetch2 import FetchError diff --git a/bitbake/lib/bb/fetch2/clearcase.py b/bitbake/lib/bb/fetch2/clearcase.py index ad2f3edc74..49d7ae1b09 100644 --- a/bitbake/lib/bb/fetch2/clearcase.py +++ b/bitbake/lib/bb/fetch2/clearcase.py @@ -49,7 +49,6 @@ User credentials: # import os -import sys import shutil import bb from bb.fetch2 import FetchMethod diff --git a/bitbake/lib/bb/fetch2/cvs.py b/bitbake/lib/bb/fetch2/cvs.py index 1b35ba4cf0..29123a483c 100644 --- a/bitbake/lib/bb/fetch2/cvs.py +++ b/bitbake/lib/bb/fetch2/cvs.py @@ -14,7 +14,6 @@ BitBake build tools. # import os -import logging import bb from bb.fetch2 import FetchMethod, FetchError, MissingParameterError, logger from bb.fetch2 import runfetchcmd diff --git a/bitbake/lib/bb/fetch2/gitannex.py b/bitbake/lib/bb/fetch2/gitannex.py index 1d497dcb0f..80a808d88f 100644 --- a/bitbake/lib/bb/fetch2/gitannex.py +++ b/bitbake/lib/bb/fetch2/gitannex.py @@ -8,11 +8,9 @@ BitBake 'Fetch' git annex implementation # SPDX-License-Identifier: GPL-2.0-only # -import os import bb from bb.fetch2.git import Git from bb.fetch2 import runfetchcmd -from bb.fetch2 import logger class GitANNEX(Git): def supports(self, ud, d): diff --git a/bitbake/lib/bb/fetch2/gitsm.py b/bitbake/lib/bb/fetch2/gitsm.py index c622771d21..aa121cbee1 100644 --- a/bitbake/lib/bb/fetch2/gitsm.py +++ b/bitbake/lib/bb/fetch2/gitsm.py @@ -24,7 +24,6 @@ from bb.fetch2.git import Git from bb.fetch2 import runfetchcmd from bb.fetch2 import logger from bb.fetch2 import Fetch -from bb.fetch2 import BBFetchException class GitSM(Git): def supports(self, ud, d): diff --git a/bitbake/lib/bb/fetch2/hg.py b/bitbake/lib/bb/fetch2/hg.py index e21115debf..8f503701ed 100644 --- a/bitbake/lib/bb/fetch2/hg.py +++ b/bitbake/lib/bb/fetch2/hg.py @@ -13,8 +13,6 @@ BitBake 'Fetch' implementation for mercurial DRCS (hg). # import os -import sys -import logging import bb import errno from bb.fetch2 import FetchMethod diff --git a/bitbake/lib/bb/fetch2/npm.py b/bitbake/lib/bb/fetch2/npm.py index 9700e61029..be21399e59 100644 --- a/bitbake/lib/bb/fetch2/npm.py +++ b/bitbake/lib/bb/fetch2/npm.py @@ -20,7 +20,6 @@ Usage in the recipe: """ import os -import sys import urllib.request, urllib.parse, urllib.error import json import subprocess diff --git a/bitbake/lib/bb/fetch2/osc.py b/bitbake/lib/bb/fetch2/osc.py index 3e567155dc..f55db6f791 100644 --- a/bitbake/lib/bb/fetch2/osc.py +++ b/bitbake/lib/bb/fetch2/osc.py @@ -7,8 +7,6 @@ Based on the svn "Fetch" implementation. """ -import os -import sys import logging import bb from bb.fetch2 import FetchMethod diff --git a/bitbake/lib/bb/fetch2/perforce.py b/bitbake/lib/bb/fetch2/perforce.py index 54d001ec81..b2ac11ecab 100644 --- a/bitbake/lib/bb/fetch2/perforce.py +++ b/bitbake/lib/bb/fetch2/perforce.py @@ -11,7 +11,6 @@ BitBake 'Fetch' implementation for perforce # Based on functions from the base bb module, Copyright 2003 Holger Schurig import os -import logging import bb from bb.fetch2 import FetchMethod from bb.fetch2 import FetchError diff --git a/bitbake/lib/bb/fetch2/ssh.py b/bitbake/lib/bb/fetch2/ssh.py index f5be060c43..34debe399b 100644 --- a/bitbake/lib/bb/fetch2/ssh.py +++ b/bitbake/lib/bb/fetch2/ssh.py @@ -32,8 +32,6 @@ IETF secsh internet draft: import re, os from bb.fetch2 import FetchMethod -from bb.fetch2 import FetchError -from bb.fetch2 import logger from bb.fetch2 import runfetchcmd diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py index 96d666ba33..6c8caf5fb9 100644 --- a/bitbake/lib/bb/fetch2/svn.py +++ b/bitbake/lib/bb/fetch2/svn.py @@ -11,8 +11,6 @@ BitBake 'Fetch' implementation for svn. # Based on functions from the base bb module, Copyright 2003 Holger Schurig import os -import sys -import logging import bb import re from bb.fetch2 import FetchMethod diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py index 725586d2b5..72bc6c8f4d 100644 --- a/bitbake/lib/bb/fetch2/wget.py +++ b/bitbake/lib/bb/fetch2/wget.py @@ -14,9 +14,7 @@ BitBake build tools. import re import tempfile -import subprocess import os -import logging import errno import bb import bb.progress @@ -27,7 +25,6 @@ from bb.fetch2 import FetchMethod from bb.fetch2 import FetchError from bb.fetch2 import logger from bb.fetch2 import runfetchcmd -from bb.fetch2 import FetchConnectionCache from bb.utils import export_proxies from bs4 import BeautifulSoup from bs4 import SoupStrainer diff --git a/bitbake/lib/bb/monitordisk.py b/bitbake/lib/bb/monitordisk.py index 1a25b0041f..e7c07264a8 100644 --- a/bitbake/lib/bb/monitordisk.py +++ b/bitbake/lib/bb/monitordisk.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -import os, logging, re, sys +import os, logging, re import bb logger = logging.getLogger("BitBake.Monitor") diff --git a/bitbake/lib/bb/msg.py b/bitbake/lib/bb/msg.py index 6216eb3bc4..33c0e2fa19 100644 --- a/bitbake/lib/bb/msg.py +++ b/bitbake/lib/bb/msg.py @@ -13,9 +13,7 @@ Message handling infrastructure for bitbake import sys import copy import logging -import collections from itertools import groupby -import warnings import bb import bb.event diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index f0911e6fb7..362c1a39ce 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py @@ -9,11 +9,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -import re -import string -import logging import bb -import itertools from bb import methodpool from bb.parse import logger diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 6f7cf82b25..6e216effb8 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -13,9 +13,7 @@ # import re, bb, os -import logging import bb.build, bb.utils -from bb import data from . import ConfHandler from .. import resolve_file, ast, logger, ParseError diff --git a/bitbake/lib/bb/progress.py b/bitbake/lib/bb/progress.py index 4022caa717..9c755b7f73 100644 --- a/bitbake/lib/bb/progress.py +++ b/bitbake/lib/bb/progress.py @@ -7,7 +7,6 @@ BitBake progress handling code # SPDX-License-Identifier: GPL-2.0-only # -import sys import re import time import inspect diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index d7186e8516..71108eeed7 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -12,14 +12,12 @@ Handles preparation and execution of a queue of tasks import copy import os import sys -import signal import stat -import fcntl import errno import logging import re import bb -from bb import msg, data, event +from bb import msg, event from bb import monitordisk import subprocess import pickle diff --git a/bitbake/lib/bb/server/xmlrpcclient.py b/bitbake/lib/bb/server/xmlrpcclient.py index c054c3c89d..442ea7b264 100644 --- a/bitbake/lib/bb/server/xmlrpcclient.py +++ b/bitbake/lib/bb/server/xmlrpcclient.py @@ -7,9 +7,6 @@ # SPDX-License-Identifier: GPL-2.0-only # -import os -import sys - import socket import http.client import xmlrpc.client diff --git a/bitbake/lib/bb/server/xmlrpcserver.py b/bitbake/lib/bb/server/xmlrpcserver.py index 54fa32f573..2fa71be667 100644 --- a/bitbake/lib/bb/server/xmlrpcserver.py +++ b/bitbake/lib/bb/server/xmlrpcserver.py @@ -7,9 +7,6 @@ # SPDX-License-Identifier: GPL-2.0-only # -import os -import sys - import hashlib import time import inspect diff --git a/bitbake/lib/bb/tests/cooker.py b/bitbake/lib/bb/tests/cooker.py index 090916e949..74c903f010 100644 --- a/bitbake/lib/bb/tests/cooker.py +++ b/bitbake/lib/bb/tests/cooker.py @@ -5,7 +5,6 @@ # import unittest -import tempfile import os import bb, bb.cooker import re diff --git a/bitbake/lib/bb/tests/cow.py b/bitbake/lib/bb/tests/cow.py index b4af4bbcbf..bf6e79fcee 100644 --- a/bitbake/lib/bb/tests/cow.py +++ b/bitbake/lib/bb/tests/cow.py @@ -7,7 +7,7 @@ # import unittest -import os + class COWTestCase(unittest.TestCase): """ diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py index 83fad3ff0d..4d347dead7 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py @@ -9,7 +9,6 @@ import unittest import hashlib import tempfile -import subprocess import collections import os from bb.fetch2 import URI diff --git a/bitbake/lib/bb/tests/runqueue.py b/bitbake/lib/bb/tests/runqueue.py index 20c88ac3d5..4ba12a0772 100644 --- a/bitbake/lib/bb/tests/runqueue.py +++ b/bitbake/lib/bb/tests/runqueue.py @@ -7,7 +7,6 @@ # import unittest -import bb import os import tempfile import subprocess diff --git a/bitbake/lib/bb/tinfoil.py b/bitbake/lib/bb/tinfoil.py index 0a1b913055..0bd7836323 100644 --- a/bitbake/lib/bb/tinfoil.py +++ b/bitbake/lib/bb/tinfoil.py @@ -21,8 +21,8 @@ import bb.taskdata import bb.utils import bb.command import bb.remotedata -from bb.cookerdata import CookerConfiguration, ConfigParameters -from bb.main import setup_bitbake, BitBakeConfigParameters, BBMainException +from bb.cookerdata import CookerConfiguration +from bb.main import setup_bitbake, BitBakeConfigParameters import bb.fetch2 diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index c6abb2a114..19008a4ead 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py @@ -12,7 +12,6 @@ from __future__ import division import os import sys -import xmlrpc.client as xmlrpclib import logging import progressbar import signal diff --git a/bitbake/lib/bb/ui/ncurses.py b/bitbake/lib/bb/ui/ncurses.py index c422732b26..49569e375b 100644 --- a/bitbake/lib/bb/ui/ncurses.py +++ b/bitbake/lib/bb/ui/ncurses.py @@ -37,7 +37,7 @@ import logging -import os, sys, itertools, time, subprocess +import os, sys, itertools, time try: import curses @@ -46,7 +46,6 @@ except ImportError: import bb import xmlrpc.client -from bb import ui from bb.ui import uihelper parsespin = itertools.cycle( r'|/-\\' ) diff --git a/bitbake/lib/bb/ui/taskexp.py b/bitbake/lib/bb/ui/taskexp.py index 50a943cd05..7895102b95 100644 --- a/bitbake/lib/bb/ui/taskexp.py +++ b/bitbake/lib/bb/ui/taskexp.py @@ -11,10 +11,8 @@ import sys import gi gi.require_version('Gtk', '3.0') from gi.repository import Gtk, Gdk, GObject -from multiprocessing import Queue import threading from xmlrpc import client -import time import bb import bb.event diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index d65265c461..06c8819d26 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -24,7 +24,6 @@ import fnmatch import traceback import errno import signal -import ast import collections import copy from subprocess import getstatusoutput diff --git a/bitbake/lib/bs4/builder/_html5lib.py b/bitbake/lib/bs4/builder/_html5lib.py index 2b7a70aa11..4091ce88b9 100644 --- a/bitbake/lib/bs4/builder/_html5lib.py +++ b/bitbake/lib/bs4/builder/_html5lib.py @@ -2,7 +2,6 @@ __all__ = [ 'HTML5TreeBuilder', ] -from pdb import set_trace import warnings from bs4.builder import ( PERMISSIVE, diff --git a/bitbake/lib/bs4/dammit.py b/bitbake/lib/bs4/dammit.py index 805aa908a5..7ad9e0dd1e 100644 --- a/bitbake/lib/bs4/dammit.py +++ b/bitbake/lib/bs4/dammit.py @@ -8,12 +8,10 @@ XML or HTML to reflect a new encoding; that's the tree builder's job. """ __license__ = "MIT" -from pdb import set_trace import codecs from html.entities import codepoint2name import re import logging -import string # Import a library to autodetect character encodings. chardet_type = None @@ -38,12 +36,6 @@ except ImportError: def chardet_dammit(s): return None -# Available from http://cjkpython.i18n.org/. -try: - import iconv_codec -except ImportError: - pass - xml_encoding_re = re.compile( r'^<\?.*encoding=[\'"](.*?)[\'"].*\?>'.encode(), re.I) html_meta_re = re.compile( diff --git a/bitbake/lib/bs4/element.py b/bitbake/lib/bs4/element.py index 3775a60458..68be42d138 100644 --- a/bitbake/lib/bs4/element.py +++ b/bitbake/lib/bs4/element.py @@ -1,6 +1,5 @@ __license__ = "MIT" -from pdb import set_trace import collections.abc import re import sys diff --git a/bitbake/lib/bs4/testing.py b/bitbake/lib/bs4/testing.py index 3a2f260e24..953bca8e91 100644 --- a/bitbake/lib/bs4/testing.py +++ b/bitbake/lib/bs4/testing.py @@ -4,7 +4,6 @@ __license__ = "MIT" import pickle import copy -import functools import unittest from unittest import TestCase from bs4 import BeautifulSoup diff --git a/bitbake/lib/bs4/tests/test_docs.py b/bitbake/lib/bs4/tests/test_docs.py index 5b9f677093..d1d76a33bf 100644 --- a/bitbake/lib/bs4/tests/test_docs.py +++ b/bitbake/lib/bs4/tests/test_docs.py @@ -7,19 +7,15 @@ __all__ = [ 'additional_tests', ] -import atexit import doctest -import os #from pkg_resources import ( # resource_filename, resource_exists, resource_listdir, cleanup_resources) -import unittest DOCTEST_FLAGS = ( doctest.ELLIPSIS | doctest.NORMALIZE_WHITESPACE | doctest.REPORT_NDIFF) - # def additional_tests(): # "Run the doc tests (README.txt and docs/*, if any exist)" # doctest_files = [ diff --git a/bitbake/lib/bs4/tests/test_htmlparser.py b/bitbake/lib/bs4/tests/test_htmlparser.py index b45e35f999..30a25e6709 100644 --- a/bitbake/lib/bs4/tests/test_htmlparser.py +++ b/bitbake/lib/bs4/tests/test_htmlparser.py @@ -1,7 +1,6 @@ """Tests to ensure that the html.parser tree builder generates good trees.""" -from pdb import set_trace import pickle from bs4.testing import SoupTest, HTMLTreeBuilderSmokeTest from bs4.builder import HTMLParserTreeBuilder diff --git a/bitbake/lib/bs4/tests/test_lxml.py b/bitbake/lib/bs4/tests/test_lxml.py index 6c2a1d73eb..6b6cdd07cb 100644 --- a/bitbake/lib/bs4/tests/test_lxml.py +++ b/bitbake/lib/bs4/tests/test_lxml.py @@ -1,6 +1,5 @@ """Tests to ensure that the lxml tree builder generates good trees.""" -import re import warnings try: @@ -14,13 +13,8 @@ except ImportError as e: if LXML_PRESENT: from bs4.builder import LXMLTreeBuilder, LXMLTreeBuilderForXML -from bs4 import ( - BeautifulSoup, - BeautifulStoneSoup, - ) -from bs4.element import Comment, Doctype, SoupStrainer +from bs4 import BeautifulStoneSoup from bs4.testing import skipIf -from bs4.tests import test_htmlparser from bs4.testing import ( HTMLTreeBuilderSmokeTest, XMLTreeBuilderSmokeTest, diff --git a/bitbake/lib/bs4/tests/test_soup.py b/bitbake/lib/bs4/tests/test_soup.py index f87949e3d3..6ad3cb3765 100644 --- a/bitbake/lib/bs4/tests/test_soup.py +++ b/bitbake/lib/bs4/tests/test_soup.py @@ -1,16 +1,12 @@ # -*- coding: utf-8 -*- """Tests of Beautiful Soup as a whole.""" -from pdb import set_trace import logging import unittest import sys import tempfile -from bs4 import ( - BeautifulSoup, - BeautifulStoneSoup, -) +from bs4 import BeautifulSoup from bs4.element import ( CharsetMetaAttributeValue, ContentMetaAttributeValue, diff --git a/bitbake/lib/bs4/tests/test_tree.py b/bitbake/lib/bs4/tests/test_tree.py index 6d3e67f311..8e5c66426e 100644 --- a/bitbake/lib/bs4/tests/test_tree.py +++ b/bitbake/lib/bs4/tests/test_tree.py @@ -9,16 +9,12 @@ same markup, but all Beautiful Soup trees can be traversed with the methods tested here. """ -from pdb import set_trace import copy import pickle import re import warnings from bs4 import BeautifulSoup -from bs4.builder import ( - builder_registry, - HTMLParserTreeBuilder, -) +from bs4.builder import builder_registry from bs4.element import ( PY3K, CData, @@ -29,10 +25,7 @@ from bs4.element import ( SoupStrainer, Tag, ) -from bs4.testing import ( - SoupTest, - skipIf, -) +from bs4.testing import SoupTest XML_BUILDER_PRESENT = (builder_registry.lookup("xml") is not None) LXML_PRESENT = (builder_registry.lookup("lxml") is not None) diff --git a/bitbake/lib/hashserv/client.py b/bitbake/lib/hashserv/client.py index ae0cce9df4..46085d6418 100644 --- a/bitbake/lib/hashserv/client.py +++ b/bitbake/lib/hashserv/client.py @@ -3,7 +3,6 @@ # SPDX-License-Identifier: GPL-2.0-only # -from contextlib import closing import json import logging import socket diff --git a/bitbake/lib/layerindexlib/cooker.py b/bitbake/lib/layerindexlib/cooker.py index 604a9611dd..4ce397d884 100644 --- a/bitbake/lib/layerindexlib/cooker.py +++ b/bitbake/lib/layerindexlib/cooker.py @@ -4,9 +4,8 @@ # import logging -import json -from collections import OrderedDict, defaultdict +from collections import defaultdict from urllib.parse import unquote, urlparse diff --git a/bitbake/lib/layerindexlib/plugin.py b/bitbake/lib/layerindexlib/plugin.py index 7015a1af26..cadda36c74 100644 --- a/bitbake/lib/layerindexlib/plugin.py +++ b/bitbake/lib/layerindexlib/plugin.py @@ -7,10 +7,7 @@ # Plugin base class # Utility Functions for working on layerindex data -import argparse import logging -import os -import bb.msg logger = logging.getLogger('BitBake.layerindexlib.plugin') diff --git a/bitbake/lib/layerindexlib/tests/cooker.py b/bitbake/lib/layerindexlib/tests/cooker.py index 1fa102e602..1d0685e099 100644 --- a/bitbake/lib/layerindexlib/tests/cooker.py +++ b/bitbake/lib/layerindexlib/tests/cooker.py @@ -3,15 +3,12 @@ # SPDX-License-Identifier: GPL-2.0-only # -import unittest -import tempfile import os import bb import layerindexlib from layerindexlib.tests.common import LayersTest -import logging class LayerIndexCookerTest(LayersTest): diff --git a/bitbake/lib/layerindexlib/tests/layerindexobj.py b/bitbake/lib/layerindexlib/tests/layerindexobj.py index 0c5ec8881b..de1e474687 100644 --- a/bitbake/lib/layerindexlib/tests/layerindexobj.py +++ b/bitbake/lib/layerindexlib/tests/layerindexobj.py @@ -3,14 +3,8 @@ # SPDX-License-Identifier: GPL-2.0-only # -import unittest -import tempfile -import os -import bb - from layerindexlib.tests.common import LayersTest -import logging class LayerIndexObjectsTest(LayersTest): def setUp(self): diff --git a/bitbake/lib/layerindexlib/tests/restapi.py b/bitbake/lib/layerindexlib/tests/restapi.py index 6d8dc0058e..e5ccafe5c9 100644 --- a/bitbake/lib/layerindexlib/tests/restapi.py +++ b/bitbake/lib/layerindexlib/tests/restapi.py @@ -4,14 +4,11 @@ # import unittest -import tempfile import os -import bb import layerindexlib from layerindexlib.tests.common import LayersTest -import logging def skipIfNoNetwork(): if os.environ.get("BB_SKIP_NETTESTS") == "yes": diff --git a/bitbake/lib/toaster/bldcollector/urls.py b/bitbake/lib/toaster/bldcollector/urls.py index 8eb1e34a53..efd67a81a5 100644 --- a/bitbake/lib/toaster/bldcollector/urls.py +++ b/bitbake/lib/toaster/bldcollector/urls.py @@ -6,7 +6,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.conf.urls import include, url +from django.conf.urls import url import bldcollector.views diff --git a/bitbake/lib/toaster/bldcollector/views.py b/bitbake/lib/toaster/bldcollector/views.py index c708b415e1..6d9227cd7f 100644 --- a/bitbake/lib/toaster/bldcollector/views.py +++ b/bitbake/lib/toaster/bldcollector/views.py @@ -6,16 +6,8 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.views.decorators.cache import cache_control from django.core.urlresolvers import reverse -from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.http import HttpResponseBadRequest, HttpResponse -from django.utils import timezone -from django.utils.html import escape -from datetime import timedelta -from django.utils import formats -from toastergui.templatetags.projecttags import json as jsonfilter -import json import os import tempfile import subprocess diff --git a/bitbake/lib/toaster/bldcontrol/admin.py b/bitbake/lib/toaster/bldcontrol/admin.py index e85c30ed11..1754bc11cc 100644 --- a/bitbake/lib/toaster/bldcontrol/admin.py +++ b/bitbake/lib/toaster/bldcontrol/admin.py @@ -3,7 +3,6 @@ # from django.contrib import admin -from django.contrib.admin.filters import RelatedFieldListFilter from .models import BuildEnvironment class BuildEnvironmentAdmin(admin.ModelAdmin): diff --git a/bitbake/lib/toaster/bldcontrol/bbcontroller.py b/bitbake/lib/toaster/bldcontrol/bbcontroller.py index 301df1880a..71c288df34 100644 --- a/bitbake/lib/toaster/bldcontrol/bbcontroller.py +++ b/bitbake/lib/toaster/bldcontrol/bbcontroller.py @@ -8,10 +8,8 @@ import os import sys -import re -from django.db import transaction from django.db.models import Q -from bldcontrol.models import BuildEnvironment, BRLayer, BRVariable, BRTarget, BRBitbake +from bldcontrol.models import BuildEnvironment, BRLayer, BRBitbake # load Bitbake components path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))) diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index 39ea736b58..75674ccbf1 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py @@ -7,27 +7,24 @@ # import os -import sys import re import shutil import time -from django.db import transaction -from django.db.models import Q -from bldcontrol.models import BuildEnvironment, BuildRequest, BRLayer, BRVariable, BRTarget, BRBitbake, Build -from orm.models import CustomImageRecipe, Layer, Layer_Version, Project, ProjectLayer, ToasterSetting +from bldcontrol.models import BuildEnvironment, BuildRequest, Build +from orm.models import CustomImageRecipe, Layer, Layer_Version, Project, ToasterSetting from orm.models import signal_runbuilds import subprocess from toastermain import settings -from bldcontrol.bbcontroller import BuildEnvironmentController, ShellCmdException, BuildSetupException, BitbakeController +from bldcontrol.bbcontroller import BuildEnvironmentController, ShellCmdException, BuildSetupException import logging logger = logging.getLogger("toaster") install_dir = os.environ.get('TOASTER_DIR') -from pprint import pprint, pformat +from pprint import pformat class LocalhostBEController(BuildEnvironmentController): """ Implementation of the BuildEnvironmentController for the localhost; diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py index fe2c4dc2bb..cfcd4a00e5 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py @@ -2,11 +2,9 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.core.management.base import BaseCommand, CommandError -from django.db import transaction +from django.core.management.base import BaseCommand from django.core.management import call_command -from bldcontrol.bbcontroller import getBuildEnvironmentController, ShellCmdException from bldcontrol.models import BuildRequest, BuildEnvironment, BRError from orm.models import ToasterSetting, Build, Layer diff --git a/bitbake/lib/toaster/bldcontrol/models.py b/bitbake/lib/toaster/bldcontrol/models.py index bcffcf5e20..0d30fd9be0 100644 --- a/bitbake/lib/toaster/bldcontrol/models.py +++ b/bitbake/lib/toaster/bldcontrol/models.py @@ -4,9 +4,8 @@ from __future__ import unicode_literals from django.db import models -from django.core.validators import MaxValueValidator, MinValueValidator from django.utils.encoding import force_text -from orm.models import Project, ProjectLayer, ProjectVariable, ProjectTarget, Build, Layer_Version +from orm.models import Project, Build, Layer_Version import logging logger = logging.getLogger("toaster") diff --git a/bitbake/lib/toaster/orm/management/commands/lsupdates.py b/bitbake/lib/toaster/orm/management/commands/lsupdates.py index 5b5abbb295..a4dbcaa76e 100644 --- a/bitbake/lib/toaster/orm/management/commands/lsupdates.py +++ b/bitbake/lib/toaster/orm/management/commands/lsupdates.py @@ -8,7 +8,7 @@ from django.core.management.base import BaseCommand -from orm.models import LayerSource, Layer, Release, Layer_Version +from orm.models import Layer, Release, Layer_Version from orm.models import LayerVersionDependency, Machine, Recipe from orm.models import Distro from orm.models import ToasterSetting diff --git a/bitbake/lib/toaster/orm/migrations/0011_delete_layersource.py b/bitbake/lib/toaster/orm/migrations/0011_delete_layersource.py index 75506961a9..3f3a2e1612 100644 --- a/bitbake/lib/toaster/orm/migrations/0011_delete_layersource.py +++ b/bitbake/lib/toaster/orm/migrations/0011_delete_layersource.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations class Migration(migrations.Migration): diff --git a/bitbake/lib/toaster/tests/browser/selenium_helpers_base.py b/bitbake/lib/toaster/tests/browser/selenium_helpers_base.py index 6c94684e86..644d45fe58 100644 --- a/bitbake/lib/toaster/tests/browser/selenium_helpers_base.py +++ b/bitbake/lib/toaster/tests/browser/selenium_helpers_base.py @@ -19,7 +19,6 @@ import os import time import unittest -from django.contrib.staticfiles.testing import StaticLiveServerTestCase from selenium import webdriver from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.common.desired_capabilities import DesiredCapabilities diff --git a/bitbake/lib/toaster/tests/browser/test_project_config_page.py b/bitbake/lib/toaster/tests/browser/test_project_config_page.py index 2816eb9072..eaf27a1e78 100644 --- a/bitbake/lib/toaster/tests/browser/test_project_config_page.py +++ b/bitbake/lib/toaster/tests/browser/test_project_config_page.py @@ -7,10 +7,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -import re - from django.core.urlresolvers import reverse -from django.utils import timezone from tests.browser.selenium_helpers import SeleniumTestCase from orm.models import BitbakeVersion, Release, Project, ProjectVariable diff --git a/bitbake/lib/toaster/tests/functional/test_functional_basic.py b/bitbake/lib/toaster/tests/functional/test_functional_basic.py index 56c84fba8f..5683e3873e 100644 --- a/bitbake/lib/toaster/tests/functional/test_functional_basic.py +++ b/bitbake/lib/toaster/tests/functional/test_functional_basic.py @@ -7,7 +7,6 @@ # SPDX-License-Identifier: GPL-2.0-only # -import time import re from tests.functional.functional_helpers import SeleniumFunctionalTestCase from orm.models import Project diff --git a/bitbake/lib/toaster/toastergui/api.py b/bitbake/lib/toaster/toastergui/api.py index 8b49b3ee3f..a4afc9e704 100644 --- a/bitbake/lib/toaster/toastergui/api.py +++ b/bitbake/lib/toaster/toastergui/api.py @@ -13,7 +13,6 @@ import logging import json import subprocess from collections import Counter -from shutil import copyfile from orm.models import Project, ProjectTarget, Build, Layer_Version from orm.models import LayerVersionDependency, LayerSource, ProjectLayer @@ -29,8 +28,6 @@ from django.core.urlresolvers import reverse from django.db.models import Q, F from django.db import Error from toastergui.templatetags.projecttags import filtered_filesizeformat -from django.utils import timezone -import pytz # development/debugging support verbose = 2 diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py index b3ea2227e0..528dd32b0c 100644 --- a/bitbake/lib/toaster/toastergui/tables.py +++ b/bitbake/lib/toaster/toastergui/tables.py @@ -7,15 +7,10 @@ # from toastergui.widgets import ToasterTable -from orm.models import Recipe, ProjectLayer, Layer_Version, Machine, Project +from orm.models import Recipe, ProjectLayer, Layer_Version, Project from orm.models import CustomImageRecipe, Package, Target, Build, LogMessage, Task from orm.models import CustomImagePackage, Package_DependencyManager -from orm.models import Distro -from django.db.models import Q, Max, Sum, Count, When, Case, Value, IntegerField -from django.conf.urls import url -from django.core.urlresolvers import reverse, resolve -from django.http import HttpResponse -from django.views.generic import TemplateView +from django.db.models import Q, Sum, Count, When, Case, Value, IntegerField from toastergui.tablefilter import TableFilter from toastergui.tablefilter import TableFilterActionToggle diff --git a/bitbake/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py b/bitbake/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py index 048d533871..e242234bfd 100644 --- a/bitbake/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py +++ b/bitbake/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py @@ -3,7 +3,6 @@ # from django import template -import json register = template.Library() diff --git a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py index 1dbab3bdb9..354b61f081 100644 --- a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py +++ b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py @@ -6,7 +6,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -from datetime import datetime, timedelta +from datetime import timedelta from os.path import relpath import re from django import template diff --git a/bitbake/lib/toaster/toastergui/urls.py b/bitbake/lib/toaster/toastergui/urls.py index 673d9ae967..d2df4e6048 100644 --- a/bitbake/lib/toaster/toastergui/urls.py +++ b/bitbake/lib/toaster/toastergui/urls.py @@ -6,10 +6,9 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.conf.urls import include, url -from django.views.generic import RedirectView, TemplateView +from django.conf.urls import url +from django.views.generic import RedirectView -from django.http import HttpResponseBadRequest from toastergui import tables from toastergui import buildtables from toastergui import typeaheads diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index d7acaff892..7fecdaa973 100644 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -20,7 +20,7 @@ from orm.models import TargetKernelFile, TargetSDKFile, Target_Image_File from orm.models import BitbakeVersion, CustomImageRecipe from django.core.urlresolvers import reverse, resolve -from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist +from django.core.exceptions import ObjectDoesNotExist from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.http import HttpResponseNotFound, JsonResponse from django.utils import timezone @@ -664,7 +664,6 @@ def recipe_packages(request, build_id, recipe_id): _set_parameters_values(pagesize, orderby, request) return response -from django.core.serializers.json import DjangoJSONEncoder from django.http import HttpResponse def xhr_dirinfo(request, build_id, target_id): top = request.GET.get('start', '/') @@ -1340,7 +1339,7 @@ def json_build(request,build_id): import toastermain.settings -from orm.models import Project, ProjectLayer, ProjectTarget, ProjectVariable +from orm.models import Project, ProjectLayer, ProjectVariable from bldcontrol.models import BuildEnvironment # we have a set of functions if we're in managed mode, or @@ -1349,10 +1348,8 @@ from bldcontrol.models import BuildEnvironment if True: from django.contrib.auth.models import User from django.contrib.auth import authenticate, login - from django.contrib.auth.decorators import login_required - from orm.models import LayerSource, ToasterSetting, Release, Machine, LayerVersionDependency - from bldcontrol.models import BuildRequest + from orm.models import LayerSource, ToasterSetting, Release import traceback diff --git a/bitbake/lib/toaster/toastermain/management/commands/builddelete.py b/bitbake/lib/toaster/toastermain/management/commands/builddelete.py index c2d773a577..93919dec2d 100644 --- a/bitbake/lib/toaster/toastermain/management/commands/builddelete.py +++ b/bitbake/lib/toaster/toastermain/management/commands/builddelete.py @@ -2,12 +2,10 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.core.management.base import BaseCommand, CommandError +from django.core.management.base import BaseCommand from django.core.exceptions import ObjectDoesNotExist from orm.models import Build from django.db import OperationalError -import os - class Command(BaseCommand): diff --git a/bitbake/lib/toaster/toastermain/management/commands/buildimport.py b/bitbake/lib/toaster/toastermain/management/commands/buildimport.py index 408ad44e6e..9af54ec2f2 100644 --- a/bitbake/lib/toaster/toastermain/management/commands/buildimport.py +++ b/bitbake/lib/toaster/toastermain/management/commands/buildimport.py @@ -31,12 +31,10 @@ # ../bitbake/lib/toaster/manage.py buildimport --name=test --path=`pwd` --callback="" --command=import -from django.core.management.base import BaseCommand, CommandError -from django.core.exceptions import ObjectDoesNotExist -from orm.models import ProjectManager, Project, Release, ProjectVariable +from django.core.management.base import BaseCommand +from orm.models import Project, Release, ProjectVariable from orm.models import Layer, Layer_Version, LayerSource, ProjectLayer from toastergui.api import scan_layer_content -from django.db import OperationalError import os import re diff --git a/bitbake/lib/toaster/toastermain/management/commands/buildslist.py b/bitbake/lib/toaster/toastermain/management/commands/buildslist.py index 1ed20224d3..3ad5289c5e 100644 --- a/bitbake/lib/toaster/toastermain/management/commands/buildslist.py +++ b/bitbake/lib/toaster/toastermain/management/commands/buildslist.py @@ -2,9 +2,8 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.core.management.base import BaseCommand, CommandError +from django.core.management.base import BaseCommand from orm.models import Build -import os -- cgit v1.2.3-54-g00ecf