diff options
| author | Ade Lee <alee@redhat.com> | 2014-02-17 11:28:53 -0500 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2014-02-19 10:49:31 -0500 |
| commit | 86dfed578c3230064f2c93156b38309070a478f8 (patch) | |
| tree | 708720f576142c32f233c99b62391b417026c3f1 /base/server/python/pki | |
| parent | f4aafb999efc1367c005c9683ae9d935720d2482 (diff) | |
| download | pki-86dfed578c3230064f2c93156b38309070a478f8.tar.gz pki-86dfed578c3230064f2c93156b38309070a478f8.tar.xz pki-86dfed578c3230064f2c93156b38309070a478f8.zip | |
Added decorator to handle exceptions
Decorator catches HttpErrorExceptions from Requests
and extracts the relevant PKIException object, and rethrows
it.
Diffstat (limited to 'base/server/python/pki')
| -rw-r--r-- | base/server/python/pki/server/deployment/pkiparser.py | 6 | ||||
| -rw-r--r-- | base/server/python/pki/server/upgrade.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py index 9bce634f9..8348648e5 100644 --- a/base/server/python/pki/server/deployment/pkiparser.py +++ b/base/server/python/pki/server/deployment/pkiparser.py @@ -251,7 +251,7 @@ class PKIConfigParser: def read_text(self, message, section=None, key=None, default=None, - options=None, sign=':', allowEmpty=True, caseSensitive=True): + options=None, sign=':', allow_empty=True, case_sensitive=True): if default is None and key is not None: default = self.pki_master_dict[key] @@ -265,7 +265,7 @@ class PKIConfigParser: value = value.strip() if len(value) == 0: # empty value - if allowEmpty: + if allow_empty: value = default done = True break @@ -273,7 +273,7 @@ class PKIConfigParser: else: # non-empty value if options is not None: for v in options: - if caseSensitive: + if case_sensitive: if v == value: done = True break diff --git a/base/server/python/pki/server/upgrade.py b/base/server/python/pki/server/upgrade.py index a9911b6ed..57662b5d2 100644 --- a/base/server/python/pki/server/upgrade.py +++ b/base/server/python/pki/server/upgrade.py @@ -98,7 +98,7 @@ class PKIServerUpgradeScriptlet(pki.upgrade.PKIUpgradeScriptlet): print message else: result = pki.read_text(message + ' Continue (Yes/No)', - options=['Y', 'N'], default='Y', delimiter='?', caseSensitive=False).lower() + options=['Y', 'N'], default='Y', delimiter='?', case_sensitive=False).lower() if result == 'y': continue raise pki.server.PKIServerException( @@ -128,7 +128,7 @@ class PKIServerUpgradeScriptlet(pki.upgrade.PKIUpgradeScriptlet): print message else: result = pki.read_text(message + ' Continue (Yes/No)', - options=['Y', 'N'], default='Y', delimiter='?', caseSensitive=False).lower() + options=['Y', 'N'], default='Y', delimiter='?', case_sensitive=False).lower() if result == 'y': continue raise pki.server.PKIServerException( |