summaryrefslogtreecommitdiffstats
path: root/lib/toaster
diff options
context:
space:
mode:
authorFrazer Clews <frazer.clews@codethink.co.uk>2020-01-16 16:55:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-19 13:30:58 +0000
commit4367692a932ac135c5aa4f9f2a4e4f0150f76697 (patch)
treecfe5d7e8dcf9d924b301ad683444b293f83b2d46 /lib/toaster
parentf5daef68703481a3c243dfecc7de404e6ebfdbb6 (diff)
downloadbitbake-4367692a932ac135c5aa4f9f2a4e4f0150f76697.tar.gz
lib: remove unused imports
removed unused imports which made the code harder to read, and slightly but less efficient Signed-off-by: Frazer Clews <frazer.clews@codethink.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/toaster')
-rw-r--r--lib/toaster/bldcollector/urls.py2
-rw-r--r--lib/toaster/bldcollector/views.py8
-rw-r--r--lib/toaster/bldcontrol/admin.py1
-rw-r--r--lib/toaster/bldcontrol/bbcontroller.py4
-rw-r--r--lib/toaster/bldcontrol/localhostbecontroller.py11
-rw-r--r--lib/toaster/bldcontrol/management/commands/checksettings.py4
-rw-r--r--lib/toaster/bldcontrol/models.py3
-rw-r--r--lib/toaster/orm/management/commands/lsupdates.py2
-rw-r--r--lib/toaster/orm/migrations/0011_delete_layersource.py2
-rw-r--r--lib/toaster/tests/browser/selenium_helpers_base.py1
-rw-r--r--lib/toaster/tests/browser/test_project_config_page.py3
-rw-r--r--lib/toaster/tests/functional/test_functional_basic.py1
-rw-r--r--lib/toaster/toastergui/api.py3
-rw-r--r--lib/toaster/toastergui/tables.py9
-rw-r--r--lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py1
-rw-r--r--lib/toaster/toastergui/templatetags/projecttags.py2
-rw-r--r--lib/toaster/toastergui/urls.py5
-rw-r--r--lib/toaster/toastergui/views.py9
-rw-r--r--lib/toaster/toastermain/management/commands/builddelete.py4
-rw-r--r--lib/toaster/toastermain/management/commands/buildimport.py6
-rw-r--r--lib/toaster/toastermain/management/commands/buildslist.py3
21 files changed, 22 insertions, 62 deletions
diff --git a/lib/toaster/bldcollector/urls.py b/lib/toaster/bldcollector/urls.py
index 8eb1e34a5..efd67a81a 100644
--- a/lib/toaster/bldcollector/urls.py
+++ b/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/lib/toaster/bldcollector/views.py b/lib/toaster/bldcollector/views.py
index c708b415e..6d9227cd7 100644
--- a/lib/toaster/bldcollector/views.py
+++ b/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/lib/toaster/bldcontrol/admin.py b/lib/toaster/bldcontrol/admin.py
index e85c30ed1..1754bc11c 100644
--- a/lib/toaster/bldcontrol/admin.py
+++ b/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/lib/toaster/bldcontrol/bbcontroller.py b/lib/toaster/bldcontrol/bbcontroller.py
index 301df1880..71c288df3 100644
--- a/lib/toaster/bldcontrol/bbcontroller.py
+++ b/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/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py
index 39ea736b5..75674ccbf 100644
--- a/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/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/lib/toaster/bldcontrol/management/commands/checksettings.py b/lib/toaster/bldcontrol/management/commands/checksettings.py
index fe2c4dc2b..cfcd4a00e 100644
--- a/lib/toaster/bldcontrol/management/commands/checksettings.py
+++ b/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/lib/toaster/bldcontrol/models.py b/lib/toaster/bldcontrol/models.py
index bcffcf5e2..0d30fd9be 100644
--- a/lib/toaster/bldcontrol/models.py
+++ b/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/lib/toaster/orm/management/commands/lsupdates.py b/lib/toaster/orm/management/commands/lsupdates.py
index 5b5abbb29..a4dbcaa76 100644
--- a/lib/toaster/orm/management/commands/lsupdates.py
+++ b/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/lib/toaster/orm/migrations/0011_delete_layersource.py b/lib/toaster/orm/migrations/0011_delete_layersource.py
index 75506961a..3f3a2e161 100644
--- a/lib/toaster/orm/migrations/0011_delete_layersource.py
+++ b/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/lib/toaster/tests/browser/selenium_helpers_base.py b/lib/toaster/tests/browser/selenium_helpers_base.py
index 6c94684e8..644d45fe5 100644
--- a/lib/toaster/tests/browser/selenium_helpers_base.py
+++ b/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/lib/toaster/tests/browser/test_project_config_page.py b/lib/toaster/tests/browser/test_project_config_page.py
index 2816eb907..eaf27a1e7 100644
--- a/lib/toaster/tests/browser/test_project_config_page.py
+++ b/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/lib/toaster/tests/functional/test_functional_basic.py b/lib/toaster/tests/functional/test_functional_basic.py
index 56c84fba8..5683e3873 100644
--- a/lib/toaster/tests/functional/test_functional_basic.py
+++ b/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/lib/toaster/toastergui/api.py b/lib/toaster/toastergui/api.py
index 8b49b3ee3..a4afc9e70 100644
--- a/lib/toaster/toastergui/api.py
+++ b/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/lib/toaster/toastergui/tables.py b/lib/toaster/toastergui/tables.py
index b3ea2227e..528dd32b0 100644
--- a/lib/toaster/toastergui/tables.py
+++ b/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/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py b/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py
index 048d53387..e242234bf 100644
--- a/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py
+++ b/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/lib/toaster/toastergui/templatetags/projecttags.py b/lib/toaster/toastergui/templatetags/projecttags.py
index 1dbab3bdb..354b61f08 100644
--- a/lib/toaster/toastergui/templatetags/projecttags.py
+++ b/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/lib/toaster/toastergui/urls.py b/lib/toaster/toastergui/urls.py
index 673d9ae96..d2df4e604 100644
--- a/lib/toaster/toastergui/urls.py
+++ b/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/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py
index d7acaff89..7fecdaa97 100644
--- a/lib/toaster/toastergui/views.py
+++ b/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/lib/toaster/toastermain/management/commands/builddelete.py b/lib/toaster/toastermain/management/commands/builddelete.py
index c2d773a57..93919dec2 100644
--- a/lib/toaster/toastermain/management/commands/builddelete.py
+++ b/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/lib/toaster/toastermain/management/commands/buildimport.py b/lib/toaster/toastermain/management/commands/buildimport.py
index 408ad44e6..9af54ec2f 100644
--- a/lib/toaster/toastermain/management/commands/buildimport.py
+++ b/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/lib/toaster/toastermain/management/commands/buildslist.py b/lib/toaster/toastermain/management/commands/buildslist.py
index 1ed20224d..3ad5289c5 100644
--- a/lib/toaster/toastermain/management/commands/buildslist.py
+++ b/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