From e00d1b6dc66524bf8d26c608e50e1e442a3bf5d0 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Mon, 24 Dec 2012 23:27:17 +0100 Subject: [PATCH] Removed obsolete compatibility functions for old Pythons. --- django/utils/copycompat.py | 18 ------------------ django/utils/hashcompat.py | 15 --------------- django/utils/itercompat.py | 10 ---------- 3 files changed, 43 deletions(-) delete mode 100644 django/utils/copycompat.py delete mode 100644 django/utils/hashcompat.py diff --git a/django/utils/copycompat.py b/django/utils/copycompat.py deleted file mode 100644 index 6ccf6c3ae5..0000000000 --- a/django/utils/copycompat.py +++ /dev/null @@ -1,18 +0,0 @@ -""" -Fixes Python 2.4's failure to deepcopy unbound functions. -""" - -import copy -import types -import warnings - -warnings.warn("django.utils.copycompat is deprecated; use the native copy module instead", - DeprecationWarning) - -# Monkeypatch copy's deepcopy registry to handle functions correctly. -if (hasattr(copy, '_deepcopy_dispatch') and types.FunctionType not in copy._deepcopy_dispatch): - copy._deepcopy_dispatch[types.FunctionType] = copy._deepcopy_atomic - -# Pose as the copy module now. -del copy, types -from copy import * diff --git a/django/utils/hashcompat.py b/django/utils/hashcompat.py deleted file mode 100644 index 62b1dfd12b..0000000000 --- a/django/utils/hashcompat.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -The md5 and sha modules are deprecated since Python 2.5, replaced by the -hashlib module containing both hash algorithms. Here, we provide a common -interface to the md5 and sha constructors, depending on system version. -""" - -import warnings -warnings.warn("django.utils.hashcompat is deprecated; use hashlib instead", - DeprecationWarning) - -import hashlib -md5_constructor = hashlib.md5 -md5_hmac = md5_constructor -sha_constructor = hashlib.sha1 -sha_hmac = sha_constructor diff --git a/django/utils/itercompat.py b/django/utils/itercompat.py index aa329c152e..fe8f8b9b46 100644 --- a/django/utils/itercompat.py +++ b/django/utils/itercompat.py @@ -21,13 +21,3 @@ def product(*args, **kwds): warnings.warn("django.utils.itercompat.product is deprecated; use the native version instead", PendingDeprecationWarning) return itertools.product(*args, **kwds) - -def all(iterable): - warnings.warn("django.utils.itercompat.all is deprecated; use the native version instead", - DeprecationWarning) - return builtins.all(iterable) - -def any(iterable): - warnings.warn("django.utils.itercompat.any is deprecated; use the native version instead", - DeprecationWarning) - return builtins.any(iterable)