Merge pull request #974 from sirosen/update-for-bottle

Fix for invalid JSON handling on latest 'bottle'

CHANGELOG.rst

@@ -4,6 +4,11 @@ Changelog
 Unreleased
 **********
 
+Bug fixes:
+
+* Fix the handling of invalid JSON bodies in the ``bottle`` parser to support
+  ``bottle`` versions ``>=0.13``.
+
 Other changes:
 
 * ``MultiDictProxy`` now inherits from ``MutableMapping`` rather than ``Mapping``.

src/webargs/bottleparser.py

@@ -37,6 +37,11 @@ def _raw_load_json(self, req):
             data = req.json
         except AttributeError:
             return core.missing
+        except bottle.HTTPError as err:
+            if err.body == "Invalid JSON":
+                self._handle_invalid_json_error(err, req)
+            else:
+                raise
 
         # unfortunately, bottle does not distinguish between an empty body, "",
         # and a body containing the valid JSON value null, "null"