diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-25 10:50:28 -0600 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-25 10:50:28 -0600 |
commit | 12b769d5864c9e04235184d38a5089f1ee655c8c (patch) | |
tree | 39ff502694eb8d47405603879ffd3031a967bad2 /src/lib/Bcfg2/Server/Plugins/SSLCA.py | |
parent | e07faec3156ed49347b7219d1032b5ef79be9269 (diff) | |
parent | cae39b746051ff5f3257342d0659340283b2d6ef (diff) | |
download | bcfg2-12b769d5864c9e04235184d38a5089f1ee655c8c.tar.gz bcfg2-12b769d5864c9e04235184d38a5089f1ee655c8c.tar.bz2 bcfg2-12b769d5864c9e04235184d38a5089f1ee655c8c.zip |
Merge pull request #267 from stpierre/pylint-0.28-maint
Fix pylint errors
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/SSLCA.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/SSLCA.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/SSLCA.py b/src/lib/Bcfg2/Server/Plugins/SSLCA.py index f111ffc60..a33b2f448 100644 --- a/src/lib/Bcfg2/Server/Plugins/SSLCA.py +++ b/src/lib/Bcfg2/Server/Plugins/SSLCA.py @@ -150,15 +150,13 @@ class SSLCAEntrySet(Bcfg2.Server.Plugin.EntrySet): if passphrase: cmd.extend(["-passin", "pass:%s" % passphrase]) - def _scrub_pass(arg): - """ helper to scrub the passphrase from the - argument list """ - if arg.startswith("pass:"): - return "pass:******" - else: - return arg - else: - _scrub_pass = lambda a: a + def _scrub_pass(arg): + """ helper to scrub the passphrase from the + argument list for debugging. """ + if arg.startswith("pass:"): + return "pass:******" + else: + return arg self.debug_log("SSLCA: Generating new certificate: %s" % " ".join(_scrub_pass(a) for a in cmd)) @@ -362,10 +360,13 @@ class SSLCA(Bcfg2.Server.Plugin.GroupSpool): """ The SSLCA generator handles the creation and management of ssl certificates and their keys. """ __author__ = 'g.hagger@gmail.com' - # python 2.5 doesn't support mixing *magic and keyword arguments - es_cls = lambda self, *args: SSLCAEntrySet(*args, **dict(parent=self)) es_child_cls = SSLCADataFile + def es_cls(self, *args): + """Fake entry set 'class' that sets this as the parent.""" + # python 2.5 doesn't support mixing *magic and keyword arguments + return SSLCAEntrySet(*args, **dict(parent=self)) + def get_ca(self, name): """ get a dict describing a CA from the config file """ return dict(self.core.setup.cfp.items("sslca_%s" % name)) |