cleanup old python compat -- removed iteritems() wrapper

7 files changed, 19 insertions, 23 deletions

diff --git a/passlib/context.py b/passlib/context.py
index 9fcf130..6576cba 100644
--- a/passlib/context.py
+++ b/passlib/context.py
@@ -17,7 +17,7 @@ from passlib.utils import (handlers as uh, to_bytes,
                            as_bool, timer, rng, getrandstr,
                            )
 from passlib.utils.binary import BASE64_CHARS
-from passlib.utils.compat import (iteritems, num_types,
+from passlib.utils.compat import (num_types,
                                   unicode, SafeConfigParser,
                                   NativeStringIO, BytesIO,
                                   unicode_or_bytes_types, native_string_types,
@@ -182,7 +182,7 @@ class _CryptConfig(object):
         categories = set()
 
         # load source config into internal storage
-        for (cat, scheme, key), value in iteritems(source):
+        for (cat, scheme, key), value in source.items():
             categories.add(cat)
             explicit_scheme = scheme
             if not cat and not scheme and key in _global_settings:
@@ -984,8 +984,7 @@ class CryptContext(object):
         #-----------------------------------------------------------
         if parse_keys:
             parse = self._parse_config_key
-            source = dict((parse(key), value)
-                          for key, value in iteritems(source))
+            source = dict((parse(key), value) for key, value in source.items())
         if update and self._config is not None:
             # if updating, do nothing if source is empty,
             if not source:
@@ -1073,8 +1072,7 @@ class CryptContext(object):
     ##        return
     ##
     ##    def strip_items(target, filter):
-    ##        keys = [key for key,value in iteritems(target)
-    ##                if filter(key,value)]
+    ##        keys = [key for key,value in target.items() if filter(key,value)]
     ##        for key in keys:
     ##            del target[key]
     ##
@@ -1099,7 +1097,7 @@ class CryptContext(object):
     ##    strip_items(deprecated, lambda k,v: k and v==cur)
     ##
     ##    # remove redundant category options.
-    ##    for scheme, config in iteritems(scheme_options):
+    ##    for scheme, config in scheme_options.items():
     ##        if None in config:
     ##            cur = config[None]
     ##            strip_items(config, lambda k,v: k and v==cur)
diff --git a/passlib/ext/django/utils.py b/passlib/ext/django/utils.py
index 626e48c..1d71032 100644
--- a/passlib/ext/django/utils.py
+++ b/passlib/ext/django/utils.py
@@ -19,7 +19,7 @@ except ImportError:
 from passlib import exc, registry
 from passlib.context import CryptContext
 from passlib.exc import PasslibRuntimeWarning
-from passlib.utils.compat import get_method_function, iteritems, OrderedDict, unicode
+from passlib.utils.compat import get_method_function, OrderedDict, unicode
 from passlib.utils.decor import memoized_property
 # local
 __all__ = [
@@ -955,7 +955,7 @@ class _PasslibHasherWrapper(object):
         ]
         if hasattr(handler, "parsehash"):
             kwds = handler.parsehash(encoded, sanitize=mask_hash)
-            for key, value in iteritems(kwds):
+            for key, value in kwds.items():
                 key = self._translate_kwds.get(key, key)
                 items.append((_(key), value))
         return OrderedDict(items)
@@ -1122,7 +1122,7 @@ class _PatchManager(object):
     def check_all(self, strict=False):
         """run sanity check on all keys, issue warning if out of sync"""
         same = self._is_same_value
-        for path, (orig, expected) in iteritems(self._state):
+        for path, (orig, expected) in self._state.items():
             if same(self._get_path(path), expected):
                 continue
             msg = "another library has patched resource: %r" % path
@@ -1176,7 +1176,7 @@ class _PatchManager(object):
 
     ##def patch_many(self, **kwds):
     ##    "override specified resources with new values"
-    ##    for path, value in iteritems(kwds):
+    ##    for path, value in kwds.items():
     ##        self.patch(path, value)
 
     def monkeypatch(self, parent, name=None, enable=True, wrap=False):
diff --git a/passlib/handlers/fshp.py b/passlib/handlers/fshp.py
index 62e0fad..ecd75b9 100644
--- a/passlib/handlers/fshp.py
+++ b/passlib/handlers/fshp.py
@@ -12,7 +12,7 @@ import logging; log = logging.getLogger(__name__)
 # pkg
 from passlib.utils import to_unicode
 import passlib.utils.handlers as uh
-from passlib.utils.compat import bascii_to_str, iteritems, u, unicode
+from passlib.utils.compat import bascii_to_str, u, unicode
 from passlib.crypto.digest import pbkdf1
 # local
 __all__ = [
@@ -92,7 +92,7 @@ class fshp(uh.HasRounds, uh.HasRawSalt, uh.HasRawChecksum, uh.GenericHandler):
         }
     _variant_aliases = dict(
         [(unicode(k),k) for k in _variant_info] +
-        [(v[0],k) for k,v in iteritems(_variant_info)]
+        [(v[0],k) for k,v in _variant_info.items()]
         )
 
     #===================================================================
diff --git a/passlib/handlers/scram.py b/passlib/handlers/scram.py
index 8122f2b..dbf8b88 100644
--- a/passlib/handlers/scram.py
+++ b/passlib/handlers/scram.py
@@ -8,7 +8,7 @@ import logging; log = logging.getLogger(__name__)
 # pkg
 from passlib.utils import consteq, saslprep, to_native_str, splitcomma
 from passlib.utils.binary import ab64_decode, ab64_encode
-from passlib.utils.compat import bascii_to_str, iteritems, native_string_types
+from passlib.utils.compat import bascii_to_str, native_string_types
 from passlib.crypto.digest import pbkdf2_hmac, norm_hash_name
 import passlib.utils.handlers as uh
 # local
@@ -318,7 +318,7 @@ class scram(uh.HasRounds, uh.HasRawSalt, uh.HasRawChecksum, uh.GenericHandler):
     def _norm_checksum(self, checksum, relaxed=False):
         if not isinstance(checksum, dict):
             raise uh.exc.ExpectedTypeError(checksum, "dict", "checksum")
-        for alg, digest in iteritems(checksum):
+        for alg, digest in checksum.items():
             if alg != norm_hash_name(alg, 'iana'):
                 raise ValueError("malformed algorithm name in scram hash: %r" %
                                  (alg,))
@@ -390,7 +390,7 @@ class scram(uh.HasRounds, uh.HasRawSalt, uh.HasRawChecksum, uh.GenericHandler):
         # check entire hash for consistency.
         if full:
             correct = failed = False
-            for alg, digest in iteritems(chkmap):
+            for alg, digest in chkmap.items():
                 other = self._calc_checksum(secret, alg)
                 # NOTE: could do this length check in norm_algs(),
                 # but don't need to be that strict, and want to be able
diff --git a/passlib/tests/test_ext_django.py b/passlib/tests/test_ext_django.py
index 8865379..2260d66 100644
--- a/passlib/tests/test_ext_django.py
+++ b/passlib/tests/test_ext_django.py
@@ -14,7 +14,7 @@ from passlib.context import CryptContext
 from passlib.ext.django.utils import (
     DJANGO_VERSION, MIN_DJANGO_VERSION, DjangoTranslator,
 )
-from passlib.utils.compat import iteritems, get_method_function
+from passlib.utils.compat import get_method_function
 from passlib.utils.decor import memoized_property
 # tests
 from passlib.tests.utils import TestCase, TEST_MODE, handler_derived_from
@@ -68,7 +68,7 @@ UNSET = object()
 
 def update_settings(**kwds):
     """helper to update django settings from kwds"""
-    for k,v in iteritems(kwds):
+    for k,v in kwds.items():
         if v is UNSET:
             if hasattr(settings, k):
                 delattr(settings, k)
diff --git a/passlib/tests/utils.py b/passlib/tests/utils.py
index 6fad419..be46bdd 100644
--- a/passlib/tests/utils.py
+++ b/passlib/tests/utils.py
@@ -28,7 +28,7 @@ import passlib.registry as registry
 from passlib.utils import has_rounds_info, has_salt_info, rounds_cost_values, \
                           rng as sys_rng, getrandstr, is_ascii_safe, to_native_str, \
                           repeat_string, tick, batch
-from passlib.utils.compat import iteritems, unicode
+from passlib.utils.compat import unicode
 from passlib.utils.decor import classproperty
 import passlib.utils.handlers as uh
 # local
@@ -1954,7 +1954,7 @@ class HandlerCase(TestCase):
 
         # check optional aliases list
         if cls.ident_aliases:
-            for alias, ident in iteritems(cls.ident_aliases):
+            for alias, ident in cls.ident_aliases.items():
                 self.assertIsInstance(alias, unicode,
                                       "cls.ident_aliases keys must be unicode:") # XXX: allow ints?
                 self.assertIsInstance(ident, unicode,
diff --git a/passlib/utils/compat/__init__.py b/passlib/utils/compat/__init__.py
index cd8f8f7..679c680 100644
--- a/passlib/utils/compat/__init__.py
+++ b/passlib/utils/compat/__init__.py
@@ -61,7 +61,7 @@ __all__ = [
     'iter_byte_values',
 
     # iteration helpers
-    'iteritems', 'itervalues',
+    'itervalues',
     'next',
 
     # collections
@@ -175,8 +175,6 @@ num_types = (int, float)
 #=============================================================================
 if True:  # legacy PY3 indent
 
-    def iteritems(d):
-        return d.items()
     def itervalues(d):
         return d.values()