From c9455a7484fa5ead1a90e40b78512867b4285020 Mon Sep 17 00:00:00 2001 From: Alexandru Damian Date: Tue, 18 Aug 2015 17:28:57 +0100 Subject: bitbake: toaster: fix pylint errors Prompted by issues discovered during running pylint on the toaster sources, this patch fixes: * missing import in toaster ui * improper call of function in toaster ui (logger.debug) * improper function definitions in bbcontroller * invalid references to objects in bldcontrol.models * proper initialization of object fields in ToasterTables Also inhibiting specific pylint errors in files where the problems are mis-identified. (Bitbake rev: 1c71955c416fb68455f7f70669aba4202c411807) Signed-off-by: Alexandru Damian Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/toasterui.py | 5 +++-- bitbake/lib/toaster/bldcontrol/bbcontroller.py | 2 +- bitbake/lib/toaster/orm/models.py | 2 +- bitbake/lib/toaster/toastergui/views.py | 4 ++++ bitbake/lib/toaster/toastergui/widgets.py | 3 +++ bitbake/lib/toaster/toastermain/management/commands/perf.py | 7 ++++++- 6 files changed, 18 insertions(+), 5 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py index f30f89e409..767bfabe31 100644 --- a/bitbake/lib/bb/ui/toasterui.py +++ b/bitbake/lib/bb/ui/toasterui.py @@ -21,6 +21,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. from __future__ import division +import sys try: import bb except RuntimeError as exc: @@ -255,10 +256,10 @@ def main(server, eventHandler, params ): # we start a new build info if buildinfohelper.brbe is not None: - logger.debug(1, "ToasterUI under BuildEnvironment management - exiting after the build") + logger.debug("ToasterUI under BuildEnvironment management - exiting after the build") server.terminateServer() else: - logger.debug(1, "ToasterUI prepared for new build") + logger.debug("ToasterUI prepared for new build") errors = 0 warnings = 0 taskfailures = [] diff --git a/bitbake/lib/toaster/bldcontrol/bbcontroller.py b/bitbake/lib/toaster/bldcontrol/bbcontroller.py index 9dd01e0deb..ad70ac8b54 100644 --- a/bitbake/lib/toaster/bldcontrol/bbcontroller.py +++ b/bitbake/lib/toaster/bldcontrol/bbcontroller.py @@ -177,7 +177,7 @@ class BuildEnvironmentController(object): return BitbakeController(self.connection) - def getArtifact(path): + def getArtifact(self, path): """ This call returns an artifact identified by the 'path'. How 'path' is interpreted as up to the implementing BEC. The return MUST be a REST URL where a GET will actually return the content of the artifact, e.g. for use as a "download link" in a web UI. diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index de0070272e..92fcaa7adf 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -81,7 +81,7 @@ class ProjectManager(models.Manager): for rdl in release.releasedefaultlayer_set.all(): try: - lv =Layer_Version.objects.filter(layer__name = rdl.layer_name, up_branch__name = release.branch_name)[0].get_equivalents_wpriority(prj)[0] + lv = Layer_Version.objects.filter(layer__name = rdl.layer_name, up_branch__name = release.branch_name)[0].get_equivalents_wpriority(prj)[0] ProjectLayer.objects.create( project = prj, layercommit = lv, optional = False ) diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 2aadc75b9e..586a69c314 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -19,6 +19,10 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# pylint: disable=method-hidden +# Gives E:848, 4: An attribute defined in json.encoder line 162 hides this method (method-hidden) +# which is an invalid warning + import operator,re from django.db.models import F, Q, Sum, Count, Max diff --git a/bitbake/lib/toaster/toastergui/widgets.py b/bitbake/lib/toaster/toastergui/widgets.py index 2adf574783..eb2914d87c 100644 --- a/bitbake/lib/toaster/toastergui/widgets.py +++ b/bitbake/lib/toaster/toastergui/widgets.py @@ -334,6 +334,9 @@ class ToasterTemplateView(TemplateView): # renders a instance in a template, or returns the context as json # the class-equivalent of the _template_renderer decorator for views + def __init__(self, *args, **kwargs): + super(ToasterTemplateView, self).__init__(*args, **kwargs) + self.context_entries = [] def get(self, *args, **kwargs): if self.request.GET.get('format', None) == 'json': diff --git a/bitbake/lib/toaster/toastermain/management/commands/perf.py b/bitbake/lib/toaster/toastermain/management/commands/perf.py index d28f26ab16..71a48e95d8 100644 --- a/bitbake/lib/toaster/toastermain/management/commands/perf.py +++ b/bitbake/lib/toaster/toastermain/management/commands/perf.py @@ -2,7 +2,12 @@ from django.core.management.base import BaseCommand from django.test.client import Client import os, sys, re import requests -import toastermain.settings as settings +from django.conf import settings + +# pylint: disable=E1103 +# Instance of 'WSGIRequest' has no 'status_code' member +# (but some types could not be inferred) (maybe-no-member) + class Command(BaseCommand): help = "Test the response time for all toaster urls" -- cgit v1.2.3-54-g00ecf