summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-05-21 14:41:39 +0200
committerClaude Paroz <claude@2xlibre.net>2013-05-21 14:41:39 +0200
commitfd961941cc1c9e7e1384af527792801f8f897d9f (patch)
tree964f028241ca1640da34825e174c11ae7c92780f /django/utils
parent800513e7f3f8e4db26b40ecd2f8aae25ecc3191b (diff)
Imported copyreg from six.moves
Diffstat (limited to 'django/utils')
-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 bf32121e07..93befcf59e 100644
--- a/django/utils/functional.py
+++ b/django/utils/functional.py
@@ -4,11 +4,7 @@ from functools import wraps
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 with `functools.partial` because this binds