Modernize Python 2 code to get ready for Python 3

diff --git a/regression-tests.api/runtests.py b/regression-tests.api/runtests.py
index 45145a6181fbbd6f37d8446574ae14d9df6146fb..9263fcf19b7c7cccdd4568f3d477949ded1e2cfe 100755 (executable)
--- a/regression-tests.api/runtests.py
+++ b/regression-tests.api/runtests.py
@@ -11,6 +11,11 @@ import sys
 import tempfile
 import time
 
+try:
+  raw_input
+except NameError:
+  raw_input = input
+
 SQLITE_DB = 'pdns.sqlite3'
 WEBPORT = 5556
 DNSPORT = 5300

diff --git a/regression-tests.api/test_helper.py b/regression-tests.api/test_helper.py
index 2affa83a4ba176e4c895941c4f5501abffc3775e..06a3e5dd04dcc10550689e715714169b9543996f 100644 (file)
--- a/regression-tests.api/test_helper.py
+++ b/regression-tests.api/test_helper.py
@@ -84,7 +84,7 @@ def pdnsutil(subcommand, *args):
     try:
         return subprocess.check_output(PDNSUTIL_CMD + [subcommand] + list(args), close_fds=True).decode('ascii')
     except subprocess.CalledProcessError as except_inst:
-        raise RuntimeError("pdnsutil %s %s failed: %s" % (command, args, except_inst.output.decode('ascii', errors='replace')))
+        raise RuntimeError("pdnsutil %s %s failed: %s" % (subcommand, args, except_inst.output.decode('ascii', errors='replace')))
 
 def pdnsutil_rectify(zonename):
     """Run pdnsutil rectify-zone on the given zone."""

diff --git a/regression-tests.auth-py/authtests.py b/regression-tests.auth-py/authtests.py
index 732ad27111e1a5289eebf69071478a1c61409925..c680a82dc33e45b39d52e4d8d8c92ebaadfbb044 100644 (file)
--- a/regression-tests.auth-py/authtests.py
+++ b/regression-tests.auth-py/authtests.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python2
 
+from __future__ import print_function
 import errno
 import shutil
 import os
@@ -64,7 +65,7 @@ PrivateKey: Lt0v0Gol3pRUFM7fDdcy0IWN0O/MnEmVPA+VylL8Y4U=
         except OSError as e:
             if e.errno != errno.ENOENT:
                 raise
-        os.mkdir(confdir, 0755)
+        os.mkdir(confdir, 0o755)
 
     @classmethod
     def generateAuthZone(cls, confdir, zonename, zonecontent):
@@ -119,11 +120,11 @@ distributor-threads=1""".format(confdir=confdir, prefix=cls._PREFIX,
                        'create-bind-db',
                        bind_dnssec_db]
 
-        print ' '.join(pdnsutilCmd)
+        print(' '.join(pdnsutilCmd))
         try:
             subprocess.check_output(pdnsutilCmd, stderr=subprocess.STDOUT)
         except subprocess.CalledProcessError as e:
-            print e.output
+            print(e.output)
             raise
 
     @classmethod
@@ -147,11 +148,11 @@ distributor-threads=1""".format(confdir=confdir, prefix=cls._PREFIX,
                            'active',
                            'ksk']
 
-        print ' '.join(pdnsutilCmd)
+        print(' '.join(pdnsutilCmd))
         try:
             subprocess.check_output(pdnsutilCmd, stderr=subprocess.STDOUT)
         except subprocess.CalledProcessError as e:
-            print e.output
+            print(e.output)
             raise
 
     @classmethod
