MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bitbake: lib: fix most undefined code picked up by pylint

Browse Source 
Correctly import, and inherit functions, and variables.
Also fix some typos and remove some Python 2 code that isn't recognised.

(Bitbake rev: b0c807be5c2170c9481c1a04d4c11972135d7dc5)

Signed-off-by: Frazer Clews <frazerleslieclews@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Frazer Clews 2020-08-24 15:51:37 +01:00 committed by Richard Purdie
parent ac3593f6ed
commit abc6f864b9
22 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitbake/lib/bb/__init__.py
View File

@ -93,7 +93,7 @@ class BBLoggerAdapter(logging.LoggerAdapter, BBLoggerMixin):
def __repr__(self):
logger = self.logger
level = getLevelName(logger.getEffectiveLevel())
level = logger.getLevelName(logger.getEffectiveLevel())
return '<%s %s (%s)>' % (self.__class__.__name__, logger.name, level)
logging.LoggerAdapter = BBLoggerAdapter

2
bitbake/lib/bb/daemonize.py
View File

@ -14,6 +14,8 @@ import sys
import io
import traceback
import bb
def createDaemon(function, logfile):
"""
Detach a process from the controlling terminal and run it in the

2
bitbake/lib/bb/data_smart.py
View File

@ -189,7 +189,7 @@ class IncludeHistory(object):
if self.current.parent:
self.current = self.current.parent
else:
bb.warn("Include log: Tried to finish '%s' at top level." % filename)
bb.warn("Include log: Tried to finish '%s' at top level." % self.filename)
return False
def emit(self, o, level = 0):

3
bitbake/lib/bb/fetch2/osc.py
View File

@ -8,12 +8,15 @@ Based on the svn "Fetch" implementation.
"""
import logging
import os
import bb
from bb.fetch2 import FetchMethod
from bb.fetch2 import FetchError
from bb.fetch2 import MissingParameterError
from bb.fetch2 import runfetchcmd
logger = logging.getLogger(__name__)
class Osc(FetchMethod):
"""Class to fetch a module or modules from Opensuse build server
repositories."""

7
bitbake/lib/bb/fetch2/ssh.py
View File

