summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-05-20 00:24:21 +0200
committerClaude Paroz <claude@2xlibre.net>2012-05-20 00:25:46 +0200
commit35e65855680be2c8a495ec926c7eaf992c79edc0 (patch)
treeb5fffd9107dbf6b16abaeb67e7f017bd5068dc9a
parent4b58e94f271790675782f617288d915169e99654 (diff)
Imported reduce from functools for forward compatibility.
In Python 3, reduce has to be imported from functools.
-rw-r--r--django/contrib/admin/views/main.py1
-rw-r--r--django/core/exceptions.py1
-rw-r--r--django/utils/crypto.py1
3 files changed, 3 insertions, 0 deletions
diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py
index bc158da80a..85e03f3b75 100644
--- a/django/contrib/admin/views/main.py
+++ b/django/contrib/admin/views/main.py
@@ -1,4 +1,5 @@
import operator
+from functools import reduce
from django.core.exceptions import SuspiciousOperation, ImproperlyConfigured
from django.core.paginator import InvalidPage
diff --git a/django/core/exceptions.py b/django/core/exceptions.py
index 201a854a4b..e3d1dc9c7e 100644
--- a/django/core/exceptions.py
+++ b/django/core/exceptions.py
@@ -1,6 +1,7 @@
"""
Global Django exception and warning classes.
"""
+from functools import reduce
class DjangoRuntimeWarning(RuntimeWarning):
pass
diff --git a/django/utils/crypto.py b/django/utils/crypto.py
index f826c8a80c..9d6486c601 100644
--- a/django/utils/crypto.py
+++ b/django/utils/crypto.py
@@ -8,6 +8,7 @@ import hashlib
import binascii
import operator
import time
+from functools import reduce
# Use the system PRNG if possible
import random