@@ -194,7 +195,7 @@ distributor-threads=1""".format(confdir=confdir, prefix=cls._PREFIX,
                 if e.errno != errno.ESRCH:
                     raise
                 with open(logFile, 'r') as fdLog:
-                    print fdLog.read()
+                    print(fdLog.read())
             sys.exit(cls._auths[ipaddress].returncode)
 
     @classmethod

diff --git a/regression-tests.dnsdist/dnsdisttests.py b/regression-tests.dnsdist/dnsdisttests.py
index c02afb8437bbd1da93dfddc95d274e0d6a14740d..91fc086b49ccd146ebb41932c257865f721aafc6 100644 (file)
--- a/regression-tests.dnsdist/dnsdisttests.py
+++ b/regression-tests.dnsdist/dnsdisttests.py
@@ -17,12 +17,15 @@ import libnacl
 import libnacl.utils
 
 # Python2/3 compatibility hacks
-if sys.version_info[0] == 2:
+try:
+  from queue import Queue
+except ImportError:
   from Queue import Queue
+
+try:
   range = xrange
-else:
-  from queue import Queue
-  range = range  # allow re-export of the builtin name
+except NameError:
+  pass
 
 
 class DNSDistTest(unittest.TestCase):

diff --git a/regression-tests.recursor-dnssec/printlogs.py b/regression-tests.recursor-dnssec/printlogs.py
index 1267ba5f2c6e0df75fc0167b0a27566a6b34d582..9dcbdeedd954e1cbcb610af223d9e94807fd8ad9 100755 (executable)
--- a/regression-tests.recursor-dnssec/printlogs.py
+++ b/regression-tests.recursor-dnssec/printlogs.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python2
 
+from __future__ import print_function
 import xml.etree.ElementTree
 import os.path
 import glob
@@ -15,13 +16,13 @@ for child in root:
                 confdir = os.path.join("configs", confdirname)
                 recursorlog = os.path.join(confdir, "recursor.log")
                 if os.path.exists(recursorlog):
-                    print "==============> %s <==============" % recursorlog
+                    print("==============> %s <==============" % recursorlog)
                     with open(recursorlog) as f:
-                        print ''.join(f.readlines())
+                        print(''.join(f.readlines()))
                 authdirs = glob.glob(os.path.join(confdir, "auth-*"))
                 for authdir in authdirs:
                     authlog = os.path.join(authdir, "pdns.log")
                     if os.path.exists(recursorlog):
-                        print "==============> %s <==============" % authlog
+                        print("==============> %s <==============" % authlog)
                         with open(authlog) as f:
-                            print ''.join(f.readlines())
+                            print(''.join(f.readlines()))

diff --git a/regression-tests.recursor-dnssec/recursortests.py b/regression-tests.recursor-dnssec/recursortests.py
index d2a286858f29d6279a944bc557f89df54ae14f07..ec1b0fce46acfc95cc37e0043779dd7e9a5183d6 100644 (file)
--- a/regression-tests.recursor-dnssec/recursortests.py
+++ b/regression-tests.recursor-dnssec/recursortests.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python2
 
+from __future__ import print_function
 import errno
 import shutil
 import os
@@ -290,7 +291,7 @@ PrivateKey: kvoV/g4IO/tefSro+FLJ5UC7H3BUf0IUtZQSUOfQGyA=
         except OSError as e:
             if e.errno != errno.ENOENT:
                 raise
-        os.mkdir(confdir, 0755)
+        os.mkdir(confdir, 0o755)
 
     @classmethod
     def generateAuthZone(cls, confdir, zonename, zonecontent):
@@ -340,11 +341,11 @@ distributor-threads=1""".format(confdir=confdir,
                        'create-bind-db',
                        bind_dnssec_db]
 
-        print ' '.join(pdnsutilCmd)
+        print(' '.join(pdnsutilCmd))
         try:
             subprocess.check_output(pdnsutilCmd, stderr=subprocess.STDOUT)
         except subprocess.CalledProcessError as e:
-            print e.output
+            print(e.output)
             raise
 
     @classmethod
