summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2014-02-10 09:24:56 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2014-02-21 08:35:07 -0500
commit58cee8566fba7b48d127227d96c98549b7db3028 (patch)
treee85e4aacc564af2dae2790b09ba084728c8b003e /src/lib
parent0e98739497a243ff880d98bd24a6f7393ae13490 (diff)
downloadbcfg2-58cee8566fba7b48d127227d96c98549b7db3028.tar.gz
bcfg2-58cee8566fba7b48d127227d96c98549b7db3028.tar.bz2
bcfg2-58cee8566fba7b48d127227d96c98549b7db3028.zip
testsuite: Fixed several pylint 1.0 issues
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Bcfg2/Client/Tools/VCS.py10
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Packages/Yum.py2
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Packages/__init__.py4
3 files changed, 10 insertions, 6 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. """