!5 upgrade version to 0.3.8
From: @run-is-pig Reviewed-by: @shinwell_hu Signed-off-by: @shinwell_hu
This commit is contained in:
commit
388e8e083c
BIN
0.3.6.tar.gz
BIN
0.3.6.tar.gz
Binary file not shown.
BIN
0.3.8.tar.gz
Normal file
BIN
0.3.8.tar.gz
Normal file
Binary file not shown.
@ -1,62 +0,0 @@
|
||||
From f71b4f61d96c43748ca1cb9002f874a8d8276312 Mon Sep 17 00:00:00 2001
|
||||
From: Stephen Pascoe <stephen.pascoe@lirico.co.uk>
|
||||
Date: Wed, 4 Oct 2017 01:01:47 +0100
|
||||
Subject: [PATCH] Fix arguments with type=list (#705)
|
||||
|
||||
Closes #681
|
||||
---
|
||||
flask_restful/reqparse.py | 2 +-
|
||||
tests/test_reqparse.py | 25 +++++++++++++++++++++++++
|
||||
2 files changed, 26 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/flask_restful/reqparse.py b/flask_restful/reqparse.py
|
||||
index 8fe142e..527bc94 100644
|
||||
--- flask_restful/reqparse.py
|
||||
+++ flask_restful/reqparse.py
|
||||
@@ -176,7 +176,7 @@ class Argument(object):
|
||||
values = source.getlist(name)
|
||||
else:
|
||||
values = source.get(name)
|
||||
- if not isinstance(values, collections.MutableSequence):
|
||||
+ if not (isinstance(values, collections.MutableSequence) and self.action == 'append'):
|
||||
values = [values]
|
||||
|
||||
for value in values:
|
||||
diff --git a/tests/test_reqparse.py b/tests/test_reqparse.py
|
||||
index ce9ce30..df18ead 100644
|
||||
--- tests/test_reqparse.py
|
||||
+++ tests/test_reqparse.py
|
||||
@@ -891,5 +891,30 @@ class ReqParseTestCase(unittest.TestCase):
|
||||
self.assertEquals(args['int1'], 1)
|
||||
self.assertEquals(args['int2'], 2)
|
||||
|
||||
+ def test_list_argument(self):
|
||||
+ app = Flask(__name__)
|
||||
+
|
||||
+ parser = RequestParser()
|
||||
+ parser.add_argument('arg1', location='json', type=list)
|
||||
+
|
||||
+ with app.test_request_context('/bubble', method="post",
|
||||
+ data=json.dumps({'arg1': ['foo', 'bar']}),
|
||||
+ content_type='application/json'):
|
||||
+ args = parser.parse_args()
|
||||
+ self.assertEquals(args['arg1'], ['foo', 'bar'])
|
||||
+
|
||||
+ def test_list_argument_dict(self):
|
||||
+ app = Flask(__name__)
|
||||
+
|
||||
+ parser = RequestParser()
|
||||
+ parser.add_argument('arg1', location='json', type=list)
|
||||
+
|
||||
+ with app.test_request_context('/bubble', method="post",
|
||||
+ data=json.dumps({'arg1': [{'foo': 1, 'bar': 2}]}),
|
||||
+ content_type='application/json'):
|
||||
+ args = parser.parse_args()
|
||||
+ self.assertEquals(args['arg1'], [{'foo': 1, 'bar': 2}])
|
||||
+
|
||||
+
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
--
|
||||
2.17.0.rc1
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 54979f0a49b2217babc53c5b65b5df10b6de8e05 Mon Sep 17 00:00:00 2001
|
||||
From: Josh Friend <josh@fueledbycaffeine.com>
|
||||
Date: Thu, 29 Mar 2018 14:55:35 -0400
|
||||
Subject: [PATCH] Support aniso8601 >3.0 in tests
|
||||
|
||||
---
|
||||
tests/test_inputs.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/test_inputs.py b/tests/test_inputs.py
|
||||
index 90a2fb0..6cb9e9b 100644
|
||||
--- tests/test_inputs.py
|
||||
+++ tests/test_inputs.py
|
||||
@@ -417,7 +417,7 @@ def test_bad_isointervals():
|
||||
for bad_interval in bad_intervals:
|
||||
yield (
|
||||
assert_raises,
|
||||
- ValueError,
|
||||
+ Exception,
|
||||
inputs.iso8601interval,
|
||||
bad_interval,
|
||||
)
|
||||
--
|
||||
2.17.0
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
commit dfd60ce7c656d95afc2e7c4c1e03be2982cc9a9d
|
||||
Author: Kamil Páral <kparal@redhat.com>
|
||||
Date: Tue Jun 26 12:06:37 2018 +0200
|
||||
|
||||
test_api: fix traceback
|
||||
|
||||
This is fixed:
|
||||
```
|
||||
Traceback (most recent call last):
|
||||
File "/builddir/build/BUILD/flask-restful-0.3.6/tests/test_api.py", line 787, in test_fr_405
|
||||
set(['HEAD', 'OPTIONS'] + HelloWorld.methods))
|
||||
TypeError: can only concatenate list (not "set") to list
|
||||
```
|
||||
|
||||
diff --git tests/test_api.py tests/test_api.py
|
||||
index 26447ae..f34b3f6 100644
|
||||
--- tests/test_api.py
|
||||
+++ tests/test_api.py
|
||||
@@ -784,7 +784,7 @@ class APITestCase(unittest.TestCase):
|
||||
allow = ', '.join(set(resp.headers.get_all('Allow')))
|
||||
allow = set(method.strip() for method in allow.split(','))
|
||||
self.assertEquals(allow,
|
||||
- set(['HEAD', 'OPTIONS'] + HelloWorld.methods))
|
||||
+ set(['HEAD', 'OPTIONS'] + list(HelloWorld.methods)))
|
||||
|
||||
def test_exception_header_forwarded(self):
|
||||
"""Test that HTTPException's headers are extended properly"""
|
||||
@ -1,14 +1,11 @@
|
||||
Name: python-flask-restful
|
||||
Version: 0.3.6
|
||||
Release: 11
|
||||
Version: 0.3.8
|
||||
Release: 1
|
||||
Summary: Framework for creating REST APIs
|
||||
License: BSD
|
||||
URL: https://www.github.com/flask-restful/flask-restful/
|
||||
Source0: https://github.com/flask-restful/flask-restful/archive/%{version}.tar.gz
|
||||
Patch0: python-flask-restful.remove_q0_testcase.patch
|
||||
Patch1: 0001-Fix-arguments-with-type-list-705.patch
|
||||
Patch2: 0002-Support-aniso8601-3.0-in-tests.patch
|
||||
Patch3: 0003-Fix-tests_api-list-traceback.patch
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: git gcc python3-pytz python3-setuptools python3-nose python3-mock python3-blinker
|
||||
@ -45,6 +42,9 @@ rm -rf docs/_themes/.gitignore
|
||||
%{python3_sitelib}/*
|
||||
|
||||
%changelog
|
||||
* Tue Feb 2 2021 liudabo <liudabo1@huawei.com> - 0.3.8-1
|
||||
- upgrade version to 0.3.8
|
||||
|
||||
* Thu Oct 20 2020 tianwei <tianwei12@huawei.com> - 0.3.6-11
|
||||
- delete python2
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user