orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '1.0.x'

Browse source
This commit is contained in:
David Lord 2019-06-26 14:46:10 -07:00
commit 2a2134974c
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
2 changed files with 420 additions and 410 deletions
Download patch file Download diff file Expand all files Collapse all files

820
CHANGES.rst
View file

File diff suppressed because it is too large Load diff

10
src/flask/app.py
View file

@ -1797,14 +1797,14 @@ class Flask(_PackageBoundObject):
if isinstance(e, BadRequestKeyError): if isinstance(e, BadRequestKeyError):
if self.debug or self.config["TRAP_BAD_REQUEST_ERRORS"]: if self.debug or self.config["TRAP_BAD_REQUEST_ERRORS"]:
e.show_exception = True
# Werkzeug < 0.15 doesn't add the KeyError to the 400 # Werkzeug < 0.15 doesn't add the KeyError to the 400
# message, add it in manually. # message, add it in manually.
description = e.get_description() # TODO: clean up once Werkzeug >= 0.15.5 is required
if e.args[0] not in e.get_description():
if e.args[0] not in description:
e.description = "KeyError: '{}'".format(*e.args) e.description = "KeyError: '{}'".format(*e.args)
else: elif not hasattr(BadRequestKeyError, "show_exception"):
# Werkzeug >= 0.15 does add it, remove it in production
e.args = () e.args = ()
if isinstance(e, HTTPException) and not self.trap_http_exception(e): if isinstance(e, HTTPException) and not self.trap_http_exception(e):