@ -31,8 +31,7 @@ IETF secsh internet draft:
#
import re, os
from bb.fetch2 import FetchMethod
from bb.fetch2 import runfetchcmd
from bb.fetch2 import check_network_access, FetchMethod, ParameterError, runfetchcmd
__pattern__ = re.compile(r'''
@ -65,7 +64,7 @@ class SSH(FetchMethod):
def urldata_init(self, urldata, d):
if 'protocol' in urldata.parm and urldata.parm['protocol'] == 'git':
raise bb.fetch2.ParameterError(
raise ParameterError(
"Invalid protocol - if you wish to fetch from a git " +
"repository using ssh, you need to use " +
"git:// prefix with protocol=ssh", urldata.url)
@ -105,7 +104,7 @@ class SSH(FetchMethod):
dldir
)
bb.fetch2.check_network_access(d, cmd, urldata.url)
check_network_access(d, cmd, urldata.url)
runfetchcmd(cmd, d)

1
bitbake/lib/bb/msg.py
View File

@ -14,6 +14,7 @@ import sys
import copy
import logging
import logging.config
import os
from itertools import groupby
import bb
import bb.event

14
bitbake/lib/bb/namedtuple_with_abc.py
View File

@ -61,17 +61,9 @@ class _NamedTupleABCMeta(ABCMeta):
return ABCMeta.__new__(mcls, name, bases, namespace)
exec(
# Python 2.x metaclass declaration syntax
"""class _NamedTupleABC(object):
'''The abstract base class + mix-in for named tuples.'''
__metaclass__ = _NamedTupleABCMeta
_fields = abstractproperty()""" if version_info[0] < 3 else
# Python 3.x metaclass declaration syntax
"""class _NamedTupleABC(metaclass=_NamedTupleABCMeta):
'''The abstract base class + mix-in for named tuples.'''
_fields = abstractproperty()"""
)
class _NamedTupleABC(metaclass=_NamedTupleABCMeta):
'''The abstract base class + mix-in for named tuples.'''
_fields = abstractproperty()
_namedtuple.abc = _NamedTupleABC

1
bitbake/lib/bb/process.py
View File

@ -7,6 +7,7 @@ import signal
import subprocess
import errno
import select
import bb
logger = logging.getLogger('BitBake.Process')

1
bitbake/lib/bb/server/process.py
View File

@ -25,6 +25,7 @@ import subprocess
import errno
import re
import datetime
import pickle
import bb.server.xmlrpcserver
from bb import daemonize
from multiprocessing import queues

1
bitbake/lib/bb/tests/data.py
View File

@ -12,6 +12,7 @@ import bb
import bb.data
import bb.parse
import logging
import os
class LogRecord():
def __enter__(self):

2
bitbake/lib/bb/tinfoil.py
View File

@ -732,7 +732,7 @@ class Tinfoil:
continue
if helper.eventHandler(event):
if isinstance(event, bb.build.TaskFailedSilent):
logger.warning("Logfile for failed setscene task is %s" % event.logfile)
self.logger.warning("Logfile for failed setscene task is %s" % event.logfile)
elif isinstance(event, bb.build.TaskFailed):
bb.ui.knotty.print_event_log(event, includelogs, loglines, termfilter)
continue

2
bitbake/lib/bb/ui/knotty.py
View File

@ -144,7 +144,7 @@ class TerminalFilter(object):
pass
if not cr:
try:
cr = (env['LINES'], env['COLUMNS'])
cr = (os.environ['LINES'], os.environ['COLUMNS'])
except:
cr = (25, 80)
return cr

2
bitbake/lib/bb/ui/ncurses.py
View File

@ -48,6 +48,8 @@ import bb
import xmlrpc.client
from bb.ui import uihelper
logger = logging.getLogger(__name__)
parsespin = itertools.cycle( r'|/-\\' )
X = 0

6
bitbake/lib/bb/ui/uievent.py
View File

@ -11,9 +11,13 @@ server and queue them for the UI to process. This process must be used to avoid
client/server deadlocks.
"""
import socket, threading, pickle, collections
import collections, logging, pickle, socket, threading
from xmlrpc.server import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler
import bb
logger = logging.getLogger(__name__)
class BBUIEventQueue:
def __init__(self, BBServer, clientinfo=("localhost, 0")):

1
bitbake/lib/hashserv/tests.py
View File

@ -9,6 +9,7 @@ from . import create_server, create_client
import hashlib
import logging
import multiprocessing
import os
import sys
import tempfile
import threading

15
bitbake/lib/layerindexlib/__init__.py
View File

@ -7,6 +7,7 @@ import datetime
import logging
import imp
import os
from collections import OrderedDict
from layerindexlib.plugin import LayerIndexPluginUrlError
@ -70,7 +71,7 @@ class LayerIndex():
if self.__class__ != newIndex.__class__ or \
other.__class__ != newIndex.__class__:
raise TypeException("Can not add different types.")
raise TypeError("Can not add different types.")
for indexEnt in self.indexes:
newIndex.indexes.append(indexEnt)
@ -266,8 +267,8 @@ will write out the individual elements split by layer and related components.
logger.debug(1, "Store not implemented in %s" % plugin.type)
pass
else:
logger.debug(1, "No plugins support %s" % url)
raise LayerIndexException("No plugins support %s" % url)
logger.debug(1, "No plugins support %s" % indexURI)
raise LayerIndexException("No plugins support %s" % indexURI)
def is_empty(self):
@ -657,7 +658,7 @@ class LayerIndexObj():
if obj.id in self._index[indexname]:
if self._index[indexname][obj.id] == obj:
continue
raise LayerIndexError('Conflict adding object %s(%s) to index' % (indexname, obj.id))
raise LayerIndexException('Conflict adding object %s(%s) to index' % (indexname, obj.id))
self._index[indexname][obj.id] = obj
def add_raw_element(self, indexname, objtype, rawobjs):
@ -842,11 +843,11 @@ class LayerIndexObj():
def _resolve_dependencies(layerbranches, ignores, dependencies, invalid):
for layerbranch in layerbranches:
if ignores and layerBranch.layer.name in ignores:
if ignores and layerbranch.layer.name in ignores:
continue
for layerdependency in layerbranch.index.layerDependencies_layerBranchId[layerBranch.id]:
deplayerbranch = layerDependency.dependency_layerBranch
for layerdependency in layerbranch.index.layerDependencies_layerBranchId[layerbranch.id]:
deplayerbranch = layerdependency.dependency_layerBranch
if ignores and deplayerbranch.layer.name in ignores:
continue

7
bitbake/lib/layerindexlib/cooker.py
View File

@ -4,6 +4,7 @@
#
import logging
import os
from collections import defaultdict
@ -73,7 +74,7 @@ class CookerPlugin(layerindexlib.plugin.IndexPlugin):
d = self.layerindex.data
if not branches:
raise LayerIndexFetchError("No branches specified for _load_bblayers!")
raise layerindexlib.LayerIndexFetchError("No branches specified for _load_bblayers!")
index = layerindexlib.LayerIndexObj()
@ -202,7 +203,7 @@ class CookerPlugin(layerindexlib.plugin.IndexPlugin):
try:
depDict = bb.utils.explode_dep_versions2(deps)
except bb.utils.VersionStringException as vse:
bb.fatal('Error parsing LAYERDEPENDS_%s: %s' % (c, str(vse)))
bb.fatal('Error parsing LAYERDEPENDS_%s: %s' % (collection, str(vse)))
for dep, oplist in list(depDict.items()):
# We need to search ourselves, so use the _ version...
@ -268,7 +269,7 @@ class CookerPlugin(layerindexlib.plugin.IndexPlugin):
layer = bb.utils.get_file_layer(realfn[0], self.config_data)
depBranchId = collection_layerbranch[layer]
depBranchId = collection[layer]
recipeId += 1
recipe = layerindexlib.Recipe(index, None)

6
bitbake/lib/layerindexlib/restapi.py
View File

@ -5,9 +5,13 @@
import logging
import json
import os
from urllib.parse import unquote
from urllib.parse import urlparse
import bb
import layerindexlib
import layerindexlib.plugin
@ -163,7 +167,7 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin):
parsed = _get_json_response(apiurl=up_stripped.geturl(), username=username, password=password, retry=False)
logger.debug(1, "%s: retry successful.")
else:
raise LayerIndexFetchError('%s: Connection reset by peer. Is there a firewall blocking your connection?' % apiurl)
raise layerindexlib.LayerIndexFetchError('%s: Connection reset by peer. Is there a firewall blocking your connection?' % apiurl)
return parsed

2
bitbake/lib/layerindexlib/tests/restapi.py
View File

@ -112,7 +112,7 @@ class LayerIndexWebRestApiTest(LayersTest):
break
else:
self.logger.debug(1, "meta-python was not found")
self.assetTrue(False)
raise self.failureException
# Only check the first element...
break

6
bitbake/lib/ply/lex.py
View File

@ -705,11 +705,7 @@ class LexerReflect(object):
# Sort the functions by line number
for f in self.funcsym.values():
if sys.version_info[0] < 3:
f.sort(lambda x,y: cmp(func_code(x[1]).co_firstlineno,func_code(y[1]).co_firstlineno))
else:
# Python 3.0
f.sort(key=lambda x: func_code(x[1]).co_firstlineno)
f.sort(key=lambda x: func_code(x[1]).co_firstlineno)
# Sort the strings by regular expression length
for s in self.strsym.values():

2
bitbake/lib/ply/yacc.py
View File

@ -1205,7 +1205,7 @@ class Production(object):
# Precompute the list of productions immediately following. Hack. Remove later
try:
p.lr_after = Prodnames[p.prod[n+1]]
p.lr_after = self.Prodnames[p.prod[n+1]]
except (IndexError,KeyError):
p.lr_after = []
try:

8
bitbake/lib/toaster/tests/functional/functional_helpers.py
View File

@ -75,7 +75,7 @@ class SeleniumFunctionalTestCase(SeleniumTestCaseBase):
try:
table_element = self.get_table_element(table_id)
element = table_element.find_element_by_link_text(link_text)
except NoSuchElementException as e:
except self.NoSuchElementException:
print('no element found')
raise
return element
@ -86,7 +86,7 @@ class SeleniumFunctionalTestCase(SeleniumTestCaseBase):
element_xpath = "//*[@id='" + table_id + "']"
try:
element = self.driver.find_element_by_xpath(element_xpath)
except NoSuchElementException as e:
except self.NoSuchElementException:
raise
return element
row = coordinate[0]
@ -96,7 +96,7 @@ class SeleniumFunctionalTestCase(SeleniumTestCaseBase):
element_xpath = "//*[@id='" + table_id + "']/tbody/tr[" + str(row) + "]"
try:
element = self.driver.find_element_by_xpath(element_xpath)
except NoSuchElementException as e:
except self.NoSuchElementException:
return False
return element
#now we are looking for an element with specified X and Y
@ -105,6 +105,6 @@ class SeleniumFunctionalTestCase(SeleniumTestCaseBase):
element_xpath = "//*[@id='" + table_id + "']/tbody/tr[" + str(row) + "]/td[" + str(column) + "]"
try:
element = self.driver.find_element_by_xpath(element_xpath)
except NoSuchElementException as e:
except self.NoSuchElementException:
return False
return element