From 7be13d6c8737ad12a703b8c06f99ff4fcf13a639 Mon Sep 17 00:00:00 2001
From: Patrick Huck <phuck@lbl.gov>
Date: Thu, 13 Feb 2020 15:42:52 -0800
Subject: [PATCH 1/6] catch MimeRenderException

---
 src/mimerender.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/mimerender.py b/src/mimerender.py
index c7a2dca..24192dc 100644
--- a/src/mimerender.py
+++ b/src/mimerender.py
@@ -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:

From c06b6020a42e4d65abdff9e69b11f2c5138ffb3d Mon Sep 17 00:00:00 2001
From: Patrick Huck <phuck@lbl.gov>
Date: Thu, 13 Feb 2020 15:43:16 -0800
Subject: [PATCH 2/6] also check flask view_args for override key

---
 src/mimerender.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mimerender.py b/src/mimerender.py
index 24192dc..951c6ed 100644
--- a/src/mimerender.py
+++ b/src/mimerender.py
@@ -345,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)

From 98a6ca77b83c8c2cea27519c8b56c0b1266945a4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 17 Jun 2020 22:14:36 +0000
Subject: [PATCH 3/6] Create Dependabot config file

---
 .github/dependabot.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..32b9060
--- /dev/null
+++ b/.github/dependabot.yml
@@ -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

From 9a5565e88e7e7dd8dd954317b76e6e0794cccf49 Mon Sep 17 00:00:00 2001
From: Patrick Huck <phuck@lbl.gov>
Date: Wed, 17 Jun 2020 17:33:43 -0700
Subject: [PATCH 4/6] travis: 3.2 -> 3.8

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 78ec0f2..11fb019 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: python
 python:
   - "2.7"
-  - "3.2"
   - "3.4"
+  - "3.8"
   - "pypy"
 install:
   - python setup.py install

From ec2816b92035da98c7bd603aba57c13b551b30e0 Mon Sep 17 00:00:00 2001
From: Felix Yan <felixonmars@archlinux.org>
Date: Wed, 14 Oct 2020 22:41:14 +0800
Subject: [PATCH 5/6] Correct a typo in mimerender.py

---
 src/mimerender.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mimerender.py b/src/mimerender.py
index c7a2dca..9c222ac 100644
--- a/src/mimerender.py
+++ b/src/mimerender.py
@@ -451,7 +451,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):

From 86e25b48ce8be03ee77770aaf72a2f4bdc2150d5 Mon Sep 17 00:00:00 2001
From: srinivas32 <70689972+srinivas32@users.noreply.github.com>
Date: Wed, 25 Nov 2020 17:02:01 +0530
Subject: [PATCH 6/6] added power support arch ppc64le on yml file.

Added power support for the travis.yml file with ppc64le. This is part of the Ubuntu distribution for ppc64le.
---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 78ec0f2..e4f61bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+arch:
+  - amd64
+  - ppc64le
 language: python
 python:
   - "2.7"