From c46caa19d9e1fb429fd77693abcca2fe668366aa Mon Sep 17 00:00:00 2001
From: Christian Heimes <cheimes@redhat.com>
Date: Sun, 16 Aug 2015 19:00:00 +0200
Subject: Py3 modernization: misc manual fixes

Python 3's exception class has no message attribute. e.message can
either be replaced with string representation of e or e.args[0].

Use print(line, end='') instead of sys.stdout.write(). With end='' no
new line is appended.

Use six.reraise() to reraise an exception.

Remove sys.exc_clear() as it is no longer available in Python 3.

Conditionally import shutil.WindowsError.

Use six.move to import correct modules / function like quote, urlparse
and configparser.

Silence some pylint warnings. pylint doesn't understand six.moves magic
and emits a import-error warning.

Add additional tox envs to check for Python 3 compatibility.
---
 base/server/sbin/pkispawn | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'base/server/sbin')

diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn
index 3f51b8328..7c87c52c4 100755
--- a/base/server/sbin/pkispawn
+++ b/base/server/sbin/pkispawn
@@ -309,7 +309,7 @@ def main(argv):
                     parser.ds_verify_configuration()
 
                 except ldap.LDAPError as e:
-                    parser.print_text('ERROR: ' + e.message['desc'])
+                    parser.print_text('ERROR: ' + e.args[0]['desc'])
                     continue
 
                 parser.read_text('Base DN',
@@ -320,7 +320,7 @@ def main(argv):
                         break
 
                 except ldap.LDAPError as e:
-                    parser.print_text('ERROR: ' + e.message['desc'])
+                    parser.print_text('ERROR: ' + e.args[0]['desc'])
                     continue
 
                 remove = parser.read_text(
@@ -460,7 +460,7 @@ def main(argv):
                             parser.print_text('ERROR: base DN does not exist')
 
                     except ldap.LDAPError as e:
-                        parser.print_text('ERROR: ' + e.message['desc'])
+                        parser.print_text('ERROR: ' + e.args[0]['desc'])
 
                 print()
 
@@ -555,7 +555,7 @@ def main(argv):
 
         except ldap.LDAPError as e:
             print('ERROR:  Unable to access directory server: ' +
-                  e.message['desc'])
+                  e.args[0]['desc'])
             sys.exit(1)
 
         if parser.mdict['pki_security_domain_type'] != "new":
@@ -665,7 +665,6 @@ def print_install_information(mdict):
 
 
 def log_error_details():
-
     e_type, e_value, e_stacktrace = sys.exc_info()
     config.pki_log.debug(
         "Error Type: " + e_type.__name__, extra=config.PKI_INDENTATION_LEVEL_2)
@@ -676,7 +675,7 @@ def log_error_details():
     for l in stacktrace_list:
         e_stacktrace += l
     config.pki_log.debug(e_stacktrace, extra=config.PKI_INDENTATION_LEVEL_2)
-    sys.exc_clear()
+    del e_type, e_value, e_stacktrace
 
 # PKI Deployment Entry Point
 if __name__ == "__main__":
-- 
cgit