diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-04-25 08:46:59 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-04-25 08:46:59 -0400 |
| commit | 148239de876a0c8d2fb53fd644ffaabc70540370 (patch) | |
| tree | 07210e4910f4405fe23dbdf8ca91411c7f19d71f /src/lib/Bcfg2/Server | |
| parent | 14c6cfde0761e910b6c3c1924d51cf915ba96e9d (diff) | |
| download | bcfg2-148239de876a0c8d2fb53fd644ffaabc70540370.tar.gz bcfg2-148239de876a0c8d2fb53fd644ffaabc70540370.tar.bz2 bcfg2-148239de876a0c8d2fb53fd644ffaabc70540370.zip | |
fixed pylint/pep-8 tests
Diffstat (limited to 'src/lib/Bcfg2/Server')
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin/Minestruct.py | 4 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin/Pull.py | 8 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin/Viz.py | 20 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Minestruct.py b/src/lib/Bcfg2/Server/Admin/Minestruct.py index 37ca74894..65f99a213 100644 --- a/src/lib/Bcfg2/Server/Admin/Minestruct.py +++ b/src/lib/Bcfg2/Server/Admin/Minestruct.py @@ -11,8 +11,8 @@ class Minestruct(Bcfg2.Server.Admin.StructureMode): __usage__ = ("[options] <client>\n\n" " %-25s%s\n" " %-25s%s\n" % - ("-f <filename>", "build a particular file", - "-g <groups>", "only build config for groups")) + ("-f <filename>", "build a particular file", + "-g <groups>", "only build config for groups")) def __call__(self, args): if len(args) == 0: diff --git a/src/lib/Bcfg2/Server/Admin/Pull.py b/src/lib/Bcfg2/Server/Admin/Pull.py index 459fcec65..fccdb2d94 100644 --- a/src/lib/Bcfg2/Server/Admin/Pull.py +++ b/src/lib/Bcfg2/Server/Admin/Pull.py @@ -18,10 +18,10 @@ class Pull(Bcfg2.Server.Admin.MetadataCore): " %-25s%s\n" " %-25s%s\n" " %-25s%s\n" % - ("-v", "be verbose", - "-f", "force", - "-I", "interactive", - "-s", "stdin")) + ("-v", "be verbose", + "-f", "force", + "-I", "interactive", + "-s", "stdin")) def __init__(self, setup): Bcfg2.Server.Admin.MetadataCore.__init__(self, setup) diff --git a/src/lib/Bcfg2/Server/Admin/Viz.py b/src/lib/Bcfg2/Server/Admin/Viz.py index 2cbd7eaf6..cb2470e17 100644 --- a/src/lib/Bcfg2/Server/Admin/Viz.py +++ b/src/lib/Bcfg2/Server/Admin/Viz.py @@ -14,16 +14,16 @@ class Viz(Bcfg2.Server.Admin.MetadataCore): " %-32s%s\n" " %-32s%s\n" " %-32s%s\n" % - ("-H, --includehosts", - "include hosts in the viz output", - "-b, --includebundles", - "include bundles in the viz output", - "-k, --includekey", - "show a key for different digraph shapes", - "-c, --only-client <clientname>", - "show only the groups, bundles for the named client", - "-o, --outfile <file>", - "write viz output to an output file")) + ("-H, --includehosts", + "include hosts in the viz output", + "-b, --includebundles", + "include bundles in the viz output", + "-k, --includekey", + "show a key for different digraph shapes", + "-c, --only-client <clientname>", + "show only the groups, bundles for the named client", + "-o, --outfile <file>", + "write viz output to an output file")) colors = ['steelblue1', 'chartreuse', 'gold', 'magenta', 'indianred1', 'limegreen', 'orange1', 'lightblue2', diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 4375512e9..44ba0fee8 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -387,7 +387,7 @@ class BaseCore(object): self.setup['plugins'].remove('') for plugin in self.setup['plugins']: - if not plugin in self.plugins: + if plugin not in self.plugins: self.init_plugin(plugin) # Remove blacklisted plugins |