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/

1 files changed, 65 insertions, 64 deletions

diff --git a/base/common/python/pki/cert.py b/base/common/python/pki/cert.py
index 5590b35ee..6d0d40833 100644
--- a/base/common/python/pki/cert.py
+++ b/base/common/python/pki/cert.py
@@ -21,6 +21,7 @@
 #     Ade Lee <alee@redhat.com>
 
 from __future__ import absolute_import
+from __future__ import print_function
 import copy
 import json
 
@@ -1046,8 +1047,8 @@ def main():
     cert_client.get_enrollment_template('caUserCert')
 
     # Enrolling an user certificate
-    print 'Enrolling an user certificate'
-    print '-----------------------------'
+    print('Enrolling an user certificate')
+    print('-----------------------------')
 
     inputs = dict()
     inputs['cert_request_type'] = 'crmf'
@@ -1073,19 +1074,19 @@ def main():
     for enrollment_result in enrollment_results:
         request_data = enrollment_result.request
         cert_data = enrollment_result.cert
-        print 'Request ID: ' + request_data.request_id
-        print 'Request Status:' + request_data.request_status
-        print 'Serial Number: ' + cert_data.serial_number
-        print 'Issuer: ' + cert_data.issuer_dn
-        print 'Subject: ' + cert_data.subject_dn
-        print 'Pretty Print:'
-        print cert_data.pretty_repr
+        print('Request ID: ' + request_data.request_id)
+        print('Request Status:' + request_data.request_status)
+        print('Serial Number: ' + cert_data.serial_number)
+        print('Issuer: ' + cert_data.issuer_dn)
+        print('Subject: ' + cert_data.subject_dn)
+        print('Pretty Print:')
+        print(cert_data.pretty_repr)
 
-    print
+    print()
 
     # Enrolling a server certificate
-    print "Enrolling a server certificate"
-    print '------------------------------'
+    print("Enrolling a server certificate")
+    print('------------------------------')
 
     inputs = dict()
     inputs['cert_request_type'] = 'pkcs10'
@@ -1110,41 +1111,41 @@ def main():
     for enrollment_result in enrollment_results_2:
         request_data = enrollment_result.request
         cert_data = enrollment_result.cert
-        print 'Request ID: ' + request_data.request_id
-        print 'Request Status:' + request_data.request_status
+        print('Request ID: ' + request_data.request_id)
+        print('Request Status:' + request_data.request_status)
         if cert_data is not None:
             # store cert_id for usage later
             cert_id = cert_data.serial_number
-            print 'Serial Number: ' + cert_id
-            print 'Issuer: ' + cert_data.issuer_dn
-            print 'Subject: ' + cert_data.subject_dn
-            print 'Pretty Print:'
-            print cert_data.pretty_repr
+            print('Serial Number: ' + cert_id)
+            print('Issuer: ' + cert_data.issuer_dn)
+            print('Subject: ' + cert_data.subject_dn)
+            print('Pretty Print:')
+            print(cert_data.pretty_repr)
 
-    print
+    print()
 
     # List all the VALID certs
-    print 'An example listing all VALID certs'
-    print '----------------------------------'
+    print('An example listing all VALID certs')
+    print('----------------------------------')
 
     search_params = {'status': 'VALID'}
     cert_data_list = cert_client.list_certs(**search_params)
     for cert_data_info in cert_data_list:
-        print "Serial Number: " + cert_data_info.serial_number
-        print "Subject DN: " + cert_data_info.subject_dn
-        print "Status: " + cert_data_info.status
-    print
+        print("Serial Number: " + cert_data_info.serial_number)
+        print("Subject DN: " + cert_data_info.subject_dn)
+        print("Status: " + cert_data_info.status)
+    print()
 
     # Trying to get a non-existing cert
     # Assuming that there is no certificate with serial number = 100
     try:
         cert_data = cert_client.get_cert(100)
