summaryrefslogtreecommitdiff
path: root/django/utils/functional.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-05-21 14:41:39 +0200
committerDaniel Lindsley <daniel@toastdriven.com>2013-05-21 10:21:52 -0700
commitfa90ef250f9ee5aa4f2fd4bad02e4720e69b89c0 (patch)
treebe524d387b101c87b3a3f9dd3ae942bf7a65be97 /django/utils/functional.py
parentcb9aaac91fb41b29b3d0d94f3cd208123c02a2ca (diff)
[1.5.x] Imported copyreg from six.moves
Diffstat (limited to 'django/utils/functional.py')
-rw-r--r--django/utils/functional.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/django/utils/functional.py b/django/utils/functional.py
index 839dd4ef85..5fbafadeda 100644
--- a/django/utils/functional.py
+++ b/django/utils/functional.py
@@ -4,11 +4,7 @@ from functools import wraps, update_wrapper
import sys
from django.utils import six
-
-try:
- import copyreg
-except ImportError:
- import copy_reg as copyreg
+from django.utils.six.moves import copyreg
# You can't trivially replace this `functools.partial` because this binds to