Merge 58a9040444 into ea77d5e12d

2011-05-24 07:22:04 -07:00 · 2011-05-24 07:22:04 -07:00 · da45e245ff
commit da45e245ff
parent ea77d5e12d 58a9040444
1 changed files with 7 additions and 1 deletions
--- a/flask/wrappers.py
+++ b/flask/wrappers.py
@ -73,7 +73,13 @@ class Request(RequestBase):
        if __debug__:
            _assert_have_json()
        if self.mimetype == 'application/json':
-            return json.loads(self.data)
+            request_charset = self.mimetype_params.get('charset')
+            if request_charset is not None:
+                j = json.loads(self.data, encoding=request_charset )
+            else:
+                j = json.loads(self.data)
+
+            return j


 class Response(ResponseBase):