diff options
| author | Efraim Flashner <[email protected]> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <[email protected]> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/patches/python-flask-restful-werkzeug-compat.patch | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/patches/python-flask-restful-werkzeug-compat.patch')
| -rw-r--r-- | gnu/packages/patches/python-flask-restful-werkzeug-compat.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/gnu/packages/patches/python-flask-restful-werkzeug-compat.patch b/gnu/packages/patches/python-flask-restful-werkzeug-compat.patch deleted file mode 100644 index 0e928ef455..0000000000 --- a/gnu/packages/patches/python-flask-restful-werkzeug-compat.patch +++ /dev/null @@ -1,36 +0,0 @@ -We need one patch on top of 0.3.8 for compatibility with Werkzeug 1.0. - -Taken from upstream: -https://github.com/flask-restful/flask-restful/commit/73376a488907af3042b52678ac4c23f8a8911e5b - -diff --git a/tests/test_api.py b/tests/test_api.py -index f7f8e661..6795d362 100644 ---- a/tests/test_api.py -+++ b/tests/test_api.py -@@ -445,7 +445,9 @@ def test_handle_non_api_error(self): - - resp = app.get("/foo") - self.assertEquals(resp.status_code, 404) -- self.assertEquals('text/html', resp.headers['Content-Type']) -+ # in newer versions of werkzeug this is `text/html; charset=utf8` -+ content_type, _, _ = resp.headers['Content-Type'].partition(';') -+ self.assertEquals('text/html', content_type) - - def test_non_api_error_404_catchall(self): - app = Flask(__name__) -diff --git a/tests/test_reqparse.py b/tests/test_reqparse.py -index 2f1fbedf..9776f17c 100644 ---- a/tests/test_reqparse.py -+++ b/tests/test_reqparse.py -@@ -2,9 +2,9 @@ - import unittest - from mock import Mock, patch - from flask import Flask --from werkzeug import exceptions, MultiDict -+from werkzeug import exceptions - from werkzeug.wrappers import Request --from werkzeug.datastructures import FileStorage -+from werkzeug.datastructures import FileStorage, MultiDict - from flask_restful.reqparse import Argument, RequestParser, Namespace - import six - import decimal |