summaryrefslogtreecommitdiff
path: root/django/utils/http.py
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-09-09 16:18:38 +0000
committerJannis Leidel <jannis@leidel.info>2011-09-09 16:18:38 +0000
commitddaca29d3dc2b4a917a9e527fd90a14ef8bc47e4 (patch)
tree276dfb04bb0b7127206401588c4fbac074f6206a /django/utils/http.py
parent387e192f2584d283d989ebe92e63d174413e30e4 (diff)
Fixed a bunch of imports of the email stdlib module now that we are on Python 2.5 to ease the Python 3 port. Thanks, Martin von Löwis.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils/http.py')
-rw-r--r--django/utils/http.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/http.py b/django/utils/http.py
index 07e96b9ba6..4fee731d0a 100644
--- a/django/utils/http.py
+++ b/django/utils/http.py
@@ -4,7 +4,7 @@ import re
import sys
import urllib
import urlparse
-from email.Utils import formatdate
+from email.utils import formatdate
from django.utils.datastructures import MultiValueDict
from django.utils.encoding import smart_str, force_unicode