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.

1 files changed, 5 insertions, 5 deletions

diff --git a/base/server/python/pki/server/cli/nuxwdog.py b/base/server/python/pki/server/cli/nuxwdog.py
index 674fc0340..bdcc18a00 100644
--- a/base/server/python/pki/server/cli/nuxwdog.py
+++ b/base/server/python/pki/server/cli/nuxwdog.py
@@ -119,7 +119,7 @@ class NuxwdogEnableCLI(pki.cli.CLI):
     def add_nuxwdog_link(self, instance):
         nuxwdog_jar_path = '/usr/lib/java/nuxwdog.jar'
         if not os.path.exists(nuxwdog_jar_path):
-            print (
+            print(
                 "Error: nuxwdog jar file does not exist.  "
                 "Is nuxwdog installed?"
             )
@@ -158,7 +158,7 @@ class NuxwdogEnableCLI(pki.cli.CLI):
                 line = "USE_NUXWDOG=\"true\"\n"
                 got_use_nuxwdog = True
 
-            sys.stdout.write(line)
+            print(line, end='')
 
         if not got_use_nuxwdog:
             with open(sysconfig_file, 'a') as f:
@@ -247,7 +247,7 @@ class NuxwdogEnableCLI(pki.cli.CLI):
                 match = re.search("^passwordClass=(.*)", line)
                 if match:
                     line = "passwordClass=" + pclass + "\n"
-                sys.stdout.write(line)
+                print(line, end='')
             os.chown(cs_cfg, instance.uid, instance.gid)
 
 
@@ -336,7 +336,7 @@ class NuxwdogDisableCLI(pki.cli.CLI):
             if match:
                 line = "USE_NUXWDOG=\"false\"\n"
 
-            sys.stdout.write(line)
+            print(line, end='')
 
         os.chown(sysconfig_file, instance.uid, instance.gid)
 
@@ -402,5 +402,5 @@ class NuxwdogDisableCLI(pki.cli.CLI):
                 match = re.search("^passwordClass=(.*)", line)
                 if match:
                     line = "passwordClass=" + pclass + "\n"
-                sys.stdout.write(line)
+                print(line, end='')
                 os.chown(cs_cfg, instance.uid, instance.gid)