diff options
| author | Jannis Leidel <jannis@leidel.info> | 2011-12-25 12:47:13 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2011-12-25 12:47:13 +0000 |
| commit | ff1f423d29f431e732978ac44d2ad9d5a8917d17 (patch) | |
| tree | 5c23293a626ce1cc461d4a4884d266ed0812bb24 | |
| parent | 4403ce10b75b4b399064eccb960f9f38c796431d (diff) | |
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
| -rw-r--r-- | django/utils/archive.py | 4 | ||||
| -rw-r--r-- | tests/regressiontests/utils/crypto.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/django/utils/archive.py b/django/utils/archive.py index ea948fe44f..9c2d4ac01b 100644 --- a/django/utils/archive.py +++ b/django/utils/archive.py @@ -141,7 +141,7 @@ class TarArchive(BaseArchive): name = self.split_leading_dir(name)[1] filename = os.path.join(to_path, name) if member.isdir(): - if not os.path.exists(filename): + if filename and not os.path.exists(filename): os.makedirs(filename) else: try: @@ -153,7 +153,7 @@ class TarArchive(BaseArchive): (name, member.name, sys.exc_info()[1])) else: dirname = os.path.dirname(filename) - if not os.path.exists(dirname): + if dirname and not os.path.exists(dirname): os.makedirs(dirname) with open(filename, 'wb') as outfile: shutil.copyfileobj(extracted, outfile) 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) |