From e5c12f6701075fe9210c67cf472f910d745cb73a Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Tue, 1 Sep 2015 11:06:41 -0400 Subject: [PATCH] Refs #23613 -- Removed django.utils.checksums per deprecation timeline. --- django/utils/checksums.py | 34 ----------------------------- tests/utils_tests/test_checksums.py | 33 ---------------------------- 2 files changed, 67 deletions(-) delete mode 100644 django/utils/checksums.py delete mode 100644 tests/utils_tests/test_checksums.py diff --git a/django/utils/checksums.py b/django/utils/checksums.py deleted file mode 100644 index c74631acb2..0000000000 --- a/django/utils/checksums.py +++ /dev/null @@ -1,34 +0,0 @@ -""" -Common checksum routines. -""" - -__all__ = ['luhn'] - -import warnings - -from django.utils import six -from django.utils.deprecation import RemovedInDjango110Warning - -warnings.warn( - "django.utils.checksums will be removed in Django 1.10. The " - "luhn() function is now included in django-localflavor 1.1+.", - RemovedInDjango110Warning -) - -LUHN_ODD_LOOKUP = (0, 2, 4, 6, 8, 1, 3, 5, 7, 9) # sum_of_digits(index * 2) - - -def luhn(candidate): - """ - Checks a candidate number for validity according to the Luhn - algorithm (used in validation of, for example, credit cards). - Both numeric and string candidates are accepted. - """ - if not isinstance(candidate, six.string_types): - candidate = str(candidate) - try: - evens = sum(int(c) for c in candidate[-1::-2]) - odds = sum(LUHN_ODD_LOOKUP[int(c)] for c in candidate[-2::-2]) - return ((evens + odds) % 10 == 0) - except ValueError: # Raised if an int conversion fails - return False diff --git a/tests/utils_tests/test_checksums.py b/tests/utils_tests/test_checksums.py deleted file mode 100644 index c3888ca26b..0000000000 --- a/tests/utils_tests/test_checksums.py +++ /dev/null @@ -1,33 +0,0 @@ -import unittest - -from django.test import ignore_warnings -from django.utils.deprecation import RemovedInDjango110Warning - - -class TestUtilsChecksums(unittest.TestCase): - - def check_output(self, function, value, output=None): - """ - Check that function(value) equals output. If output is None, - check that function(value) equals value. - """ - if output is None: - output = value - self.assertEqual(function(value), output) - - @ignore_warnings(category=RemovedInDjango110Warning) - def test_luhn(self): - from django.utils import checksums - f = checksums.luhn - items = ( - (4111111111111111, True), ('4111111111111111', True), - (4222222222222, True), (378734493671000, True), - (5424000000000015, True), (5555555555554444, True), - (1008, True), ('0000001008', True), ('000000001008', True), - (4012888888881881, True), (1234567890123456789012345678909, True), - (4111111111211111, False), (42222222222224, False), - (100, False), ('100', False), ('0000100', False), - ('abc', False), (None, False), (object(), False), - ) - for value, output in items: - self.check_output(f, value, output)