From ff1f423d29f431e732978ac44d2ad9d5a8917d17 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Sun, 25 Dec 2011 12:47:13 +0000 Subject: Fixed a few tests to run on Python 2.5. Thanks, Florian Apolloner. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17273 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/utils/crypto.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/regressiontests/utils/crypto.py b/tests/regressiontests/utils/crypto.py index f025ffa790..5c861c6357 100644 --- a/tests/regressiontests/utils/crypto.py +++ b/tests/regressiontests/utils/crypto.py @@ -126,8 +126,8 @@ class TestUtilsCryptoPBKDF2(unittest.TestCase): times as long as running with 1 iteration. """ n1, n2 = 100, 10000 - elapsed = lambda f: timeit.timeit(f, number=1) - t1 = elapsed(lambda: pbkdf2("password", "salt", iterations=n1)) - t2 = elapsed(lambda: pbkdf2("password", "salt", iterations=n2)) + elapsed = lambda f: timeit.Timer(f, 'from django.utils.crypto import pbkdf2').timeit(number=1) + t1 = elapsed('pbkdf2("password", "salt", iterations=%d)' % n1) + t2 = elapsed('pbkdf2("password", "salt", iterations=%d)' % n2) measured_scale_exponent = math.log(t2 / t1, n2 / n1) self.assertLess(measured_scale_exponent, 1.1) -- cgit v1.3