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 <frazer.clews@codethink.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Frazer Clews
2020-01-16 16:55:18 +00:00
committed by Richard Purdie
parent 444bcb6cb6
commit 0ac5174c7d
72 changed files with 36 additions and 202 deletions

View File

@@ -10,7 +10,6 @@
import copy
import types
ImmutableTypes = (
bool,
complex,

View File

@@ -15,7 +15,6 @@
import os
import sys
import logging
import shlex
import glob
import time
import stat

View File

@@ -17,7 +17,6 @@
#
import os
import sys
import logging
import pickle
from collections import defaultdict

View File

@@ -9,7 +9,6 @@ import glob
import operator
import os
import stat
import pickle
import bb.utils
import logging
from bb.cache import MultiProcessCache

View File

@@ -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 = {}

View File

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

View File

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

View File

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

View File

@@ -49,7 +49,6 @@ User credentials:
#
import os
import sys
import shutil
import bb
from bb.fetch2 import FetchMethod

View File

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

View File

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

View File

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

View File

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

View File

@@ -20,7 +20,6 @@ Usage in the recipe:
"""
import os
import sys
import urllib.request, urllib.parse, urllib.error
import json
import subprocess

View File

@@ -7,8 +7,6 @@ Based on the svn "Fetch" implementation.
"""
import os
import sys
import logging
import bb
from bb.fetch2 import FetchMethod

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -7,7 +7,6 @@ BitBake progress handling code
# SPDX-License-Identifier: GPL-2.0-only
#
import sys
import re
import time
import inspect

View File

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

View File

@@ -7,9 +7,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
import os
import sys
import socket
import http.client
import xmlrpc.client

View File

@@ -7,9 +7,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
import os
import sys
import hashlib
import time
import inspect

View File

@@ -5,7 +5,6 @@
#
import unittest
import tempfile
import os
import bb, bb.cooker
import re

View File

@@ -7,7 +7,7 @@
#
import unittest
import os
class COWTestCase(unittest.TestCase):
"""

View File

@@ -9,7 +9,6 @@
import unittest
import hashlib
import tempfile
import subprocess
import collections
import os
from bb.fetch2 import URI

View File

@@ -7,7 +7,6 @@
#
import unittest
import bb
import os
import tempfile
import subprocess

View File

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

View File

@@ -12,7 +12,6 @@ from __future__ import division
import os
import sys
import xmlrpc.client as xmlrpclib
import logging
import progressbar
import signal

View File

@@ -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'|/-\\' )

View File

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

View File

@@ -24,7 +24,6 @@ import fnmatch
import traceback
import errno
import signal
import ast
import collections
import copy
from subprocess import getstatusoutput

View File

@@ -2,7 +2,6 @@ __all__ = [
'HTML5TreeBuilder',
]
from pdb import set_trace
import warnings
from bs4.builder import (
PERMISSIVE,

View File

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

View File

@@ -1,6 +1,5 @@
__license__ = "MIT"
from pdb import set_trace
import collections.abc
import re
import sys

View File

@@ -4,7 +4,6 @@ __license__ = "MIT"
import pickle
import copy
import functools
import unittest
from unittest import TestCase
from bs4 import BeautifulSoup

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -3,7 +3,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
from contextlib import closing
import json
import logging
import socket

View File

@@ -4,9 +4,8 @@
#
import logging
import json
from collections import OrderedDict, defaultdict
from collections import defaultdict
from urllib.parse import unquote, urlparse

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -3,7 +3,6 @@
#
from django.contrib import admin
from django.contrib.admin.filters import RelatedFieldListFilter
from .models import BuildEnvironment
class BuildEnvironmentAdmin(admin.ModelAdmin):

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -3,7 +3,6 @@
#
from django import template
import json
register = template.Library()

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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