p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[py3] Fixed test_client_regress tests

This commit is contained in:
Claude Paroz 2012-08-15 10:57:05 +02:00
parent 64531df5df
commit e0d67f3440
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/sessions/backends/base.py
View File

@ -81,7 +81,7 @@ class SessionBase(object):
"Returns the given session dictionary pickled and encoded as a string." "Returns the given session dictionary pickled and encoded as a string."
pickled = pickle.dumps(session_dict, pickle.HIGHEST_PROTOCOL) pickled = pickle.dumps(session_dict, pickle.HIGHEST_PROTOCOL)
hash = self._hash(pickled) hash = self._hash(pickled)
return base64.b64encode(hash.encode() + b":" + pickled) return base64.b64encode(hash.encode() + b":" + pickled).decode('ascii')
def decode(self, session_data): def decode(self, session_data):
encoded_data = base64.b64decode(smart_bytes(session_data)) encoded_data = base64.b64decode(smart_bytes(session_data))

4
tests/regressiontests/test_client_regress/tests.py
View File

@ -858,7 +858,7 @@ class UnicodePayloadTests(TestCase):
json = '{"english": "mountain pass"}' json = '{"english": "mountain pass"}'
response = self.client.post("/test_client_regress/parse_unicode_json/", json, response = self.client.post("/test_client_regress/parse_unicode_json/", json,
content_type="application/json") content_type="application/json")
self.assertEqual(response.content, json) self.assertEqual(response.content, json.encode())
def test_unicode_payload_utf8(self): def test_unicode_payload_utf8(self):
"A non-ASCII unicode data encoded as UTF-8 can be POSTed" "A non-ASCII unicode data encoded as UTF-8 can be POSTed"
@ -888,7 +888,7 @@ class DummyFile(object):
def __init__(self, filename): def __init__(self, filename):
self.name = filename self.name = filename
def read(self): def read(self):
return 'TEST_FILE_CONTENT' return b'TEST_FILE_CONTENT'
class UploadedFileEncodingTest(TestCase): class UploadedFileEncodingTest(TestCase):
def test_file_encoding(self): def test_file_encoding(self):

4
tests/regressiontests/test_client_regress/views.py
View File

@ -80,9 +80,7 @@ def return_json_file(request):
# This just checks that the uploaded data is JSON # This just checks that the uploaded data is JSON
obj_dict = json.loads(request.body.decode(charset)) obj_dict = json.loads(request.body.decode(charset))
obj_json = json.dumps(obj_dict, encoding=charset, obj_json = json.dumps(obj_dict, cls=DjangoJSONEncoder, ensure_ascii=False)
cls=DjangoJSONEncoder,
ensure_ascii=False)
response = HttpResponse(obj_json.encode(charset), status=200, response = HttpResponse(obj_json.encode(charset), status=200,
content_type='application/json; charset=%s' % charset) content_type='application/json; charset=%s' % charset)
response['Content-Disposition'] = 'attachment; filename=testfile.json' response['Content-Disposition'] = 'attachment; filename=testfile.json'