summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-26 01:58:12 -0400
committerChris McDonough <chrism@plope.com>2011-09-26 01:58:12 -0400
commit632a912b4b7f6f387adee2ebadebd677f2ebc82c (patch)
tree12915e358995eb88989eb5460dca515a604266fb
parentb719fdd3e99bb98f426a2125a4e1b5056cca2a46 (diff)
downloadpyramid-632a912b4b7f6f387adee2ebadebd677f2ebc82c.tar.gz
pyramid-632a912b4b7f6f387adee2ebadebd677f2ebc82c.tar.bz2
pyramid-632a912b4b7f6f387adee2ebadebd677f2ebc82c.zip
better test
-rw-r--r--pyramid/tests/test_request.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/pyramid/tests/test_request.py b/pyramid/tests/test_request.py
index 9de7cb795..56b1349bb 100644
--- a/pyramid/tests/test_request.py
+++ b/pyramid/tests/test_request.py
@@ -1,6 +1,7 @@
import unittest
from pyramid import testing
+from pyramid.compat import PY3
from pyramid.compat import text_
from pyramid.compat import bytes_
from pyramid.compat import native_
@@ -251,11 +252,17 @@ class TestRequest(unittest.TestCase):
def test_json_body_alternate_charset(self):
from pyramid.compat import json
request = self._makeOne({'REQUEST_METHOD':'POST'})
- request = request.decode('latin-1')
- la = text_(b'La Pe\xc3\xb1a', 'utf-8')
- body = bytes_(json.dumps({'a':la}), 'latin-1')
+ inp = text_(
+ b'/\xe6\xb5\x81\xe8\xa1\x8c\xe8\xb6\x8b\xe5\x8a\xbf',
+ 'utf-8'
+ )
+ if PY3:
+ body = bytes(json.dumps({'a':inp}), 'utf-16')
+ else:
+ body = json.dumps({'a':inp}).decode('utf-8').encode('utf-16')
request.body = body
- self.assertEqual(request.json_body, {'a':la})
+ request.content_type = 'application/json; charset=utf-16'
+ self.assertEqual(request.json_body, {'a':inp})
def test_json_body_GET_request(self):
request = self._makeOne({'REQUEST_METHOD':'GET'})