summaryrefslogtreecommitdiffstats
path: root/base/server/python/pki/server/deployment/pkihelper.py
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2014-06-09 22:34:57 +0700
committerAde Lee <alee@redhat.com>2014-06-10 20:55:28 +0700
commita4fca6b7265924f0b656a1851970612a1c56e8c4 (patch)
treef34d3ea2d728c0f4f51d2f976fb40ba3ea8b54dc /base/server/python/pki/server/deployment/pkihelper.py
parentf603869e1e9964617fc36c82d19a3105c59a2495 (diff)
downloadpki-a4fca6b7265924f0b656a1851970612a1c56e8c4.tar.gz
pki-a4fca6b7265924f0b656a1851970612a1c56e8c4.tar.xz
pki-a4fca6b7265924f0b656a1851970612a1c56e8c4.zip
More formatting changes
Improve the layout of strings in pkimessages and fix a couple more PEP 8 issues.
Diffstat (limited to 'base/server/python/pki/server/deployment/pkihelper.py')
-rw-r--r--base/server/python/pki/server/deployment/pkihelper.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py
index 713e7a381..6e230ba1a 100644
--- a/base/server/python/pki/server/deployment/pkihelper.py
+++ b/base/server/python/pki/server/deployment/pkihelper.py
@@ -485,7 +485,7 @@ class ConfigurationFile:
print log.PKI_CONFIGURATION_URL_1 % self.mdict['pki_configuration_url']
print
print log.PKI_CONFIGURATION_RESTART_1 % \
- self.mdict['pki_registry_initscript_command']
+ self.mdict['pki_registry_initscript_command']
print
def confirm_external(self):
@@ -921,8 +921,8 @@ class Instance:
instance)) and not\
os.path.islink(
os.path.join(
- self.mdict['pki_instance_type_registry_path'],
- instance)):
+ self.mdict['pki_instance_type_registry_path'],
+ instance)):
rv += 1
config.pki_log.debug(log.PKIHELPER_APACHE_INSTANCES_2,
self.mdict['pki_instance_type_registry_path'],
@@ -984,8 +984,8 @@ class Instance:
# shouldn't be any stray files or symbolic links at this level,
# simply count the number of PKI 'tomcat' instances (directories)
# present within the PKI 'tomcat' registry directory
- for instance in\
- os.listdir(self.mdict['pki_instance_type_registry_path']):
+ for instance in os.listdir(
+ self.mdict['pki_instance_type_registry_path']):
if os.path.isdir(
os.path.join(
self.mdict['pki_instance_type_registry_path'],
@@ -1052,8 +1052,7 @@ class Instance:
try:
client = pki.system.SystemStatusClient(connection)
response = client.get_status()
- config.pki_log.debug(response,
- extra=config.PKI_INDENTATION_LEVEL_3)
+ config.pki_log.debug(response, extra=config.PKI_INDENTATION_LEVEL_3)
root = ET.fromstring(response)
status = root.findtext("Status")