[elbe-devel] [PATCH 25/37] Remove pylint annotations
Benedikt Spranger
b.spranger at linutronix.de
Wed Feb 7 15:28:52 CET 2024
E.L.B.E. pylint annotations are unmaintained for a long time. Drop all
annotations by now and readd them in a future pylint rework, were needed.
Signed-off-by: Benedikt Spranger <b.spranger at linutronix.de>
---
docs/conf.py | 4 +---
elbe | 1 -
elbepack/aptpkgutils.py | 11 -----------
elbepack/aptprogress.py | 2 --
elbepack/asyncworker.py | 15 ---------------
elbepack/cdroms.py | 9 ---------
elbepack/commands/check-build.py | 13 +------------
elbepack/commands/check_updates.py | 4 ----
elbepack/commands/control.py | 2 --
elbepack/commands/daemon.py | 1 -
elbepack/commands/diff.py | 3 ---
elbepack/commands/fetch_initvm_pkgs.py | 4 ----
elbepack/commands/gen_update.py | 3 ---
elbepack/commands/init.py | 4 ----
elbepack/commands/parselicence.py | 4 ----
elbepack/commands/pkgdiff.py | 5 -----
elbepack/commands/prjrepo.py | 2 --
elbepack/commands/show.py | 2 --
elbepack/commands/test.py | 2 --
elbepack/daemons/soap/authentication.py | 6 ------
elbepack/daemons/soap/datatypes.py | 1 -
elbepack/daemons/soap/esoap.py | 12 ------------
elbepack/daemons/soap/faults.py | 6 ------
elbepack/db.py | 11 -----------
elbepack/dbaction.py | 1 -
elbepack/debpkg.py | 2 --
elbepack/directories.py | 4 ++--
elbepack/dump.py | 8 --------
elbepack/efilesystem.py | 7 -------
elbepack/egpg.py | 1 -
elbepack/elbeproject.py | 18 ------------------
elbepack/elbexml.py | 9 ---------
elbepack/filesystem.py | 3 ---
elbepack/finetuning.py | 2 --
elbepack/fstab.py | 2 --
elbepack/hdimg.py | 16 ----------------
elbepack/initvmaction.py | 6 ------
elbepack/licencexml.py | 2 --
elbepack/log.py | 1 -
elbepack/pbuilderaction.py | 3 ---
elbepack/pkgarchive.py | 6 ------
elbepack/projectmanager.py | 2 --
elbepack/repomanager.py | 12 ------------
elbepack/rfs.py | 5 -----
elbepack/rpcaptcache.py | 7 -------
elbepack/soapclient.py | 3 ---
elbepack/tests/notest_pylint.py | 2 +-
elbepack/tests/test_preproc.py | 2 +-
elbepack/tests/test_xml.py | 4 +---
elbepack/treeutils.py | 1 -
elbepack/updated.py | 14 --------------
elbepack/updated_monitors.py | 1 -
elbepack/updatepkg.py | 5 -----
elbepack/virtapt.py | 6 +-----
elbepack/xmlpreprocess.py | 4 ----
55 files changed, 8 insertions(+), 278 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index cf08c1c8..8c070b47 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,7 +50,7 @@ master_doc = 'index'
# General information about the project.
project = u'ELBE'
-copyright = u'2017, Linutronix GmbH' # pylint: disable=redefined-builtin
+copyright = u'2017, Linutronix GmbH'
author = u'Torben Hohn, Manuel Traut'
# The version info for the project you're documenting, acts as replacement for
@@ -58,10 +58,8 @@ author = u'Torben Hohn, Manuel Traut'
# built documents.
#
# The short X.Y version.
-# pylint: disable=unused-import,wrong-import-position
from elbepack.version import elbe_version as version
# The full version, including alpha/beta/rc tags.
-# pylint: disable=reimported,wrong-import-position
from elbepack.version import elbe_version as release
# The language for content autogenerated by Sphinx. Refer to documentation
diff --git a/elbe b/elbe
index 6f54e04c..1d9d4dae 100755
--- a/elbe
+++ b/elbe
@@ -12,7 +12,6 @@ import sys
# get_cmd_list() and the magic stuff with __import__() at the end of
# this file
#
-# pylint: disable=unused-import
import elbepack.commands
from elbepack.version import elbe_version
diff --git a/elbepack/aptpkgutils.py b/elbepack/aptpkgutils.py
index 112f56ff..0dee6520 100644
--- a/elbepack/aptpkgutils.py
+++ b/elbepack/aptpkgutils.py
@@ -29,9 +29,7 @@ statestring = {
def apt_pkg_md5(pkg):
- # pylint: disable=protected-access
hashes = pkg._records.hashes
- # pylint: disable=consider-using-enumerate
for i in range(len(hashes)):
h = str(hashes[i])
if h.startswith("MD5"):
@@ -40,9 +38,7 @@ def apt_pkg_md5(pkg):
def apt_pkg_sha256(pkg):
- # pylint: disable=protected-access
hashes = pkg._records.hashes
- # pylint: disable=consider-using-enumerate
for i in range(len(hashes)):
h = str(hashes[i])
if h.startswith("SHA256"):
@@ -130,15 +126,12 @@ def fetch_binary(version, destdir='', progress=None):
Then fixed up to use sha256 and pass pycodestyle.
"""
- # pylint: disable=protected-access
base = os.path.basename(version._records.filename)
destfile = os.path.join(destdir, base)
- # pylint: disable=protected-access
if _file_is_same(destfile, version.size, version._records.sha256_hash):
logging.debug('Ignoring already existing file: %s', destfile)
return os.path.abspath(destfile)
acq = apt_pkg.Acquire(progress or apt.progress.text.AcquireProgress())
- # pylint: disable=protected-access
acqfile = apt_pkg.AcquireFile(acq,
version.uri,
"SHA256:" + version._records.sha256_hash,
@@ -157,8 +150,6 @@ def fetch_binary(version, destdir='', progress=None):
class PackageBase:
- # pylint: disable=too-many-instance-attributes
-
def __init__(self, name,
installed_version, candidate_version,
installed_md5, candidate_md5,
@@ -166,8 +157,6 @@ class PackageBase:
installed_prio, candidate_prio,
state, is_auto_installed, origin, architecture):
- # pylint: disable=too-many-arguments
-
self.name = name
self.installed_version = installed_version
self.candidate_version = candidate_version
diff --git a/elbepack/aptprogress.py b/elbepack/aptprogress.py
index ce0cdb5a..743c8982 100644
--- a/elbepack/aptprogress.py
+++ b/elbepack/aptprogress.py
@@ -21,7 +21,6 @@ class ElbeInstallProgress (InstallProgress):
# Pylint is confused by this but the attribute does exists
# on this type!
#
- # pylint: disable=attribute-defined-outside-init
self.percent = 100
line = str(self.percent) + "% " + line
@@ -55,7 +54,6 @@ class ElbeInstallProgress (InstallProgress):
# Pylint is confused by this but the attribute does exists
# on this type!
#
- # pylint: disable=attribute-defined-outside-init
self.child_pid = retval
return retval
diff --git a/elbepack/asyncworker.py b/elbepack/asyncworker.py
index 9e902b8c..5bbb4e6a 100644
--- a/elbepack/asyncworker.py
+++ b/elbepack/asyncworker.py
@@ -53,7 +53,6 @@ class BuildSysrootJob(AsyncWorkerJob):
logging.info("Build sysroot started")
self.project.build_sysroot()
db.update_project_files(self.project)
- # pylint: disable=broad-except
except Exception:
logging.exception("Build sysroot failed")
else:
@@ -83,7 +82,6 @@ class BuildSDKJob(AsyncWorkerJob):
try:
logging.info("Build SDK started")
self.project.build_sdk()
- # pylint: disable=broad-except
except Exception:
logging.exception("Build SDK Failed")
else:
@@ -115,7 +113,6 @@ class BuildCDROMsJob(AsyncWorkerJob):
try:
logging.info("Build CDROMs started")
self.project.build_cdroms(self.build_bin, self.build_src)
- # pylint: disable=broad-except
except Exception:
logging.exception("Build CDROMs failed")
else:
@@ -145,7 +142,6 @@ class BuildChrootTarJob(AsyncWorkerJob):
try:
logging.info("Build chroot tarball started")
self.project.build_chroottarball()
- # pylint: disable=broad-except
except Exception:
logging.exception("Build chrroot tarball failed")
else:
@@ -194,7 +190,6 @@ class BuildJob(AsyncWorkerJob):
"Probable cause might be:\n"
" - Problems with internet connection\n"
" - Broken mirrors\n", err)
- # pylint: disable=broad-except
except Exception:
logging.exception("Build failed")
else:
@@ -227,7 +222,6 @@ class PdebuildJob(AsyncWorkerJob):
try:
logging.info("Pdebuild started")
self.project.pdebuild(self.cpuset, self.profile, self.cross)
- # pylint: disable=broad-except
except Exception:
logging.exception("Pdebuild failed")
else:
@@ -261,7 +255,6 @@ class CreatePbuilderJob(AsyncWorkerJob):
logging.info("Building pbuilder started")
self.project.create_pbuilder(self.cross, self.noccache,
self.ccachesize)
- # pylint: disable=broad-except
except Exception:
logging.exception("Pbuilder failed")
else:
@@ -288,7 +281,6 @@ class UpdatePbuilderJob(AsyncWorkerJob):
try:
logging.info("Updating pbuilder started")
self.project.update_pbuilder()
- # pylint: disable=broad-except
except Exception:
db.update_project_files(self.project)
logging.exception("update Pbuilder failed")
@@ -318,7 +310,6 @@ class APTUpdateJob(AsyncWorkerJob):
logging.info("APT cache update started")
with self.project.buildenv:
self.project.get_rpcaptcache().update()
- # pylint: disable=broad-except
except Exception:
logging.exception("APT cache update failed")
else:
@@ -348,7 +339,6 @@ class APTUpdUpgrJob(AsyncWorkerJob):
self.project.get_rpcaptcache().update()
logging.info("APT update finished, upgrade started")
self.project.get_rpcaptcache().upgrade()
- # pylint: disable=broad-except
except Exception:
logging.exception("APT update & upgrade failed")
else:
@@ -389,7 +379,6 @@ class APTCommitJob(AsyncWorkerJob):
sourcexmlpath = path.join(self.project.builddir,
"source.xml")
self.project.xml.xml.write(sourcexmlpath)
- # pylint: disable=broad-except
except Exception:
logging.exception("Applying package changes failed")
else:
@@ -429,7 +418,6 @@ class GenUpdateJob(AsyncWorkerJob):
try:
gen_update_pkg(self.project, self.base_version_xml, upd_pathname)
logging.info("Update package generated successfully")
- # pylint: disable=broad-except
except Exception:
logging.exception("Generating update package failed")
finally:
@@ -468,7 +456,6 @@ class SaveVersionJob(AsyncWorkerJob):
# the package archive, which is done in execute.
try:
db.save_version(self.project.builddir, self.description)
- # pylint: disable=broad-except
except BaseException:
db.reset_busy(self.project.builddir, self.old_status)
raise
@@ -489,7 +476,6 @@ class SaveVersionJob(AsyncWorkerJob):
".pkgarchive")
try:
gen_binpkg_archive(self.project, repodir)
- # pylint: disable=broad-except
except Exception:
logging.exception("Saving version failed")
db.del_version(self.project.builddir, self.version, force=True)
@@ -544,7 +530,6 @@ class CheckoutVersionJob(AsyncWorkerJob):
try:
checkout_binpkg_archive(self.project, repodir)
logging.info("Package archive checked out successfully")
- # pylint: disable=broad-except
except Exception:
logging.exception("Checking out package archive failed")
else:
diff --git a/elbepack/cdroms.py b/elbepack/cdroms.py
index 497b989e..43a97d32 100644
--- a/elbepack/cdroms.py
+++ b/elbepack/cdroms.py
@@ -22,7 +22,6 @@ from elbepack.isooptions import get_iso_options
CDROM_SIZE = 640 * 1000 * 1000
-# pylint: disable=too-many-arguments
def add_source_pkg(repo, component, cache, pkg, version, forbid):
if pkg in forbid:
return
@@ -43,10 +42,6 @@ def mk_source_cdrom(components, codename,
cdrom_size=CDROM_SIZE, xml=None,
mirror='http://ftp.de.debian.org/debian'):
- # pylint: disable=too-many-arguments
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-branches
-
hostfs.mkdir_p('/var/cache/elbe/sources')
forbiddenPackages = []
@@ -121,10 +116,6 @@ def mk_source_cdrom(components, codename,
def mk_binary_cdrom(rfs, arch, codename, init_codename, xml, target):
- # pylint: disable=too-many-arguments
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-branches
- # pylint: disable=too-many-statements
rfs.mkdir_p('/var/cache/elbe/binaries/added')
rfs.mkdir_p('/var/cache/elbe/binaries/main')
diff --git a/elbepack/commands/check-build.py b/elbepack/commands/check-build.py
index 01d7d31b..9d6e6275 100644
--- a/elbepack/commands/check-build.py
+++ b/elbepack/commands/check-build.py
@@ -81,7 +81,7 @@ class CheckBase:
except CheckException as E:
logging.exception(E)
self.ret = 1
- except: # pylint: disable=bare-except
+ except:
logging.error(traceback.format_exc())
self.ret = 1
return self.ret
@@ -93,10 +93,8 @@ class CheckBase:
return test
return _register
- # pylint: disable=no-self-use
def run(self):
raise Exception("Check run method not implemented")
- # pylint: disable=unreachable
return 0
def fail(self, reason):
@@ -135,9 +133,6 @@ class CheckCdroms(CheckBase):
def do_src(self, sources, src_total):
"""Check for sources in src-cdrom*"""
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-branches
-
iso_it = glob.iglob("src-cdrom*")
src_cnt = 0
@@ -234,10 +229,6 @@ class CheckCdroms(CheckBase):
# package. Thus, the only way is to make the source table component
# aware.
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-branches
- # pylint: disable=too-many-statements
-
# Every build has a source.xml where the list of binaries
# installed can be found
xml = etree("source.xml")
@@ -268,7 +259,6 @@ class CheckCdroms(CheckBase):
# For every bin-cdrom, create a temporary directory where to
# extract it and find all *.deb files
#
- # pylint: disable=too-many-nested-blocks
for cdrom in glob.glob("bin-cdrom*"):
with TmpdirFilesystem() as tmp:
self.extract_cdrom(tmp.path, cdrom)
@@ -407,7 +397,6 @@ class CheckImage(CheckBase):
def run(self):
- # pylint: disable=attribute-defined-outside-init
self.xml = etree("source.xml")
fail_cnt = 0
diff --git a/elbepack/commands/check_updates.py b/elbepack/commands/check_updates.py
index 0d87bb49..14db8f76 100644
--- a/elbepack/commands/check_updates.py
+++ b/elbepack/commands/check_updates.py
@@ -37,10 +37,6 @@ def build_changelog_xml(v, opt, update_packages):
def run_command(argv):
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-statements
- # pylint: disable=too-many-branches
-
oparser = OptionParser(
usage="usage: %prog check_updates [options] <source-xmlfile>")
oparser.add_option(
diff --git a/elbepack/commands/control.py b/elbepack/commands/control.py
index e0cde08e..b869da98 100644
--- a/elbepack/commands/control.py
+++ b/elbepack/commands/control.py
@@ -19,8 +19,6 @@ from elbepack.elbexml import ValidationMode
def run_command(argv):
- # pylint: disable=too-many-statements
-
oparser = OptionParser(usage="usage: elbe control [options] <command>")
oparser.add_option("--host", dest="host", default=cfg['soaphost'],
diff --git a/elbepack/commands/daemon.py b/elbepack/commands/daemon.py
index 15aead61..a32b7ebe 100644
--- a/elbepack/commands/daemon.py
+++ b/elbepack/commands/daemon.py
@@ -56,7 +56,6 @@ def run_command(argv):
return
cherrypy.server.unsubscribe()
- # pylint: disable=protected-access
server = cherrypy._cpserver.Server()
server.socket_host = opt.host
server.socket_port = int(opt.port)
diff --git a/elbepack/commands/diff.py b/elbepack/commands/diff.py
index ff3d8233..394beaf6 100644
--- a/elbepack/commands/diff.py
+++ b/elbepack/commands/diff.py
@@ -11,9 +11,6 @@ from optparse import OptionParser
def walk_generated(gen_path, fix_path, exclude):
- # pylint: disable=too-many-nested-blocks
- # pylint: disable=too-many-branches
-
file_to_rm = []
file_differ = []
gen_path = gen_path.rstrip("/")
diff --git a/elbepack/commands/fetch_initvm_pkgs.py b/elbepack/commands/fetch_initvm_pkgs.py
index 979c2a56..9eb3faf3 100644
--- a/elbepack/commands/fetch_initvm_pkgs.py
+++ b/elbepack/commands/fetch_initvm_pkgs.py
@@ -26,10 +26,6 @@ def run_command(argv):
# We might want to make the threshold higher for certain
# files/directories or just globaly.
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-branches
- # pylint: disable=too-many-statements
-
oparser = OptionParser(
usage="usage: %prog fetch_initvm_pkgs [options] <xmlfile>")
diff --git a/elbepack/commands/gen_update.py b/elbepack/commands/gen_update.py
index 3bacd9f2..a22e07f9 100644
--- a/elbepack/commands/gen_update.py
+++ b/elbepack/commands/gen_update.py
@@ -15,9 +15,6 @@ from elbepack.log import elbe_logging
def run_command(argv):
- # pylint: disable=too-many-statements
- # pylint: disable=too-many-branches
-
oparser = OptionParser(usage="usage: %prog gen_update [options] [xmlfile]")
oparser.add_option("-t", "--target", dest="target",
help="directoryname of target")
diff --git a/elbepack/commands/init.py b/elbepack/commands/init.py
index 8d21de07..ab71f453 100644
--- a/elbepack/commands/init.py
+++ b/elbepack/commands/init.py
@@ -24,10 +24,6 @@ from elbepack.filesystem import Filesystem
def run_command(argv):
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-statements
- # pylint: disable=too-many-branches
-
oparser = OptionParser(usage="usage: %prog init [options] <filename>")
oparser.add_option("--skip-validation", action="store_true",
diff --git a/elbepack/commands/parselicence.py b/elbepack/commands/parselicence.py
index 4fbeee2d..a608610d 100644
--- a/elbepack/commands/parselicence.py
+++ b/elbepack/commands/parselicence.py
@@ -122,10 +122,6 @@ def license_string(pkg):
def run_command(argv):
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-statements
- # pylint: disable=too-many-branches
-
oparser = OptionParser(
usage="usage: %prog parselicence [options] <licencefile>")
oparser.add_option("--output", dest="output",
diff --git a/elbepack/commands/pkgdiff.py b/elbepack/commands/pkgdiff.py
index 20cd287b..735c5cab 100644
--- a/elbepack/commands/pkgdiff.py
+++ b/elbepack/commands/pkgdiff.py
@@ -15,9 +15,6 @@ from elbepack.elbexml import ElbeXML, ValidationMode
def run_command(argv):
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-branches
-
oparser = OptionParser(
usage="usage: %prog pkgdiff [options] <rfs1> <rfs2>")
oparser.add_option(
@@ -51,7 +48,6 @@ def run_command(argv):
gc = apt.Cache()
gen_pkgs = {}
- # pylint: disable=E1133
for p in gen_cache.packages:
if opt.noauto:
if p.current_ver and not \
@@ -70,7 +66,6 @@ def run_command(argv):
fc = apt.Cache()
fix_pkgs = {}
- # pylint: disable=E1133
for p in fix_cache.packages:
if opt.noauto:
if p.current_ver and not \
diff --git a/elbepack/commands/prjrepo.py b/elbepack/commands/prjrepo.py
index 7e89eb87..e1290f1a 100644
--- a/elbepack/commands/prjrepo.py
+++ b/elbepack/commands/prjrepo.py
@@ -18,8 +18,6 @@ from elbepack.config import cfg
def run_command(argv):
- # pylint: disable=too-many-statements
-
oparser = OptionParser(usage="usage: elbe prjrepo [options] <command>")
oparser.add_option("--host", dest="host", default=cfg['soaphost'],
diff --git a/elbepack/commands/show.py b/elbepack/commands/show.py
index 47130d3f..ebb66c7a 100644
--- a/elbepack/commands/show.py
+++ b/elbepack/commands/show.py
@@ -12,8 +12,6 @@ from elbepack.validate import validate_xml
def run_command(argv):
- # pylint: disable=too-many-branches
-
oparser = OptionParser(usage="usage: %prog show [options] <filename>")
oparser.add_option("--verbose", action="store_true", dest="verbose",
diff --git a/elbepack/commands/test.py b/elbepack/commands/test.py
index 72fabb5d..0f9a8b77 100644
--- a/elbepack/commands/test.py
+++ b/elbepack/commands/test.py
@@ -157,8 +157,6 @@ class ElbeTestResult(unittest.TestResult):
def run_command(argv):
- # pylint: disable=too-many-locals
-
this_dir = os.path.dirname(os.path.realpath(__file__))
top_dir = os.path.join(this_dir, "..", "..")
diff --git a/elbepack/daemons/soap/authentication.py b/elbepack/daemons/soap/authentication.py
index 199f4f59..f1aa287e 100644
--- a/elbepack/daemons/soap/authentication.py
+++ b/elbepack/daemons/soap/authentication.py
@@ -25,8 +25,6 @@ def authenticated_uid(func):
# something with func.__code__.replace, but this requires deep
# Python's internal knowledges.
- # pylint: disable=function-redefined
-
if func.__code__.co_argcount == 2:
@wraps(func)
def wrapped(self):
@@ -85,7 +83,6 @@ def authenticated_uid(func):
if func.__code__.co_argcount == 7:
@wraps(func)
def wrapped(self, arg1, arg2, arg3, arg4, arg5):
- # pylint: disable=too-many-arguments
s = self.transport.req_env['beaker.session']
try:
uid = s['userid']
@@ -115,8 +112,6 @@ def authenticated_admin(func):
# something with func.__code__.replace, but this requires deep
# Python's internal knowledges.
- # pylint: disable=function-redefined
-
if func.__code__.co_argcount == 1:
@wraps(func)
def wrapped(self):
@@ -160,7 +155,6 @@ def authenticated_admin(func):
if func.__code__.co_argcount == 6:
@wraps(func)
def wrapped(self, arg1, arg2, arg3, arg4, arg5):
- # pylint: disable=too-many-arguments
s = self.transport.req_env['beaker.session']
try:
uid = s['userid']
diff --git a/elbepack/daemons/soap/datatypes.py b/elbepack/daemons/soap/datatypes.py
index 4962a354..94d73ec4 100644
--- a/elbepack/daemons/soap/datatypes.py
+++ b/elbepack/daemons/soap/datatypes.py
@@ -30,6 +30,5 @@ class SoapCmdReply (ComplexModel):
out = Unicode()
def __init__(self, ret, out):
- # pylint: disable=super-init-not-called
self.ret = ret
self.out = out
diff --git a/elbepack/daemons/soap/esoap.py b/elbepack/daemons/soap/esoap.py
index a61663f3..45d1eaea 100644
--- a/elbepack/daemons/soap/esoap.py
+++ b/elbepack/daemons/soap/esoap.py
@@ -27,8 +27,6 @@ from .authentication import authenticated_admin, authenticated_uid
class ESoap (ServiceBase):
- # pylint: disable=too-many-public-methods
-
__name__ = 'soap'
def __init__(self):
@@ -38,7 +36,6 @@ class ESoap (ServiceBase):
@rpc(_returns=String)
@soap_faults
def get_version(self):
- # pylint: disable=no-self-use
return elbe_version
@rpc(String, String, _returns=Boolean)
@@ -59,7 +56,6 @@ class ESoap (ServiceBase):
@soap_faults
@authenticated_admin
def install_elbe_version(self, version, pkglist):
- # pylint: disable=no-self-use
if is_devel:
return SoapCmdReply(10,
'Initvm is in devel mode: installing another\n'
@@ -94,8 +90,6 @@ class ESoap (ServiceBase):
@authenticated_admin
def add_user(self, name, fullname, password, email, admin):
- # pylint: disable=too-many-arguments
-
self.app.pm.db.add_user(name, fullname, password, email, admin)
@rpc(_returns=Array(SoapProject))
@@ -124,8 +118,6 @@ class ESoap (ServiceBase):
@soap_faults
def upload_file(self, uid, builddir, fname, blob, part):
- # pylint: disable=too-many-arguments
-
fn = os.path.join(builddir, fname)
if part == 0:
if self.app.pm.db.is_busy(builddir):
@@ -211,8 +203,6 @@ class ESoap (ServiceBase):
@soap_faults
def build(self, uid, builddir, build_bin, build_src, skip_pbuilder):
- # pylint: disable=too-many-arguments
-
self.app.pm.open_project(uid, builddir)
self.app.pm.build_current_project(uid, build_bin, build_src,
skip_pbuilder)
@@ -294,7 +284,6 @@ class ESoap (ServiceBase):
@rpc(String, Integer, String, Boolean)
@authenticated_uid
@soap_faults
- # pylint: disable=too-many-arguments
def finish_pdebuild(self, uid, builddir, cpuset, profile, cross):
self.app.pm.open_project(uid, builddir)
self.app.pm.build_current_pdebuild(uid, cpuset, profile, cross)
@@ -380,7 +369,6 @@ class ESoap (ServiceBase):
@authenticated_admin
@soap_faults
def shutdown_initvm(self):
- # pylint: disable=no-self-use
system("systemctl --no-block poweroff")
@rpc(String)
diff --git a/elbepack/daemons/soap/faults.py b/elbepack/daemons/soap/faults.py
index 58b0f64b..b61ea372 100644
--- a/elbepack/daemons/soap/faults.py
+++ b/elbepack/daemons/soap/faults.py
@@ -77,10 +77,6 @@ def soap_faults(func):
# something with func.__code__.replace, but this requires deep
# Python's internal knowledges.
- # pylint: disable=too-many-return-statements
- # pylint: disable=too-many-statements
- # pylint: disable=function-redefined
-
if func.__code__.co_argcount == 1:
@wraps(func)
def wrapped(self):
@@ -184,7 +180,6 @@ def soap_faults(func):
if func.__code__.co_argcount == 6:
@wraps(func)
def wrapped(self, arg1, arg2, arg3, arg4, arg5):
- # pylint: disable=too-many-arguments
try:
return func(self, arg1, arg2, arg3, arg4, arg5)
except InvalidState:
@@ -205,7 +200,6 @@ def soap_faults(func):
if func.__code__.co_argcount == 7:
@wraps(func)
def wrapped(self, arg1, arg2, arg3, arg4, arg5, arg6):
- # pylint: disable=too-many-arguments
try:
return func(self, arg1, arg2, arg3, arg4, arg5, arg6)
except InvalidState:
diff --git a/elbepack/db.py b/elbepack/db.py
index 10470e98..b7c5aaa4 100644
--- a/elbepack/db.py
+++ b/elbepack/db.py
@@ -2,7 +2,6 @@
# SPDX-License-Identifier: GPL-3.0-or-later
# SPDX-FileCopyrightText: 2014-2018 Linutronix GmbH
-# pylint: disable=too-many-lines
import os
import errno
@@ -66,8 +65,6 @@ def get_versioned_filename(name, version, suffix):
def _update_project_file(s, builddir, name, mime_type, description):
- # pylint: disable=too-many-arguments
-
filename = os.path.join(builddir, name)
try:
f = s.query(ProjectFile).\
@@ -95,8 +92,6 @@ def _update_project_file(s, builddir, name, mime_type, description):
class ElbeDB:
- # pylint: disable=too-many-public-methods
-
db_path = '/var/cache/elbe'
db_location = 'sqlite:///' + db_path + '/elbe.db'
@@ -857,8 +852,6 @@ class ElbeDB:
def add_user(self, name, fullname, password, email, admin):
- # pylint: disable=too-many-arguments
-
pwhash = pbkdf2_sha512.hash(password)
u = User(name=name,
@@ -875,8 +868,6 @@ class ElbeDB:
def modify_user(self, userid, name, fullname, email, admin,
password=None):
- # pylint: disable=too-many-arguments
-
with session_scope(self.session) as s:
try:
u = s.query(User).filter(User.id == userid).one()
@@ -973,8 +964,6 @@ class ElbeDB:
@classmethod
def init_db(cls, name, fullname, password, email, admin):
- # pylint: disable=too-many-arguments
-
if not os.path.exists(cls.db_path):
try:
os.makedirs(cls.db_path)
diff --git a/elbepack/dbaction.py b/elbepack/dbaction.py
index c7cbeab5..00b31bd3 100644
--- a/elbepack/dbaction.py
+++ b/elbepack/dbaction.py
@@ -262,7 +262,6 @@ class BuildAction(DbAction):
ep = db.load_project(args[0])
ep.build()
db.update_project_files(ep)
- # pylint: disable=broad-except
except Exception as e:
db.update_project_files(ep)
db.reset_busy(args[0], "build_failed")
diff --git a/elbepack/debpkg.py b/elbepack/debpkg.py
index 14451cb3..1cd284fb 100644
--- a/elbepack/debpkg.py
+++ b/elbepack/debpkg.py
@@ -47,8 +47,6 @@ def build_binary_deb(
deps,
target_dir):
- # pylint: disable=too-many-arguments
-
tmpdir = mkdtemp()
pkgfname = f"{name}_{version}_{arch}"
pkgdir = os.path.join(tmpdir, pkgfname)
diff --git a/elbepack/directories.py b/elbepack/directories.py
index da6d8133..ebb1d373 100644
--- a/elbepack/directories.py
+++ b/elbepack/directories.py
@@ -15,8 +15,8 @@ elbe_dir = None
def init_directories(elbe_relpath):
# set global variables that are used in other modules via imports
# this is the very first function that is called by 'elbe'
- global elbe_exe # pylint: disable=global-statement
- global elbe_dir # pylint: disable=global-statement
+ global elbe_exe
+ global elbe_dir
elbe_exe = os.path.abspath(os.path.realpath(elbe_relpath))
elbe_dir = os.path.dirname(elbe_exe)
diff --git a/elbepack/dump.py b/elbepack/dump.py
index cb25d911..e14debc8 100644
--- a/elbepack/dump.py
+++ b/elbepack/dump.py
@@ -76,9 +76,6 @@ def dump_initvmpkgs(xml):
def check_full_pkgs(pkgs, fullpkgs, cache):
- # pylint: disable=too-many-statements
- # pylint: disable=too-many-branches
-
validation.info("ELBE Package validation")
validation.info("=======================")
validation.info("")
@@ -177,11 +174,6 @@ def check_full_pkgs(pkgs, fullpkgs, cache):
def elbe_report(xml, buildenv, cache, targetfs):
- # pylint: disable=too-many-arguments
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-statements
- # pylint: disable=too-many-branches
-
rfs = buildenv.rfs
report.info("ELBE Report for Project %s\n\n"
diff --git a/elbepack/efilesystem.py b/elbepack/efilesystem.py
index 817a0668..f022e489 100644
--- a/elbepack/efilesystem.py
+++ b/elbepack/efilesystem.py
@@ -25,8 +25,6 @@ from elbepack.shellhelper import (system,
def copy_filelist(src, file_lst, dst):
- # pylint: disable=too-many-branches
-
files = set()
copied = set()
@@ -97,9 +95,6 @@ def copy_filelist(src, file_lst, dst):
def extract_target(src, xml, dst, cache):
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-branches
-
# create filelists describing the content of the target rfs
if xml.tgt.has("tighten") or xml.tgt.has("diet"):
pkglist = [n.et.text for n in xml.node(
@@ -243,14 +238,12 @@ class Excursion:
def do(cls, rfs):
r = cls.RFS[rfs.path]
for tmp in r:
- # pylint: disable=protected-access
tmp._do_excursion(rfs)
@classmethod
def end(cls, rfs):
r = cls.RFS[rfs.path]
for tmp in r:
- # pylint: disable=protected-access
if tmp.origin not in rfs.protect_from_excursion:
tmp._undo_excursion(rfs)
else:
diff --git a/elbepack/egpg.py b/elbepack/egpg.py
index d761dd93..303e9b0b 100644
--- a/elbepack/egpg.py
+++ b/elbepack/egpg.py
@@ -26,7 +26,6 @@ elbe_internal_key_param = """
"""
-# pylint: disable=too-many-instance-attributes
class OverallStatus:
def __init__(self):
diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
index e9dc6ef9..5ae068da 100644
--- a/elbepack/elbeproject.py
+++ b/elbepack/elbeproject.py
@@ -2,7 +2,6 @@
# SPDX-License-Identifier: GPL-3.0-or-later
# SPDX-FileCopyrightText: 2014-2018 Linutronix GmbH
-# pylint: disable=too-many-lines
import os
import datetime
@@ -82,7 +81,6 @@ def gen_sdk_scripts(triplet,
prj_version,
builddir,
sdkpath):
- # pylint: disable=too-many-arguments
prj_name = prj_name.replace(" ", "_")
prj_version = prj_version.replace(" ", "_")
@@ -111,9 +109,6 @@ def gen_sdk_scripts(triplet,
class ElbeProject:
- # pylint: disable=too-many-instance-attributes
- # pylint: disable=too-many-public-methods
-
def __init__(
self,
builddir,
@@ -129,8 +124,6 @@ class ElbeProject:
postsh_file=None,
savesh_file=None):
- # pylint: disable=too-many-arguments
-
self.builddir = os.path.abspath(str(builddir))
self.chrootpath = os.path.join(self.builddir, "chroot")
self.targetpath = os.path.join(self.builddir, "target")
@@ -448,9 +441,6 @@ class ElbeProject:
build_sources=False, cdrom_size=None,
tgt_pkg_lst=None):
- # pylint: disable=too-many-branches
- # pylint: disable=too-many-locals
-
self.repo_images = []
env = None
@@ -549,11 +539,6 @@ class ElbeProject:
def build(self, build_bin=False, build_sources=False, cdrom_size=None,
skip_pkglist=False, skip_pbuild=False):
- # pylint: disable=too-many-arguments
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-statements
- # pylint: disable=too-many-branches
-
# Write the log header
self.write_log_header()
@@ -1003,9 +988,6 @@ class ElbeProject:
def install_packages(self, target, buildenv=False):
- # pylint: disable=too-many-statements
- # pylint: disable=too-many-branches
-
# to workaround debian bug no. 872543
if self.xml.prj.has('noauth'):
inrelease = glob.glob(f"{self.chrootpath}/var/lib/apt/lists/*InRelease")
diff --git a/elbepack/elbexml.py b/elbepack/elbexml.py
index cb86dc93..393ed2f5 100644
--- a/elbepack/elbexml.py
+++ b/elbepack/elbexml.py
@@ -58,8 +58,6 @@ def replace_localmachine(mirror, initvm=True):
class ElbeXML:
- # pylint: disable=too-many-public-methods
-
def __init__(
self,
fname,
@@ -145,8 +143,6 @@ class ElbeXML:
# XXX: maybe add cdrom path param ?
def create_apt_sources_list(self, build_sources=False, initvm=True, hostsysroot=False):
- # pylint: disable=too-many-branches
-
if self.prj is None:
return "# No Project"
@@ -212,7 +208,6 @@ class ElbeXML:
@staticmethod
def validate_repo(r):
- # pylint: disable=too-many-statements
try:
fp = urlopen(r["url"] + "InRelease", None, 30)
except URLError:
@@ -247,10 +242,6 @@ class ElbeXML:
def validate_apt_sources(self, url_validation, arch):
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-branches
- # pylint: disable=too-many-statements
-
slist = self.create_apt_sources_list()
sources_lines = slist.split('\n')
diff --git a/elbepack/filesystem.py b/elbepack/filesystem.py
index 2b65528d..6def25a7 100644
--- a/elbepack/filesystem.py
+++ b/elbepack/filesystem.py
@@ -51,8 +51,6 @@ def size_to_int(size):
class Filesystem:
- # pylint: disable=too-many-public-methods
-
def __init__(self, path, clean=False):
"""
>>> os.path.isdir(this.path)
@@ -431,7 +429,6 @@ class Filesystem:
fp.close()
def walk_files(self, directory='', exclude_dirs=None):
- # pylint: disable=too-many-locals
if not exclude_dirs:
exclude_dirs = []
diff --git a/elbepack/finetuning.py b/elbepack/finetuning.py
index 90e6398c..db598db1 100644
--- a/elbepack/finetuning.py
+++ b/elbepack/finetuning.py
@@ -428,8 +428,6 @@ class UpdatedAction(FinetuningAction):
def execute(self, buildenv, target):
- # pylint: disable=too-many-locals
-
if self.node.et.text:
fp = self.node.et.text
diff --git a/elbepack/fstab.py b/elbepack/fstab.py
index 1a5d0a84..67441525 100644
--- a/elbepack/fstab.py
+++ b/elbepack/fstab.py
@@ -109,8 +109,6 @@ class hdpart:
class fstabentry(hdpart):
- # pylint: disable=too-many-instance-attributes
-
def __init__(self, xml, entry, fsid=0):
super().__init__()
diff --git a/elbepack/hdimg.py b/elbepack/hdimg.py
index a7641473..f45867af 100644
--- a/elbepack/hdimg.py
+++ b/elbepack/hdimg.py
@@ -57,8 +57,6 @@ def mkfs_mtd(mtd, fslabel, target):
def build_image_mtd(mtd, target):
- # pylint: disable=too-many-branches
-
img_files = []
if not mtd.has("ubivg"):
@@ -306,8 +304,6 @@ def create_partition(
size_in_sectors,
current_sector):
- # pylint: disable=too-many-arguments
-
sector_size = 512
if part.text("size") == "remain" and disk.type == "gpt":
sz = size_in_sectors - 35 - current_sector
@@ -345,8 +341,6 @@ def create_partition(
def create_label(disk, part, ppart, fslabel, target, grub):
- # pylint: disable=too-many-arguments
-
entry = fslabel[part.text("label")]
entry.set_geometry(ppart, disk)
@@ -416,8 +410,6 @@ def create_logical_partitions(disk,
target,
grub):
- # pylint: disable=too-many-arguments
-
current_sector = epart.geometry.start
size_in_sectors = current_sector + epart.geometry.length
@@ -443,10 +435,6 @@ def create_logical_partitions(disk,
def do_image_hd(hd, fslabel, target, grub_version, grub_fw_type=None):
- # pylint: disable=too-many-arguments
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-branches
-
sector_size = 512
s = size_to_int(hd.text("size"))
size_in_sectors = s // sector_size
@@ -543,10 +531,6 @@ def add_binary_blob(hd, target):
def do_hdimg(xml, target, rfs, grub_version, grub_fw_type=None):
- # pylint: disable=too-many-arguments
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-branches
-
# list of created files
img_files = []
diff --git a/elbepack/initvmaction.py b/elbepack/initvmaction.py
index 869cc32b..eb62a0bd 100644
--- a/elbepack/initvmaction.py
+++ b/elbepack/initvmaction.py
@@ -293,9 +293,6 @@ def submit_with_repodir_and_dl_result(xmlfile, cdrom, opt):
def submit_and_dl_result(xmlfile, cdrom, opt):
- # pylint: disable=too-many-statements
- # pylint: disable=too-many-branches
-
try:
with PreprocessWrapper(xmlfile, opt) as ppw:
xmlfile = ppw.preproc
@@ -530,9 +527,6 @@ class CreateAction(InitVMAction):
def execute(self, initvmdir, opt, args):
- # pylint: disable=too-many-branches
- # pylint: disable=too-many-statements
-
if self.initvm is not None:
print(f"Initvm is already defined for the libvirt domain '{cfg['initvm_domain']}'.\n")
print("If you want to build in your old initvm, use `elbe initvm submit <xml>`.")
diff --git a/elbepack/licencexml.py b/elbepack/licencexml.py
index 48528c80..8e52448d 100644
--- a/elbepack/licencexml.py
+++ b/elbepack/licencexml.py
@@ -50,8 +50,6 @@ class copyright_xml:
def add_copyright_file(self, pkg_name, copyright_text):
- # pylint: disable=too-many-locals
-
# remove illegal characters from copyright_text
copyright_text, _ = remove_re.subn('', copyright_text)
diff --git a/elbepack/log.py b/elbepack/log.py
index d4302bb4..59d9ba0d 100644
--- a/elbepack/log.py
+++ b/elbepack/log.py
@@ -88,7 +88,6 @@ class ThreadFilter(logging.Filter):
def filter(self, record):
if hasattr(record, '_thread'):
# Hack to fake logging for another thread
- # pylint: disable=protected-access
thread = record._thread
else:
thread = record.thread
diff --git a/elbepack/pbuilderaction.py b/elbepack/pbuilderaction.py
index 6019be92..9404a769 100644
--- a/elbepack/pbuilderaction.py
+++ b/elbepack/pbuilderaction.py
@@ -178,9 +178,6 @@ class BuildAction(PBuilderAction):
def execute(self, opt, _args):
- # pylint: disable=too-many-statements
- # pylint: disable=too-many-branches
-
crossopt = ""
if opt.cross:
crossopt = "--cross"
diff --git a/elbepack/pkgarchive.py b/elbepack/pkgarchive.py
index 7a63573a..e98b2b0c 100644
--- a/elbepack/pkgarchive.py
+++ b/elbepack/pkgarchive.py
@@ -13,8 +13,6 @@ from elbepack.repomanager import RepoBase, RepoAttributes
class ArchiveRepo(RepoBase):
def __init__(self, xml, pathname, origin, description, components):
- # pylint: disable=too-many-arguments
-
arch = xml.text("project/arch", key="arch")
codename = xml.text("project/suite")
@@ -88,10 +86,6 @@ def gen_binpkg_archive(ep, repodir):
def checkout_binpkg_archive(ep, repodir):
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-statements
- # pylint: disable=too-many-branches
-
repopath = path.join(ep.builddir, repodir)
sources_list = ep.buildenv.rfs.fname('etc/apt/sources.list')
sources_list_d = ep.buildenv.rfs.fname('etc/apt/sources.list.d')
diff --git a/elbepack/projectmanager.py b/elbepack/projectmanager.py
index 716e481e..43576c58 100644
--- a/elbepack/projectmanager.py
+++ b/elbepack/projectmanager.py
@@ -60,8 +60,6 @@ class OpenProjectFile:
class ProjectManager:
- # pylint: disable=too-many-public-methods
-
def __init__(self, basepath):
self.basepath = basepath # Base path for new projects
self.db = ElbeDB() # Database of projects and users
diff --git a/elbepack/repomanager.py b/elbepack/repomanager.py
index 73085ce4..5ed5221c 100644
--- a/elbepack/repomanager.py
+++ b/elbepack/repomanager.py
@@ -45,8 +45,6 @@ class RepoAttributes:
class RepoBase:
- # pylint: disable=too-many-instance-attributes
-
def __init__(
self,
path,
@@ -56,8 +54,6 @@ class RepoBase:
description,
maxsize=None):
- # pylint: disable=too-many-arguments
-
self.vol_path = path
self.volume_count = 0
@@ -268,7 +264,6 @@ class RepoBase:
env_add={"GNUPGHOME": "/var/cache/elbe/gnupg"})
def removesrc(self, path, components=None):
- # pylint: disable=undefined-variable
with open(path) as fp:
for p in Deb822.iter_paragraphs(fp):
if 'Source' in p:
@@ -277,7 +272,6 @@ class RepoBase:
components)
def _remove(self, path, codename, components=None):
- # pylint: disable=undefined-variable
with open(path) as fp:
for p in Deb822.iter_paragraphs(fp):
if 'Source' in p:
@@ -381,8 +375,6 @@ class CdromInitRepo(RepoBase):
def __init__(self, init_codename, path,
mirror='http://ftp.de.debian.org/debian'):
- # pylint: disable=too-many-arguments
-
init_attrs = RepoAttributes(
init_codename, "amd64", [
"main", "main/debian-installer"], mirror)
@@ -404,8 +396,6 @@ class CdromBinRepo(RepoBase):
path,
mirror='http://ftp.debian.org/debian'):
- # pylint: disable=too-many-arguments
-
repo_attrs = RepoAttributes(codename, arch, ["main", "added"], mirror)
if init_codename is not None:
init_attrs = RepoAttributes(
@@ -426,8 +416,6 @@ class CdromSrcRepo(RepoBase):
def __init__(self, codename, init_codename, path, maxsize,
mirror='http://ftp.debian.org/debian'):
- # pylint: disable=too-many-arguments
-
repo_attrs = RepoAttributes(codename,
"source",
["main",
diff --git a/elbepack/rfs.py b/elbepack/rfs.py
index d622175d..09eb1048 100644
--- a/elbepack/rfs.py
+++ b/elbepack/rfs.py
@@ -62,8 +62,6 @@ class BuildEnv:
def __init__(self, xml, path, build_sources=False,
clean=False, arch="default", hostsysroot=False):
- # pylint: disable=too-many-arguments
-
self.xml = xml
self.path = path
self.rpcaptcache = None
@@ -145,9 +143,6 @@ class BuildEnv:
def debootstrap(self, arch="default"):
- # pylint: disable=too-many-statements
- # pylint: disable=too-many-branches
-
cleanup = False
suite = self.xml.prj.text("suite")
diff --git a/elbepack/rpcaptcache.py b/elbepack/rpcaptcache.py
index c3a4dee6..78e0cbf6 100644
--- a/elbepack/rpcaptcache.py
+++ b/elbepack/rpcaptcache.py
@@ -26,7 +26,6 @@ soap = logging.getLogger("soap")
class MyMan(BaseManager):
- # pylint: disable=arguments-differ
@staticmethod
def register(typeid):
"""Register to BaseManager through decorator"""
@@ -48,7 +47,6 @@ class MyMan(BaseManager):
os.sys.__stdout__ = os.sys.stdout
os.sys.__stderr__ = os.sys.stderr
- # pylint: disable=arguments-differ
def start(self):
"""Redirect outputs of the process to an async logging thread"""
r, w = os.pipe()
@@ -66,11 +64,9 @@ class InChRootObject:
@MyMan.register("RPCAPTCache")
class RPCAPTCache(InChRootObject):
- # pylint: disable=too-many-public-methods
def __init__(self, rfs, arch,
notifier=None, norecommend=False, noauth=True):
- # pylint: disable=too-many-arguments
InChRootObject.__init__(self, rfs)
self.notifier = notifier
@@ -422,8 +418,6 @@ class RPCAPTCache(InChRootObject):
def get_rpcaptcache(rfs, arch,
notifier=None, norecommend=False, noauth=True):
- # pylint: disable=too-many-arguments
-
mm = MyMan()
mm.start()
@@ -431,5 +425,4 @@ def get_rpcaptcache(rfs, arch,
# see the creation of MyMan.RPCAPTCache by
# MyMan.register()
#
- # pylint: disable=no-member
return mm.RPCAPTCache(rfs, arch, notifier, norecommend, noauth)
diff --git a/elbepack/soapclient.py b/elbepack/soapclient.py
index 29e6f65f..02d76085 100644
--- a/elbepack/soapclient.py
+++ b/elbepack/soapclient.py
@@ -44,8 +44,6 @@ def set_suds_debug(debug):
class ElbeSoapClient:
def __init__(self, host, port, user, passwd, retries=10, debug=False):
- # pylint: disable=too-many-arguments
-
# Mess with suds logging, for debug, or squelch warnings
set_suds_debug(debug)
@@ -903,7 +901,6 @@ class UploadPackageAction(RepoAction):
def __init__(self, node):
RepoAction.__init__(self, node)
- # pylint: disable=arguments-differ
@staticmethod
def upload_file(client, f, builddir):
# Uploads file f into builddir in intivm
diff --git a/elbepack/tests/notest_pylint.py b/elbepack/tests/notest_pylint.py
index 74873205..f5eb4a07 100644
--- a/elbepack/tests/notest_pylint.py
+++ b/elbepack/tests/notest_pylint.py
@@ -10,7 +10,7 @@ from elbepack.directories import pack_dir, elbe_exe, elbe_dir
class TestPylint(ElbeTestCase):
- global elbe_dir #pylint: disable=global-statement
+ global elbe_dir
elbe_dir = os.path.join(os.path.dirname(__file__), "../..")
diff --git a/elbepack/tests/test_preproc.py b/elbepack/tests/test_preproc.py
index d4b99232..c1c13fa5 100644
--- a/elbepack/tests/test_preproc.py
+++ b/elbepack/tests/test_preproc.py
@@ -10,7 +10,7 @@ from elbepack.directories import elbe_exe, elbe_dir
class TestPreproc(ElbeTestCase):
- global elbe_dir #pylint: disable=global-statement
+ global elbe_dir
elbe_dir = os.path.join(os.path.dirname(__file__), "../..")
diff --git a/elbepack/tests/test_xml.py b/elbepack/tests/test_xml.py
index fed49e05..fb271043 100644
--- a/elbepack/tests/test_xml.py
+++ b/elbepack/tests/test_xml.py
@@ -14,7 +14,7 @@ from elbepack.commands.test import ElbeTestCase, ElbeTestLevel, system
@unittest.skipIf(ElbeTestCase.level < ElbeTestLevel.INITVM,
"Test level not set to INITVM")
class TestSimpleXML(ElbeTestCase):
- global elbe_dir #pylint: disable=global-statement
+ global elbe_dir
elbe_dir = os.path.join(os.path.dirname(__file__), "../..")
@@ -46,7 +46,6 @@ class TestSimpleXML(ElbeTestCase):
with self.subTest(f'check build {cmd}'):
system(f'{sys.executable} {elbe_exe} check-build {cmd} "{build_dir}"')
- # pylint: disable=try-except-raise
except:
raise
else:
@@ -81,7 +80,6 @@ class TestPbuilder(ElbeTestCase):
uuid = f.read()
system(f'cd "{build_dir}/libgpio"; \
{sys.executable} {elbe_exe} pbuilder build --project {uuid}')
- # pylint: disable=try-except-raise
except:
raise
else:
diff --git a/elbepack/treeutils.py b/elbepack/treeutils.py
index 01d860d2..acdcd7b6 100644
--- a/elbepack/treeutils.py
+++ b/elbepack/treeutils.py
@@ -138,7 +138,6 @@ class etree(ebase):
def setroot(self, tag):
retval = elem(Element(tag))
- # pylint: disable=protected-access
self.et._setroot(retval.et)
return retval
diff --git a/elbepack/updated.py b/elbepack/updated.py
index a7c067f2..6bf54d6e 100644
--- a/elbepack/updated.py
+++ b/elbepack/updated.py
@@ -35,8 +35,6 @@ from elbepack.shellhelper import CommandError, system
class UpdateStatus:
- # pylint: disable=too-many-instance-attributes
-
def __init__(self):
self.monitor = None
self.observer = None
@@ -105,7 +103,6 @@ class UpdateService (ServiceBase):
@rpc(_returns=String)
def list_snapshots(self):
- # pylint: disable=no-self-use
# use comma separated string because array of strings triggers a bug in
# python suds :(
snapshots = ""
@@ -129,7 +126,6 @@ class UpdateService (ServiceBase):
try:
apply_update(fname, self.app.status)
- # pylint: disable=broad-except
except Exception as err:
print(f"{err}")
self.app.status.set_finished('error')
@@ -258,8 +254,6 @@ def mark_install(depcache, pkg, ver, auto, status):
def _apply_update(fname, status):
- # pylint: disable=too-many-locals
-
try:
xml = etree(fname)
except BaseException:
@@ -441,11 +435,6 @@ def apply_update(fname, status):
def action_select(upd_file, status):
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-return-statements
- # pylint: disable=too-many-branches
- # pylint: disable=too-many-statements
-
status.log("updating: " + upd_file)
try:
@@ -465,7 +454,6 @@ def action_select(upd_file, status):
try:
if reject_downgrade(status, "/tmp/new.xml"):
return
- # pylint: disable=broad-except
except Exception as e:
status.log('Error while reading XML files occurred: ' + str(e))
return
@@ -533,7 +521,6 @@ def action_select(upd_file, status):
if os.path.isdir(prefix + "repo"):
try:
update_sourceslist(xml, prefix + "repo", status)
- # pylint: disable=broad-except
except Exception as err:
status.log(str(err))
status.set_finished('error')
@@ -542,7 +529,6 @@ def action_select(upd_file, status):
try:
apply_update("/tmp/new.xml", status)
- # pylint: disable=broad-except
except Exception as err:
status.log(str(err))
status.set_finished('error')
diff --git a/elbepack/updated_monitors.py b/elbepack/updated_monitors.py
index 36869d1c..4b3314a8 100644
--- a/elbepack/updated_monitors.py
+++ b/elbepack/updated_monitors.py
@@ -119,7 +119,6 @@ class FileMonitor (UpdateMonitor):
self.wm = pyinotify.WatchManager()
self.notifier = pyinotify.Notifier(self.wm)
- # pylint: disable=no-member
self.wm.add_watch(update_dir, pyinotify.IN_CLOSE_WRITE,
proc_fun=FileMonitor.EventHandler(self.status))
self.observer = FileMonitor.ObserverThread(self.status, self)
diff --git a/elbepack/updatepkg.py b/elbepack/updatepkg.py
index 68b32a38..69b77c58 100644
--- a/elbepack/updatepkg.py
+++ b/elbepack/updatepkg.py
@@ -33,11 +33,6 @@ def gen_update_pkg(project, xml_filename, upd_filename,
override_buildtype=None, skip_validate=False, debug=False,
cmd_dir=None, cfg_dir=None):
- # pylint: disable=too-many-arguments
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-statements
- # pylint: disable=too-many-branches
-
if xml_filename:
xml = ElbeXML(xml_filename, buildtype=override_buildtype,
skip_validate=skip_validate)
diff --git a/elbepack/virtapt.py b/elbepack/virtapt.py
index 99965cba..c4deac8a 100644
--- a/elbepack/virtapt.py
+++ b/elbepack/virtapt.py
@@ -10,7 +10,7 @@ import sys
# don't remove the apt import, it is really needed, due to some magic in
# apt_pkg
-import apt # pylint: disable=unused-import
+import apt
import apt_pkg
@@ -57,7 +57,6 @@ def lookup_uri(v, d, target_pkg):
if not x.is_trusted:
return target_pkg, uri, ""
- # pylint: disable=no-member
hashval = str(r.hashes.find('SHA256')).split(':')[1]
return target_pkg, uri, hashval
@@ -66,7 +65,6 @@ def lookup_uri(v, d, target_pkg):
class VirtApt:
def __init__(self, xml):
- # pylint: disable=too-many-statements
self.xml = xml
arch = xml.text("project/buildimage/arch", key="arch")
@@ -217,7 +215,6 @@ class VirtApt:
x = self.source.find_index(c.file_list[0][0])
uri = x.archive_uri(r.filename)
- # pylint: disable=no-member
hashval = str(r.hashes.find('SHA256'))
acq = apt_pkg.AcquireFile(self.acquire,
@@ -268,7 +265,6 @@ class VirtApt:
pkg = None
c = None
if not c:
- # pylint: disable=E1133
for p in self.cache.packages:
for x in p.provides_list:
if pp == x[0]:
diff --git a/elbepack/xmlpreprocess.py b/elbepack/xmlpreprocess.py
index dae12df4..804c23bf 100644
--- a/elbepack/xmlpreprocess.py
+++ b/elbepack/xmlpreprocess.py
@@ -308,9 +308,6 @@ def xmlpreprocess(xml_input_file, xml_output_file, variants=None, proxy=None, gz
`xml_output_file` is either a file-like object or a path (str) to the output file.
"""
- # pylint: disable=too-many-locals
- # pylint: disable=too-many-branches
-
# first convert variants to a set
if not variants:
variants = set([])
@@ -446,7 +443,6 @@ class PreprocessWrapper:
@staticmethod
def add_options(oparser):
# import it here because of cyclic imports
- # pylint: disable=cyclic-import
from elbepack.commands.preprocess import add_pass_through_options
group = OptionGroup(oparser,
--
2.43.0
More information about the elbe-devel
mailing list