Skip to content
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: pip
directory: "/"
schedule:
interval: monthly
time: '08:00'
timezone: US/Pacific
open-pull-requests-limit: 10
target-branch: mpcontribs
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
arch:
- amd64
- ppc64le
language: python
python:
- "2.7"
- "3.2"
- "3.4"
- "3.8"
- "pypy"
install:
- python setup.py install
Expand Down
12 changes: 9 additions & 3 deletions src/mimerender.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,11 @@ def wrapper(*args, **kwargs):
shortmime = args[override_arg_idx]
if not shortmime and override_input_key:
shortmime = self._get_request_parameter(override_input_key)
if shortmime: mime = _get_mime_types(shortmime)[0]
if shortmime:
try:
mime = _get_mime_types(shortmime)[0]
except MimeRenderException as e:
return self._make_response(str(e), (('Content-Type', 'text/plain'),), '400 Bad Request')
accept_header = self._get_accept_header()
if not mime:
if accept_header:
Expand Down Expand Up @@ -341,7 +345,9 @@ def _make_response(self, content, headers, status):
import flask
class FlaskMimeRender(MimeRenderBase):
def _get_request_parameter(self, key, default=None):
return flask.request.values.get(key, default)
return flask.request.values.get(
key, flask.request.view_args.get(key, default)
)

def _get_accept_header(self, default=None):
return flask.request.headers.get('Accept', default)
Expand Down Expand Up @@ -451,7 +457,7 @@ def _make_response(self, content, headers, status):

def WSGIMimeRender(*args, **kwargs):
'''
A wrapper for _WSGIMimeRender that wrapps the
A wrapper for _WSGIMimeRender that wraps the
inner callable with wsgi_wrap first.
'''
def wrapper(*args2, **kwargs2):
Expand Down