Author: ccahoon
Date: 2009-07-10 16:50:19 -0500 (Fri, 10 Jul 2009)
New Revision: 11213
Modified:
django/branches/soc2009/http-wsgi-improvements/django/http/__init__.py
django/branches/soc2009/http-wsgi-improvements/django/http/charsets.py
Log:
[gsoc2009/http-wsgi-improvements] Clean up imports in django.http and
django.http.charsets.
Modified: django/branches/soc2009/http-wsgi-improvements/django/http/__init__.py
===================================================================
--- django/branches/soc2009/http-wsgi-improvements/django/http/__init__.py
2009-07-10 19:02:34 UTC (rev 11212)
+++ django/branches/soc2009/http-wsgi-improvements/django/http/__init__.py
2009-07-10 21:50:19 UTC (rev 11213)
@@ -13,7 +13,7 @@
from django.utils.datastructures import MultiValueDict, ImmutableList
from django.utils.encoding import smart_str, iri_to_uri, force_unicode
from django.http.multipartparser import MultiPartParser
-from django.http.charsets import get_response_encoding, get_codec,
UnsupportedCharset
+from django.http.charsets import *
from django.conf import settings
from django.core.files import uploadhandler
from utils import *
Modified: django/branches/soc2009/http-wsgi-improvements/django/http/charsets.py
===================================================================
--- django/branches/soc2009/http-wsgi-improvements/django/http/charsets.py
2009-07-10 19:02:34 UTC (rev 11212)
+++ django/branches/soc2009/http-wsgi-improvements/django/http/charsets.py
2009-07-10 21:50:19 UTC (rev 11213)
@@ -5,7 +5,7 @@
from operator import itemgetter
from django.conf import settings
-CHARSET_CODECS = {
+_CHARSET_CODECS = {
'437': 'cp437',
'850': 'cp850',
'852': 'cp852',
@@ -245,7 +245,7 @@
codec = None
if charset:
try:
- codec_name = CHARSET_CODECS[charset.strip().lower()]
+ codec_name = _CHARSET_CODECS[charset.strip().lower()]
codec = codecs.lookup(codec_name)
except LookupError:
# The encoding is not supported in this version of Python.
@@ -255,8 +255,8 @@
# Returns the key for the maximum value in a dictionary
max_dict_key = lambda l:sorted(l.iteritems(), key=itemgetter(1),
reverse=True)[0][0]
-CONTENT_TYPE_RE = re.compile('.*; charset=([\w\d-]+);?')
-ACCEPT_CHARSET_RE =
re.compile('(?P<charset>([\w\d-]+)|(\*))(;q=(?P<q>[01](\.\d{1,3})?))?,?')
+_CONTENT_TYPE_RE = re.compile('.*; charset=([\w\d-]+);?')
+_ACCEPT_CHARSET_RE =
re.compile('(?P<charset>([\w\d-]+)|(\*))(;q=(?P<q>[01](\.\d{1,3})?))?,?')
def get_response_encoding(content_type, accept_charset_header):
"""
Searches request headers from clients and mimetype settings (which may be
set
@@ -278,7 +278,7 @@
codec = None
# Try to get the codec from a content-type, verify that the charset is
valid.
if content_type:
- match = CONTENT_TYPE_RE.match(content_type)
+ match = _CONTENT_TYPE_RE.match(content_type)
if match:
charset = match.group(1)
codec = get_codec(charset)
@@ -295,7 +295,7 @@
# Get list of matches for Accepted-Charsets.
# [{ charset : q }, { charset : q }]
- match_iterator = ACCEPT_CHARSET_RE.finditer(accept_charset_header)
+ match_iterator = _ACCEPT_CHARSET_RE.finditer(accept_charset_header)
accept_charset = [m.groupdict() for m in match_iterator]
# Remove charsets we cannot encode and whose q values are 0
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
