Added decorator to handle exceptions

Decorator catches HttpErrorExceptions from Requests
and extracts the relevant PKIException object, and rethrows
it.

1 files changed, 3 insertions, 3 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