diff options
author | Christian Heimes <cheimes@redhat.com> | 2015-08-16 19:00:00 +0200 |
---|---|---|
committer | Christian Heimes <cheimes@redhat.com> | 2015-08-17 21:14:11 +0200 |
commit | f98ca7fa1903e12a4b2c49a70163077b3560dc1d (patch) | |
tree | a3446113d3a7d32c5ce79b1b359d5353ec49afee /base/server/sbin/pkidestroy | |
parent | 71148b8f79a5d6ba0c949a3ca0acf5aec6321f0a (diff) | |
download | pki-f98ca7fa1903e12a4b2c49a70163077b3560dc1d.tar.gz pki-f98ca7fa1903e12a4b2c49a70163077b3560dc1d.tar.xz pki-f98ca7fa1903e12a4b2c49a70163077b3560dc1d.zip |
Py3 modernization: libmodernize.fixes.fix_print
Replace print statement with Python 3's print() function.
For Python 2 'from __future__ import print_function' turns the print
statement into Python 3 compatible print function.
See https://www.python.org/dev/peps/pep-3105/
Diffstat (limited to 'base/server/sbin/pkidestroy')
-rwxr-xr-x | base/server/sbin/pkidestroy | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/base/server/sbin/pkidestroy b/base/server/sbin/pkidestroy index 252c504da..ff7296f7b 100755 --- a/base/server/sbin/pkidestroy +++ b/base/server/sbin/pkidestroy @@ -21,12 +21,13 @@ # System Imports from __future__ import absolute_import +from __future__ import print_function import sys import signal if not hasattr(sys, "hexversion") or sys.hexversion < 0x020700f0: - print "Python version %s.%s.%s is too old." % sys.version_info[:3] - print "Please upgrade to at least Python 2.7.0." + print("Python version %s.%s.%s is too old." % sys.version_info[:3]) + print("Please upgrade to at least Python 2.7.0.") sys.exit(1) try: import os @@ -41,20 +42,20 @@ try: from pki.server.deployment import pkimessages as log import pki.server.deployment.pkihelper as util except ImportError: - print >> sys.stderr, """\ + print("""\ There was a problem importing one of the required Python modules. The error was: %s -""" % sys.exc_info()[1] +""" % sys.exc_info()[1], file=sys.stderr) sys.exit(1) # Handle the Keyboard Interrupt # pylint: disable=W0613 def interrupt_handler(event, frame): - print - print '\nUninstallation canceled.' + print() + print('\nUninstallation canceled.') sys.exit(1) @@ -91,10 +92,10 @@ def main(argv): # workaround for pylint error E1103 config.pki_dns_domainname = str(dnsdomainname).rstrip('\n') if not len(config.pki_dns_domainname): - print log.PKI_DNS_DOMAIN_NOT_SET + print(log.PKI_DNS_DOMAIN_NOT_SET) sys.exit(1) except subprocess.CalledProcessError as exc: - print log.PKI_SUBPROCESS_ERROR_1 % exc + print(log.PKI_SUBPROCESS_ERROR_1 % exc) sys.exit(1) # Read and process command-line arguments. @@ -153,7 +154,7 @@ def main(argv): str(args.pki_deployed_instance_name).strip('[\']') if interactive: - print + print() parser.indent = 0 begin = parser.read_text( @@ -161,10 +162,10 @@ def main(argv): options=['Yes', 'Y', 'No', 'N', 'Quit', 'Q'], sign='?', allow_empty=False, case_sensitive=False).lower() - print + print() if begin == 'q' or begin == 'quit': - print "Uninstallation canceled." + print("Uninstallation canceled.") sys.exit(0) elif begin == 'y' or begin == 'yes': @@ -188,18 +189,18 @@ def main(argv): config.pki_root_prefix + config.PKI_DEPLOYMENT_BASE_ROOT + "/" + \ config.pki_deployed_instance_name if not os.path.exists(deployed_pki_instance_path): - print "ERROR: " + log.PKI_INSTANCE_DOES_NOT_EXIST_1 %\ - deployed_pki_instance_path - print + print("ERROR: " + log.PKI_INSTANCE_DOES_NOT_EXIST_1 % + deployed_pki_instance_path) + print() parser.arg_parser.exit(-1) # verify that previously deployed subsystem for this instance exists deployed_pki_subsystem_path = \ deployed_pki_instance_path + "/" + config.pki_subsystem.lower() if not os.path.exists(deployed_pki_subsystem_path): - print "ERROR: " + log.PKI_SUBSYSTEM_DOES_NOT_EXIST_2 %\ - (config.pki_subsystem, deployed_pki_instance_path) - print + print("ERROR: " + log.PKI_SUBSYSTEM_DOES_NOT_EXIST_2 % + (config.pki_subsystem, deployed_pki_instance_path)) + print() parser.arg_parser.exit(-1) config.default_deployment_cfg = \ @@ -222,7 +223,7 @@ def main(argv): config.pki_subsystem.lower() +\ "-" + "destroy" + "." +\ config.pki_timestamp + "." + "log" - print 'Log file: %s/%s' % (config.pki_log_dir, config.pki_log_name) + print('Log file: %s/%s' % (config.pki_log_dir, config.pki_log_name)) rv = pkilogging.enable_pki_logger(config.pki_log_dir, config.pki_log_name, @@ -232,7 +233,7 @@ def main(argv): if rv != OSError: config.pki_log = rv else: - print log.PKI_UNABLE_TO_CREATE_LOG_DIRECTORY_1 % config.pki_log_dir + print(log.PKI_UNABLE_TO_CREATE_LOG_DIRECTORY_1 % config.pki_log_dir) sys.exit(1) # Read the specified PKI configuration file. @@ -251,8 +252,8 @@ def main(argv): config.pki_log.debug(pkilogging.log_format(parser.mdict), extra=config.PKI_INDENTATION_LEVEL_0) - print "Uninstalling " + config.pki_subsystem + " from " + \ - deployed_pki_instance_path + "." + print("Uninstalling " + config.pki_subsystem + " from " + + deployed_pki_instance_path + ".") # Process the various "scriptlets" to remove the specified PKI subsystem. pki_subsystem_scriptlets = parser.mdict['destroy_scriplets'].split() @@ -271,8 +272,8 @@ def main(argv): config.pki_log.debug(pkilogging.log_format(parser.mdict), extra=config.PKI_INDENTATION_LEVEL_0) - print - print "Uninstallation complete." + print() + print("Uninstallation complete.") # PKI Deployment Entry Point |