xrange compatibility optimization for Python 2

rsa/_compat.py

@@ -52,6 +52,14 @@ def byte_literal(s):
     def byte_literal(s):
         return s
 
+# Range generator.
+try:
+    # < Python3
+    range = xrange
+except NameError:
+    # Python3
+    range = range
+
 # ``long`` is no more. Do type detection using this instead.
 try:
     integer_types = (int, long)

rsa/key.py

@@ -35,7 +35,7 @@
 
 import logging
 
-from rsa._compat import b
+from rsa._compat import b, range
 import rsa.prime
 import rsa.pem
 import rsa.common

rsa/parallel.py

@@ -28,6 +28,7 @@
 
 import multiprocessing as mp
 
+from rsa._compat import range
 import rsa.prime
 import rsa.randnum
 

rsa/pem.py

@@ -17,7 +17,8 @@
 """Functions that load and write PEM-encoded files."""
 
 import base64
-from rsa._compat import b, is_bytes
+
+from rsa._compat import b, is_bytes, range
 
 
 def _markers(pem_marker):

rsa/pkcs1.py

@@ -31,7 +31,7 @@
 import hashlib
 import os
 
-from rsa._compat import b
+from rsa._compat import b, range
 from rsa import common, transform, core
 
 # ASN.1 codes that describe the hash algorithm used.

rsa/prime.py

@@ -20,6 +20,7 @@
 Roberto Tamassia, 2002.
 """
 
+from rsa._compat import range
 import rsa.common
 import rsa.randnum
 

rsa/transform.py

@@ -23,6 +23,7 @@
 
 import binascii
 from struct import pack
+
 from rsa import common
 from rsa._compat import is_integer, b, byte, get_word_alignment, ZERO_BYTE, EMPTY_BYTE
 

tests/test_compat.py

@@ -18,7 +18,7 @@
 import struct
 import sys
 
-from rsa._compat import is_bytes, byte, b
+from rsa._compat import b, byte, is_bytes, range
 
 
 class TestByte(unittest.TestCase):

tests/test_prime.py

@@ -18,6 +18,7 @@
 
 import unittest
 
+from rsa._compat import range
 import rsa.prime
 import rsa.randnum