-        print 'Serial Number: ' + cert_data.serial_number
-        print 'Issuer: ' + cert_data.issuer_dn
-        print 'Subject: ' + cert_data.subject_dn
+        print('Serial Number: ' + cert_data.serial_number)
+        print('Issuer: ' + cert_data.issuer_dn)
+        print('Subject: ' + cert_data.subject_dn)
     except pki.CertNotFoundException:
-        print "Certificate with ID 100 does not exist"
-        print
+        print("Certificate with ID 100 does not exist")
+        print()
 
     # Certificate Serial Number used for CertClient methods.
     # 7, 0x7 and '0x7' are also valid values
@@ -1152,55 +1153,55 @@ def main():
     #  before.
 
     # Get certificate data
-    print 'Getting information of a certificate'
-    print '------------------------------------'
+    print('Getting information of a certificate')
+    print('------------------------------------')
 
     cert_data = cert_client.get_cert(cert_id)
     # Print the certificate information
-    print 'Serial Number: ' + cert_data.serial_number
-    print 'Issuer: ' + cert_data.issuer_dn
-    print 'Subject: ' + cert_data.subject_dn
-    print 'Status: ' + cert_data.status
-    print 'Not Before: ' + cert_data.not_before
-    print 'Not After: ' + cert_data.not_after
-    print 'Encoded: '
-    print cert_data.encoded
-    print "Pretty print format: "
-    print cert_data.pretty_repr
-    print
+    print('Serial Number: ' + cert_data.serial_number)
+    print('Issuer: ' + cert_data.issuer_dn)
+    print('Subject: ' + cert_data.subject_dn)
+    print('Status: ' + cert_data.status)
+    print('Not Before: ' + cert_data.not_before)
+    print('Not After: ' + cert_data.not_after)
+    print('Encoded: ')
+    print(cert_data.encoded)
+    print("Pretty print format: ")
+    print(cert_data.pretty_repr)
+    print()
 
     # Review a certificate - used to get a nonce for revoke request.
-    print 'Reviewing a certificate'
-    print '-----------------------'
+    print('Reviewing a certificate')
+    print('-----------------------')
 
     cert_data = cert_client.review_cert(cert_id)
-    print 'Serial Number: ' + cert_data.serial_number
-    print 'Issuer: ' + cert_data.issuer_dn
-    print 'Subject: ' + cert_data.subject_dn
-    print 'Status: ' + cert_data.status
-    print 'Nonce: ' + str(cert_data.nonce)
-    print
+    print('Serial Number: ' + cert_data.serial_number)
+    print('Issuer: ' + cert_data.issuer_dn)
+    print('Subject: ' + cert_data.subject_dn)
+    print('Status: ' + cert_data.status)
+    print('Nonce: ' + str(cert_data.nonce))
+    print()
 
     # Revoke a certificate
-    print 'Revoking a certificate'
-    print '----------------------'
+    print('Revoking a certificate')
+    print('----------------------')
 
     cert_request_info = cert_client.hold_cert(cert_data.serial_number,
                                               comments="Test revoking a cert")
-    print 'Request ID: ' + cert_request_info.request_id
-    print 'Request Type: ' + cert_request_info.request_type
-    print 'Request Status: ' + cert_request_info.request_status
-    print
+    print('Request ID: ' + cert_request_info.request_id)
+    print('Request Type: ' + cert_request_info.request_type)
+    print('Request Status: ' + cert_request_info.request_status)
+    print()
 
     # Un-revoke a certificate
-    print 'Un-revoking a certificate'
-    print '-------------------------'
+    print('Un-revoking a certificate')
+    print('-------------------------')
 
     cert_request_info = cert_client.unrevoke_cert(cert_data.serial_number)
-    print 'Request ID: ' + cert_request_info.request_id
-    print 'Request Type: ' + cert_request_info.request_type
-    print 'Request Status: ' + cert_request_info.request_status
-    print
+    print('Request ID: ' + cert_request_info.request_id)
+    print('Request Type: ' + cert_request_info.request_type)
+    print('Request Status: ' + cert_request_info.request_status)
+    print()
 
 
 if __name__ == "__main__":