cleanup old python compat -- removed all "from __future__" imports

39 files changed, 0 insertions, 40 deletions

diff --git a/admin/bench_pbkdf2.py b/admin/bench_pbkdf2.py
index 53a4d47..4492f82 100644
--- a/admin/bench_pbkdf2.py
+++ b/admin/bench_pbkdf2.py
@@ -4,8 +4,6 @@ helper script to benchmark pbkdf2 implementations/backends
 #=============================================================================
 # init script env
 #=============================================================================
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 # make sure passlib source dir is first in import path
 import os, sys
 os.chdir(os.path.abspath(os.path.join(__file__, *[".."]*2)))
diff --git a/admin/benchmarks.py b/admin/benchmarks.py
index 77212a4..71c7b56 100644
--- a/admin/benchmarks.py
+++ b/admin/benchmarks.py
@@ -6,7 +6,6 @@ parsing was being sped up. it could definitely be improved.
 #=============================================================================
 # init script env
 #=============================================================================
-from __future__ import absolute_import, division, print_function
 import re
 import os, sys
 root = os.path.join(os.path.dirname(__file__), os.path.pardir)
diff --git a/admin/plot_verify_timing.py b/admin/plot_verify_timing.py
index 3f6255f..b34400b 100644
--- a/admin/plot_verify_timing.py
+++ b/admin/plot_verify_timing.py
@@ -3,7 +3,6 @@
 small helper script used to compare timing of verify() & dummy_verify()
 """
 # core
-from __future__ import absolute_import, division, print_function, unicode_literals
 from argparse import ArgumentParser
 import sys
 from timeit import default_timer as tick
diff --git a/admin/regen.py b/admin/regen.py
index dc4b2fb..a461e3e 100644
--- a/admin/regen.py
+++ b/admin/regen.py
@@ -5,7 +5,6 @@ helper script which rebuilds all autogenerated bits of code w/in passlib.
 # imports
 #=============================================================================
 # core
-from __future__ import absolute_import, division, print_function
 import datetime
 import re
 import os
diff --git a/choose_rounds.py b/choose_rounds.py
index 80d8609..2949950 100644
--- a/choose_rounds.py
+++ b/choose_rounds.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import division, print_function
 # core
 import math
 import logging; log = logging.getLogger(__name__)
diff --git a/passlib/_setup/stamp.py b/passlib/_setup/stamp.py
index f14c0d4..ebf6a11 100644
--- a/passlib/_setup/stamp.py
+++ b/passlib/_setup/stamp.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import absolute_import, division, print_function
 # core
 import datetime
 from distutils.dist import Distribution
diff --git a/passlib/apache.py b/passlib/apache.py
index 7187cc3..02c1c45 100644
--- a/passlib/apache.py
+++ b/passlib/apache.py
@@ -3,7 +3,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement
 # core
 import logging; log = logging.getLogger(__name__)
 import os
diff --git a/passlib/context.py b/passlib/context.py
index 66cce79..abbd105 100644
--- a/passlib/context.py
+++ b/passlib/context.py
@@ -3,7 +3,6 @@
 # imports
 #=============================================================================
 # core
-from __future__ import absolute_import, division, print_function
 import re
 import logging; log = logging.getLogger(__name__)
 import threading
diff --git a/passlib/crypto/digest.py b/passlib/crypto/digest.py
index 0a9b77a..b0c6e26 100644
--- a/passlib/crypto/digest.py
+++ b/passlib/crypto/digest.py
@@ -5,7 +5,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import division
 # core
 import hashlib
 import logging; log = logging.getLogger(__name__)
diff --git a/passlib/crypto/scrypt/__init__.py b/passlib/crypto/scrypt/__init__.py
index c71873a..60f0cbe 100644
--- a/passlib/crypto/scrypt/__init__.py
+++ b/passlib/crypto/scrypt/__init__.py
@@ -6,7 +6,6 @@ XXX: add this module to public docs?
 #==========================================================================
 # imports
 #==========================================================================
-from __future__ import absolute_import
 # core
 import logging; log = logging.getLogger(__name__)
 from warnings import warn
diff --git a/passlib/handlers/argon2.py b/passlib/handlers/argon2.py
index 7373fbc..d35d5dd 100644
--- a/passlib/handlers/argon2.py
+++ b/passlib/handlers/argon2.py
@@ -15,7 +15,6 @@ References
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement, absolute_import
 # core
 import logging
 log = logging.getLogger(__name__)
diff --git a/passlib/handlers/bcrypt.py b/passlib/handlers/bcrypt.py
index b6692a0..7283f78 100644
--- a/passlib/handlers/bcrypt.py
+++ b/passlib/handlers/bcrypt.py
@@ -10,7 +10,6 @@ TODO:
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement, absolute_import
 # core
 from base64 import b64encode
 from hashlib import sha256
diff --git a/passlib/handlers/scrypt.py b/passlib/handlers/scrypt.py
index ff59433..57b921e 100644
--- a/passlib/handlers/scrypt.py
+++ b/passlib/handlers/scrypt.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement, absolute_import
 # core
 import logging; log = logging.getLogger(__name__)
 # site
diff --git a/passlib/pwd.py b/passlib/pwd.py
index 27ed228..be22e91 100644
--- a/passlib/pwd.py
+++ b/passlib/pwd.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import absolute_import, division, print_function, unicode_literals
 # core
 import codecs
 from collections import defaultdict
diff --git a/passlib/tests/backports.py b/passlib/tests/backports.py
index 5058cec..8187741 100644
--- a/passlib/tests/backports.py
+++ b/passlib/tests/backports.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement
 # core
 import logging; log = logging.getLogger(__name__)
 import re
diff --git a/passlib/tests/test_apache.py b/passlib/tests/test_apache.py
index 7f8afa5..f37c727 100644
--- a/passlib/tests/test_apache.py
+++ b/passlib/tests/test_apache.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement
 # core
 from logging import getLogger
 import os
diff --git a/passlib/tests/test_apps.py b/passlib/tests/test_apps.py
index 167437f..3a2b0d3 100644
--- a/passlib/tests/test_apps.py
+++ b/passlib/tests/test_apps.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement
 # core
 import logging; log = logging.getLogger(__name__)
 # site
diff --git a/passlib/tests/test_context.py b/passlib/tests/test_context.py
index 2421ef4..56cddd7 100644
--- a/passlib/tests/test_context.py
+++ b/passlib/tests/test_context.py
@@ -3,7 +3,6 @@
 # imports
 #=============================================================================
 # core
-from __future__ import with_statement
 from passlib.utils.compat import PY3
 if PY3:
     from configparser import NoSectionError
diff --git a/passlib/tests/test_crypto_builtin_md4.py b/passlib/tests/test_crypto_builtin_md4.py
index 8cdf39a..2ee76b5 100644
--- a/passlib/tests/test_crypto_builtin_md4.py
+++ b/passlib/tests/test_crypto_builtin_md4.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement, division
 # core
 from binascii import hexlify
 import hashlib
diff --git a/passlib/tests/test_crypto_des.py b/passlib/tests/test_crypto_des.py
index ab31845..20f3681 100644
--- a/passlib/tests/test_crypto_des.py
+++ b/passlib/tests/test_crypto_des.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement, division
 # core
 from functools import partial
 # site
diff --git a/passlib/tests/test_crypto_digest.py b/passlib/tests/test_crypto_digest.py
index 9f3a5ff..4b33323 100644
--- a/passlib/tests/test_crypto_digest.py
+++ b/passlib/tests/test_crypto_digest.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement, division
 # core
 from binascii import hexlify
 import hashlib
diff --git a/passlib/tests/test_ext_django.py b/passlib/tests/test_ext_django.py
index 6cef595..8865379 100644
--- a/passlib/tests/test_ext_django.py
+++ b/passlib/tests/test_ext_django.py
@@ -3,7 +3,6 @@
 # imports
 #=============================================================================
 # core
-from __future__ import absolute_import, division, print_function
 import logging; log = logging.getLogger(__name__)
 import sys
 import re
diff --git a/passlib/tests/test_ext_django_source.py b/passlib/tests/test_ext_django_source.py
index 4b42e59..d39c8e4 100644
--- a/passlib/tests/test_ext_django_source.py
+++ b/passlib/tests/test_ext_django_source.py
@@ -4,7 +4,6 @@ test passlib.ext.django against django source tests
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import absolute_import, division, print_function
 # core
 import logging; log = logging.getLogger(__name__)
 # site
diff --git a/passlib/tests/test_handlers.py b/passlib/tests/test_handlers.py
index 4f6541c..cffa425 100644
--- a/passlib/tests/test_handlers.py
+++ b/passlib/tests/test_handlers.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement
 # core
 import logging; log = logging.getLogger(__name__)
 import os
diff --git a/passlib/tests/test_handlers_bcrypt.py b/passlib/tests/test_handlers_bcrypt.py
index 64fc8bf..156604d 100644
--- a/passlib/tests/test_handlers_bcrypt.py
+++ b/passlib/tests/test_handlers_bcrypt.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement
 # core
 import logging; log = logging.getLogger(__name__)
 import os
diff --git a/passlib/tests/test_handlers_cisco.py b/passlib/tests/test_handlers_cisco.py
index f2c990e..bc23c52 100644
--- a/passlib/tests/test_handlers_cisco.py
+++ b/passlib/tests/test_handlers_cisco.py
@@ -4,7 +4,6 @@ passlib.tests.test_handlers_cisco - tests for Cisco-specific algorithms
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import absolute_import, division, print_function
 # core
 import logging
 log = logging.getLogger(__name__)
diff --git a/passlib/tests/test_handlers_django.py b/passlib/tests/test_handlers_django.py
index 3ea71cc..02d5e55 100644
--- a/passlib/tests/test_handlers_django.py
+++ b/passlib/tests/test_handlers_django.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement
 # core
 import logging; log = logging.getLogger(__name__)
 import re
diff --git a/passlib/tests/test_hosts.py b/passlib/tests/test_hosts.py
index cbf93ab..b8e6e5e 100644
--- a/passlib/tests/test_hosts.py
+++ b/passlib/tests/test_hosts.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement
 # core
 import logging; log = logging.getLogger(__name__)
 # site
diff --git a/passlib/tests/test_registry.py b/passlib/tests/test_registry.py
index 8cec48d..2e00977 100644
--- a/passlib/tests/test_registry.py
+++ b/passlib/tests/test_registry.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement
 # core
 from logging import getLogger
 import warnings
diff --git a/passlib/tests/test_utils.py b/passlib/tests/test_utils.py
index 36fcf43..83630b0 100644
--- a/passlib/tests/test_utils.py
+++ b/passlib/tests/test_utils.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement
 # core
 from functools import partial
 import warnings
diff --git a/passlib/tests/test_utils_handlers.py b/passlib/tests/test_utils_handlers.py
index 967dbf4..0a98978 100644
--- a/passlib/tests/test_utils_handlers.py
+++ b/passlib/tests/test_utils_handlers.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement
 # core
 import re
 import hashlib
diff --git a/passlib/tests/test_utils_pbkdf2.py b/passlib/tests/test_utils_pbkdf2.py
index 33d195a..f87726d 100644
--- a/passlib/tests/test_utils_pbkdf2.py
+++ b/passlib/tests/test_utils_pbkdf2.py
@@ -12,7 +12,6 @@ passlib.tests -- tests for passlib.utils.pbkdf2
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement
 # core
 import hashlib
 import warnings
diff --git a/passlib/tests/tox_support.py b/passlib/tests/tox_support.py
index 2ad42e4..d0dcd4e 100644
--- a/passlib/tests/tox_support.py
+++ b/passlib/tests/tox_support.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # init script env
 #=============================================================================
-from __future__ import absolute_import, division, print_function
 import os, sys
 root_dir = os.path.join(os.path.dirname(__file__), os.pardir, os.pardir)
 sys.path.insert(0, root_dir)
diff --git a/passlib/tests/utils.py b/passlib/tests/utils.py
index 6ab89f0..9c1b218 100644
--- a/passlib/tests/utils.py
+++ b/passlib/tests/utils.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement
 # core
 from binascii import unhexlify
 import contextlib
diff --git a/passlib/totp.py b/passlib/totp.py
index 14573e3..0462088 100644
--- a/passlib/totp.py
+++ b/passlib/totp.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import absolute_import, division, print_function
 from passlib.utils.compat import PY3
 # core
 import base64
diff --git a/passlib/utils/binary.py b/passlib/utils/binary.py
index 68d0512..101cbe8 100644
--- a/passlib/utils/binary.py
+++ b/passlib/utils/binary.py
@@ -5,7 +5,6 @@ passlib.utils.binary - binary data encoding/decoding/manipulation
 # imports
 #=============================================================================
 # core
-from __future__ import absolute_import, division, print_function
 from base64 import (
     b64encode,
     b64decode,
diff --git a/passlib/utils/decor.py b/passlib/utils/decor.py
index 9041d5d..392e569 100644
--- a/passlib/utils/decor.py
+++ b/passlib/utils/decor.py
@@ -5,7 +5,6 @@ passlib.utils.decor -- helper decorators & properties
 # imports
 #=============================================================================
 # core
-from __future__ import absolute_import, division, print_function
 import logging
 log = logging.getLogger(__name__)
 from functools import wraps, update_wrapper
diff --git a/passlib/utils/handlers.py b/passlib/utils/handlers.py
index 748d27d..6115d11 100644
--- a/passlib/utils/handlers.py
+++ b/passlib/utils/handlers.py
@@ -2,7 +2,6 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement
 # core
 import inspect
 import logging; log = logging.getLogger(__name__)
diff --git a/passlib/utils/pbkdf2.py b/passlib/utils/pbkdf2.py
index ad0a66e..e490af5 100644
--- a/passlib/utils/pbkdf2.py
+++ b/passlib/utils/pbkdf2.py
@@ -6,7 +6,6 @@ maybe rename to "kdf" since it's getting more key derivation functions added.
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import division
 # core
 import logging; log = logging.getLogger(__name__)
 # site