diff options
Diffstat (limited to 'passlib/tests')
| -rw-r--r-- | passlib/tests/test_apache.py | 5 | ||||
| -rw-r--r-- | passlib/tests/test_context.py | 4 | ||||
| -rw-r--r-- | passlib/tests/test_handlers.py | 2 | ||||
| -rw-r--r-- | passlib/tests/test_handlers_bcrypt.py | 5 | ||||
| -rw-r--r-- | passlib/tests/test_utils.py | 11 | ||||
| -rw-r--r-- | passlib/tests/utils.py | 10 |
6 files changed, 17 insertions, 20 deletions
diff --git a/passlib/tests/test_apache.py b/passlib/tests/test_apache.py index b380232..fcdbbc6 100644 --- a/passlib/tests/test_apache.py +++ b/passlib/tests/test_apache.py @@ -11,7 +11,6 @@ import subprocess # pkg from passlib import apache, registry from passlib.exc import MissingBackendError -from passlib.utils.compat import irange from passlib.tests.utils import TestCase, get_file, set_file, ensure_mtime_changed from passlib.utils import to_bytes from passlib.utils.handlers import to_unicode_for_identify @@ -242,7 +241,7 @@ class HtpasswdFileTest(TestCase): # users 1..6 of sample_01 run through all the main hash formats, # to make sure they're recognized. - for i in irange(1, 7): + for i in range(1, 7): i = str(i) try: self.assertTrue(ht.check_password("user"+i, "pass"+i)) @@ -590,7 +589,7 @@ class HtdigestFileTest(TestCase): self.assertRaises(TypeError, ht.check_password, 1, 'realm', 'pass5') self.assertRaises(TypeError, ht.check_password, 'user', 1, 'pass5') self.assertIs(ht.check_password("user5", "realm","pass5"), None) - for i in irange(1,5): + for i in range(1, 5): i = str(i) self.assertTrue(ht.check_password("user"+i, "realm", "pass"+i)) self.assertIs(ht.check_password("user"+i, "realm", "pass5"), False) diff --git a/passlib/tests/test_context.py b/passlib/tests/test_context.py index 3459adc..5a82d90 100644 --- a/passlib/tests/test_context.py +++ b/passlib/tests/test_context.py @@ -15,7 +15,7 @@ from passlib import hash from passlib.context import CryptContext, LazyCryptContext from passlib.exc import PasslibConfigWarning, PasslibHashWarning from passlib.utils import tick, to_unicode -from passlib.utils.compat import irange, unicode, str_to_uascii +from passlib.utils.compat import unicode, str_to_uascii import passlib.utils.handlers as uh from passlib.tests.utils import (TestCase, set_file, TICK_RESOLUTION, quicksleep, time_call, handler_derived_from) @@ -1546,7 +1546,7 @@ sha512_crypt__min_rounds = 45000 handler = context.handler(scheme) salt = handler.default_salt_chars[0:1] * handler.max_salt_size seen = set() - for i in irange(300): + for i in range(300): h = context.genconfig(scheme, salt=salt) r = handler.from_string(h).rounds seen.add(r) diff --git a/passlib/tests/test_handlers.py b/passlib/tests/test_handlers.py index 38836fa..757c089 100644 --- a/passlib/tests/test_handlers.py +++ b/passlib/tests/test_handlers.py @@ -11,7 +11,7 @@ import warnings # pkg from passlib import exc, hash from passlib.utils import repeat_string -from passlib.utils.compat import irange, get_method_function +from passlib.utils.compat import range, get_method_function from passlib.tests.utils import TestCase, HandlerCase, skipUnless, \ TEST_MODE, UserHandlerMixin, EncodingHandlerMixin # module diff --git a/passlib/tests/test_handlers_bcrypt.py b/passlib/tests/test_handlers_bcrypt.py index 55d5203..5b70a99 100644 --- a/passlib/tests/test_handlers_bcrypt.py +++ b/passlib/tests/test_handlers_bcrypt.py @@ -11,7 +11,6 @@ import warnings from passlib import hash from passlib.handlers.bcrypt import IDENT_2, IDENT_2X from passlib.utils import repeat_string, to_bytes, is_safe_crypt_input -from passlib.utils.compat import irange from passlib.tests.utils import HandlerCase, TEST_MODE from passlib.tests.test_handlers import UPASS_TABLE # module @@ -365,9 +364,9 @@ class _bcrypt_test(HandlerCase): "unexpectedly malformed hash: %r" % (hash,) self.assertTrue(hash[28] in '.Oeu', "unused bits incorrectly set in hash: %r" % (hash,)) - for i in irange(6): + for i in range(6): check_padding(bcrypt.genconfig()) - for i in irange(3): + for i in range(3): check_padding(bcrypt.using(rounds=bcrypt.min_rounds).hash("bob")) # diff --git a/passlib/tests/test_utils.py b/passlib/tests/test_utils.py index 6790794..39f69bd 100644 --- a/passlib/tests/test_utils.py +++ b/passlib/tests/test_utils.py @@ -9,7 +9,7 @@ import warnings # pkg # module from passlib.utils import is_ascii_safe, to_bytes -from passlib.utils.compat import irange, unicode, join_bytes, PYPY +from passlib.utils.compat import unicode, join_bytes, PYPY from passlib.tests.utils import TestCase, hb, run_with_fixed_seeds #============================================================================= @@ -30,7 +30,6 @@ class MiscTest(TestCase): # test synthentic dir() dir(compat) self.assertTrue('UnicodeIO' in dir(compat)) - self.assertTrue('irange' in dir(compat)) def test_classproperty(self): from passlib.utils.decor import classproperty @@ -322,12 +321,12 @@ 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 irange(9)] + ##multipliers = [ 1<<s for s in range(9)] ##correct = u"abcdefgh"*(1<<4) ##incorrect = u"abcdxfgh" ##print ##first = True - ##for run in irange(1): + ##for run in range(1): ## times = [] ## chars = [] ## for m in multipliers: @@ -879,7 +878,7 @@ class _Base64Test(TestCase): from passlib.utils import getrandbytes, getrandstr rng = self.getRandom() saw_zero = False - for i in irange(500): + for i in range(500): # # test raw -> encode() -> decode() -> raw # @@ -1028,7 +1027,7 @@ class _Base64Test(TestCase): # do random testing. from passlib.utils import getrandstr - for i in irange(100): + for i in range(100): # generate random value, encode, and then decode value = rng.randint(0, upper-1) encoded = encode(value) diff --git a/passlib/tests/utils.py b/passlib/tests/utils.py index e55ce3e..6fad419 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, irange, unicode +from passlib.utils.compat import iteritems, unicode from passlib.utils.decor import classproperty import passlib.utils.handlers as uh # local @@ -282,7 +282,7 @@ def run_with_fixed_seeds(count=128, master_seed=0x243F6A8885A308D3): @wraps(func) def wrapper(*args, **kwds): rng = random.Random(master_seed) - for _ in irange(count): + for _ in range(count): kwds['seed'] = rng.getrandbits(32) func(*args, **kwds) return wrapper @@ -1315,7 +1315,7 @@ class HandlerCase(TestCase): def sampler(func): value1 = func() - for _ in irange(samples): + for _ in range(samples): value2 = func() if value1 != value2: return @@ -1866,7 +1866,7 @@ class HandlerCase(TestCase): handler, subcls, small, medium, large, adj = self._create_using_rounds_helper() def get_effective_range(cls): - seen = set(get_effective_rounds(cls) for _ in irange(1000)) + seen = set(get_effective_rounds(cls) for _ in range(1000)) return min(seen), max(seen) def assert_rounds_range(vary_rounds, lower, upper): @@ -2736,7 +2736,7 @@ class HandlerCase(TestCase): thread.setDaemon(True) thread.start() return thread - threads = [launch(n) for n in irange(thread_count)] + threads = [launch(n) for n in range(thread_count)] # wait until all threads exit timeout = self.max_fuzz_time * thread_count * 4 |