Fixed part of issue #290.

pallets · Aug 8, 2011 · df10148 · df10148
1 parent 505cd66
commit df10148
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/flask/wrappers.py b/flask/wrappers.py
@@ -90,7 +90,7 @@ def blueprint(self):
     @cached_property
     def json(self):
         """If the mimetype is `application/json` this will contain the
-        parsed JSON data.
+        parsed JSON data. Returns None if the the mimetype is incorrect.
         """
         if __debug__:
             _assert_have_json()
@@ -99,6 +99,8 @@ def json(self):
             if request_charset is not None:
                 return json.loads(self.data, encoding=request_charset)
             return json.loads(self.data)
+        else:
+            return None
 
     def _load_form_data(self):
         RequestBase._load_form_data(self)