Browse files

[py3] Used smart_str to prevent regressions in http handling

  • Loading branch information...
1 parent f10a1b0 commit 09c589810d54ef14132084e34f4ef6133fdac3b9 @claudep claudep committed Aug 11, 2012
Showing with 4 additions and 4 deletions.
  1. +4 −4 django/http/
@@ -61,14 +61,14 @@ def value_encode(self, val):
if not _cookie_allows_colon_in_names:
def load(self, rawdata):
self.bad_cookies = set()
- super(SimpleCookie, self).load(str(rawdata))
+ super(SimpleCookie, self).load(smart_str(rawdata))
for key in self.bad_cookies:
del self[key]
# override private __set() method:
# (needed for using our Morsel, and for laxness with CookieError
def _BaseCookie__set(self, key, real_value, coded_value):
- key = str(key)
+ key = smart_str(key)
M = self.get(key, Morsel())
M.set(key, real_value, coded_value)
@@ -85,7 +85,7 @@ def _BaseCookie__set(self, key, real_value, coded_value):
from django.http.multipartparser import MultiPartParser
from django.http.utils import *
from django.utils.datastructures import MultiValueDict, ImmutableList
-from django.utils.encoding import smart_bytes, iri_to_uri, force_text
+from django.utils.encoding import smart_bytes, smart_str, iri_to_uri, force_text
from django.utils.http import cookie_date
from django.utils import six
from django.utils import timezone
@@ -137,7 +137,7 @@ def build_request_repr(request, path_override=None, GET_override=None,
meta = '<could not parse>'
path = path_override if path_override is not None else request.path
- return str('<%s\npath:%s,\nGET:%s,\nPOST:%s,\nCOOKIES:%s,\nMETA:%s>' %
+ return smart_str('<%s\npath:%s,\nGET:%s,\nPOST:%s,\nCOOKIES:%s,\nMETA:%s>' %

0 comments on commit 09c5898

Please sign in to comment.