From 58cee8566fba7b48d127227d96c98549b7db3028 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 10 Feb 2014 09:24:56 -0500 Subject: testsuite: Fixed several pylint 1.0 issues --- src/lib/Bcfg2/Client/Tools/VCS.py | 10 +++++++--- src/lib/Bcfg2/Server/Plugins/Packages/Yum.py | 2 +- src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 4 ++-- testsuite/Testsrc/test_code_checks.py | 2 +- testsuite/pylintrc.conf | 11 ++++++++++- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/lib/Bcfg2/Client/Tools/VCS.py b/src/lib/Bcfg2/Client/Tools/VCS.py index aca5dbbc7..4fa2fb5e2 100644 --- a/src/lib/Bcfg2/Client/Tools/VCS.py +++ b/src/lib/Bcfg2/Client/Tools/VCS.py @@ -161,15 +161,19 @@ class VCS(Bcfg2.Client.Tools.Tool): def Verifysvn(self, entry, _): """Verify svn repositories""" - headrev = pysvn.Revision( pysvn.opt_revision_kind.head ) + # pylint: disable=E1101 + headrev = pysvn.Revision(pysvn.opt_revision_kind.head) + # pylint: enable=E1101 client = pysvn.Client() try: cur_rev = str(client.info(entry.get('name')).revision.number) - server = client.info2(entry.get('sourceurl'), headrev, recurse=False) + server = client.info2(entry.get('sourceurl'), headrev, + recurse=False) if server: server_rev = str(server[0][1].rev.number) except: - self.logger.info("Repository %s does not exist" % entry.get('name')) + self.logger.info("Repository %s does not exist" % + entry.get('name')) return False if entry.get('revision') == 'latest' and cur_rev == server_rev: diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py index f038ec9c0..7b5475ecc 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py @@ -323,7 +323,7 @@ class YumCollection(Collection): self.fam) @property - def disableMetaData(self): + def disableMetaData(self): # pylint: disable=C0103 """ Report whether or not metadata processing is enabled. This duplicates code in Packages/__init__.py, and can probably be removed in Bcfg2 1.4 when we have a module-level setup diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index 479138ef1..4b58c0fdb 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -188,7 +188,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, set_debug.__doc__ = Bcfg2.Server.Plugin.Plugin.set_debug.__doc__ @property - def disableResolver(self): + def disableResolver(self): # pylint: disable=C0103 """ Report the state of the resolver. This can be disabled in the configuration. Note that disabling metadata (see :attr:`disableMetaData`) implies disabling the resolver. @@ -213,7 +213,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, default="enabled").lower() == "disabled" @property - def disableMetaData(self): + def disableMetaData(self): # pylint: disable=C0103 """ Report whether or not metadata processing is enabled. This property cannot be set. """ diff --git a/testsuite/Testsrc/test_code_checks.py b/testsuite/Testsrc/test_code_checks.py index e1214a942..98df358e7 100644 --- a/testsuite/Testsrc/test_code_checks.py +++ b/testsuite/Testsrc/test_code_checks.py @@ -35,7 +35,7 @@ contingent_checks = { "lib/Bcfg2/Server/Admin": ["Reports.py", "Syncdb.py"], "sbin": ["bcfg2-reports"]}, ("pyinotify",): {"lib/Bcfg2/Server/FileMonitor": ["Inotify.py"]}, - ("yum",): {"lib/Bcfg2/Client/Tools": ["YUM*"]}, + ("yum",): {"lib/Bcfg2/Client/Tools": ["YUM.py"]}, ("genshi",): {"lib/Bcfg2/Server/Plugins/Cfg": ["CfgGenshiGenerator.py"]}, ("Cheetah",): {"lib/Bcfg2/Server/Plugins/Cfg": ["CfgCheetahGenerator.py"]}, ("M2Crypto",): {"lib/Bcfg2": ["Encryption.py"], diff --git a/testsuite/pylintrc.conf b/testsuite/pylintrc.conf index 653c68426..94904877b 100644 --- a/testsuite/pylintrc.conf +++ b/testsuite/pylintrc.conf @@ -99,6 +99,10 @@ evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / stateme # evaluation report (RP0004). comment=no +# Template used to display messages. This is a python new-style format string +# used to format the massage information. See doc for all details +msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg} + [VARIABLES] @@ -131,6 +135,9 @@ ignore-docstrings=yes # Maximum number of characters on a single line. max-line-length=79 +# Regexp for a line that is allowed to be longer than the limit. +ignore-long-lines=^\s*(# )?(?|:(func|class):.*)$ + # Maximum number of lines in a module max-module-lines=1000 @@ -247,8 +254,10 @@ max-locals=20 # Maximum number of return / yield for function / method body max-returns=6 -# Maximum number of branch for function / method body +# Maximum number of branch for function / method body (max-branchs is +# pylint 0.x, max-branches is 1.0) max-branchs=18 +max-branches=18 # Maximum number of statements in function / method body max-statements=75 -- cgit v1.2.3-1-g7c22