@@ -368,11 +369,11 @@ distributor-threads=1""".format(confdir=confdir,
                            'active',
                            'ksk']
 
-        print ' '.join(pdnsutilCmd)
+        print(' '.join(pdnsutilCmd))
         try:
             subprocess.check_output(pdnsutilCmd, stderr=subprocess.STDOUT)
         except subprocess.CalledProcessError as e:
-            print e.output
+            print(e.output)
             raise
 
     @classmethod
@@ -424,7 +425,7 @@ distributor-threads=1""".format(confdir=confdir,
                 if e.errno != errno.ESRCH:
                     raise
                 with open(logFile, 'r') as fdLog:
-                    print fdLog.read()
+                    print(fdLog.read())
             sys.exit(cls._auths[ipaddress].returncode)
 
     @classmethod
@@ -492,7 +493,7 @@ distributor-threads=1""".format(confdir=confdir,
                 if e.errno != errno.ESRCH:
                     raise
                 with open(logFile, 'r') as fdLog:
-                    print fdLog.read()
+                    print(fdLog.read())
             sys.exit(cls._recursor.returncode)
 
     @classmethod
@@ -504,7 +505,7 @@ distributor-threads=1""".format(confdir=confdir,
         try:
             subprocess.check_output(rec_controlCmd, stderr=subprocess.STDOUT)
         except subprocess.CalledProcessError as e:
-            print e.output
+            print(e.output)
             raise
 
     @classmethod

diff --git a/regression-tests.recursor-dnssec/test_Protobuf.py b/regression-tests.recursor-dnssec/test_Protobuf.py
index 813087be02764d9b78715352ea5241203629ca13..50a6449d4b45487175a9d1813e3d973eefd0ed67 100644 (file)
--- a/regression-tests.recursor-dnssec/test_Protobuf.py
+++ b/regression-tests.recursor-dnssec/test_Protobuf.py
@@ -8,12 +8,15 @@ import threading
 import time
 
 # Python2/3 compatibility hacks
-if sys.version_info[0] == 2:
+try:
+  from queue import Queue
+except ImportError:
   from Queue import Queue
+
+try:
   range = xrange
-else:
-  from queue import Queue
-  range = range  # allow re-export of the builtin name
+except NameError:
+  pass
 
 from recursortests import RecursorTest
 

diff --git a/regression-tests.recursor-dnssec/test_basicNSEC3.py b/regression-tests.recursor-dnssec/test_basicNSEC3.py
index 5185f5f2275eb31d00f933cde1d95c1a1ae28c5b..870ba2e343f13884455e312e6f0cb8b722c6f66d 100644 (file)
--- a/regression-tests.recursor-dnssec/test_basicNSEC3.py
+++ b/regression-tests.recursor-dnssec/test_basicNSEC3.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 from basicDNSSEC import BasicDNSSEC
 import os
 import subprocess
@@ -27,11 +28,11 @@ class basicNSEC3(BasicDNSSEC):
                            'active',
                            'ksk']
 
-        print ' '.join(pdnsutilCmd)
+        print(' '.join(pdnsutilCmd))
         try:
             subprocess.check_output(pdnsutilCmd, stderr=subprocess.STDOUT)
         except subprocess.CalledProcessError as e:
-            print e.output
+            print(e.output)
             raise
 
         params = "1 0 100 AABBCCDDEEFF112233"
@@ -45,9 +46,9 @@ class basicNSEC3(BasicDNSSEC):
                        zone,
                        params]
 
-        print ' '.join(pdnsutilCmd)
+        print(' '.join(pdnsutilCmd))
         try:
             subprocess.check_output(pdnsutilCmd, stderr=subprocess.STDOUT)
         except subprocess.CalledProcessError as e:
-            print e.output
+            print(e.output)
             raise

diff --git a/regression-tests/bulktest-report.py b/regression-tests/bulktest-report.py
index f756cca544ae5d38a6e7b61b8e74cd3f9643765d..1340014db4c0f2b9a1034d5906d0b61937761a34 100755 (executable)
--- a/regression-tests/bulktest-report.py
+++ b/regression-tests/bulktest-report.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import print_function
 import json, sys
 
 runs = json.load(sys.stdin)
@@ -26,6 +27,6 @@ selected.sort()
 names.discard('tag')
 
 fmt=''.join('%%%ds' % max(15, i+4) for i in [3]+map(len, sorted(names)))
-print fmt % tuple(['tag']+sorted(names))
+print(fmt % tuple(['tag']+sorted(names)))
 for tag, stats in selected:
-       print fmt % tuple([tag] + [stats.get(s) for s in sorted(names)])
+       print(fmt % tuple([tag] + [stats.get(s) for s in sorted(names)]))

diff --git a/regression-tests/bulktest-to-json.py b/regression-tests/bulktest-to-json.py
index 1084d173c90d39db781340c193bfc27301a6745f..27a6b1454c4c5db8bf6a4183eb5db3f96d1b584e 100755 (executable)
--- a/regression-tests/bulktest-to-json.py
+++ b/regression-tests/bulktest-to-json.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python2
+from __future__ import print_function
 import glob, json
 
 varnames = set()
@@ -24,4 +25,4 @@ for fname in glob.glob('testresults-*.xml'):
 # print varnames
 # print statnames
 
-print json.dumps(runs)
+print(json.dumps(runs))