Fix print() and xrange() for Python 3 (#5590)

certbot · Mar 14, 2018 · e405aaa · e405aaa
1 parent 9ea14d2
commit e405aaa
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/certbot-compatibility-test/certbot_compatibility_test/test_driver.py b/certbot-compatibility-test/certbot_compatibility_test/test_driver.py
@@ -10,6 +10,8 @@
 
 import OpenSSL
 
+from six.moves import xrange  # pylint: disable=import-error,redefined-builtin
+
 from acme import challenges
 from acme import crypto_util
 from acme import messages

diff --git a/certbot-compatibility-test/certbot_compatibility_test/validator.py b/certbot-compatibility-test/certbot_compatibility_test/validator.py
@@ -5,6 +5,7 @@
 import zope.interface
 
 import six
+from six.moves import xrange  # pylint: disable=import-error,redefined-builtin
 
 from acme import crypto_util
 from acme import errors as acme_errors

diff --git a/certbot-compatibility-test/nginx/roundtrip.py b/certbot-compatibility-test/nginx/roundtrip.py
@@ -8,7 +8,7 @@
 def roundtrip(stuff):
     success = True
     for t in stuff:
-        print t
+        print(t)
         if not os.path.isfile(t):
             continue
         with open(t, "r") as f:

diff --git a/letsencrypt-auto-source/tests/auto_test.py b/letsencrypt-auto-source/tests/auto_test.py
@@ -18,6 +18,7 @@
 from unittest import TestCase
 
 from pytest import mark
+from six.moves import xrange  # pylint: disable=redefined-builtin
 
 
 @mark.skip

diff --git a/tools/simple_http_server.py b/tools/simple_http_server.py
@@ -14,7 +14,7 @@ def serve_forever(port=0):
 
     """
     server = HTTPServer(('', port), SimpleHTTPRequestHandler)
-    print 'Serving HTTP on {0} port {1} ...'.format(*server.server_address)
+    print('Serving HTTP on {0} port {1} ...'.format(*server.server_address))
     sys.stdout.flush()
     server.serve_forever()