added compatibility module (passlib.utils.compat)

exports specialized range & map aliases, and some dict helpers

* all dict.iteritems() calls replaced with compat.iteritems(dict)
* all xrange() calls replaced with compat.irange()
* all range() calls replaced with compat.trange() and compat.lrange() as appropriate
* all map() calls replaced with compat.lmap()

4 files changed, 9 insertions, 6 deletions

diff --git a/passlib/tests/genconfig.py b/passlib/tests/genconfig.py
index 0abdaab..e544a7d 100644
--- a/passlib/tests/genconfig.py
+++ b/passlib/tests/genconfig.py
@@ -15,6 +15,7 @@ import time
 import sys
 #site
 #pkg
+from passlib.utils.compat import iteritems
 from passlib.registry import get_crypt_handler
 #local
 log = logging.getLogger(__name__)
@@ -76,7 +77,7 @@ class HashTimer(object):
         #
         self.samples = samples
         self.cache = {}
-        self.srange = range(samples)
+        self.srange = trange(samples)
 
     def time_encrypt(self, rounds):
         "check how long encryption for a given number of rounds will take"
@@ -121,7 +122,7 @@ class HashTimer(object):
         #check if useful lower & upper bounds already exist in cache
         #
         lower = upper = None
-        for rounds, delta in self.cache.iteritems():
+        for rounds, delta in iteritems(self.cache.iteritems):
             if delta < target:
                 if lower is None or rounds > lower:
                     lower = rounds
@@ -203,7 +204,7 @@ class HashTimer(object):
         if not cache:
             raise RuntimeError("should not be called until cache populated by find_rounds()")
         get_rps = self.get_rps
-        rps = sum(r*get_rps(r,d) for r,d in cache.iteritems())/sum(cache)
+        rps = sum(r*get_rps(r,d) for r,d in iteritems(cache))/sum(cache)
         if rps > 1000: #for almost all cases, we'd return integer
             rps = int(rps)
         return rps
diff --git a/passlib/tests/test_ext_django.py b/passlib/tests/test_ext_django.py
index 95ee927..cd53b6f 100644
--- a/passlib/tests/test_ext_django.py
+++ b/passlib/tests/test_ext_django.py
@@ -16,6 +16,7 @@ from passlib.hash import sha256_crypt
 from passlib.tests.utils import TestCase, unittest, ut_version, catch_warnings
 import passlib.tests.test_drivers as td
 from passlib.utils import Undef
+from passlib.utils.compat import iteritems
 from passlib.registry import get_crypt_handler
 #module
 
@@ -53,7 +54,7 @@ if has_django:
             settings.configure()
 
 def update_settings(**kwds):
-    for k,v in kwds.iteritems():
+    for k,v in iteritems(kwds):
         if v is Undef:
             if hasattr(settings, k):
                 if has_django0:
diff --git a/passlib/tests/test_utils.py b/passlib/tests/test_utils.py
index 6c19679..b5fe81a 100644
--- a/passlib/tests/test_utils.py
+++ b/passlib/tests/test_utils.py
@@ -200,7 +200,7 @@ class MiscTest(TestCase):
         # NOTE: below code was used to generate stats for analysis
         ##from math import log as logb
         ##import timeit
-        ##multipliers = [ 1<<s for s in range(9)]
+        ##multipliers = [ 1<<s for s in irange(9)]
         ##correct =   u"abcdefgh"*(1<<4)
         ##incorrect = u"abcdxfgh"
         ##print
diff --git a/passlib/tests/utils.py b/passlib/tests/utils.py
index 20c95bf..42706d3 100644
--- a/passlib/tests/utils.py
+++ b/passlib/tests/utils.py
@@ -37,6 +37,7 @@ from passlib import registry, utils
 from passlib.utils import classproperty, handlers as uh, \
         has_rounds_info, has_salt_info, MissingBackendError, \
         rounds_cost_values, b, bytes, native_str, NoneType
+from passlib.utils.compat import iteritems
 #local
 __all__ = [
     #util funcs
@@ -662,7 +663,7 @@ class HandlerCase(TestCase):
 
         #check optional aliases list
         if cls.ident_aliases:
-            for alias, ident in cls.ident_aliases.iteritems():
+            for alias, ident in iteritems(cls.ident_aliases):
                 self.assertIsInstance(alias, unicode,
                                       "cls.ident_aliases keys must be unicode:") #XXX: allow ints?
                 self.assertIsInstance(ident, unicode,