aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2016-04-16 13:44:44 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2016-04-16 13:44:44 +0200
commitad401ce2fec0383030193dc62a73d81c91141df1 (patch)
tree918485e270d36421b6cb3e467ce5e967daa49a24
parentprepare the merge (diff)
parentMerge branch 'new-api' (diff)
downloadnewspipe-ad401ce2fec0383030193dc62a73d81c91141df1.tar.gz
newspipe-ad401ce2fec0383030193dc62a73d81c91141df1.tar.bz2
newspipe-ad401ce2fec0383030193dc62a73d81c91141df1.zip
Fix conflicts
-rw-r--r--src/web/views/api/v2/common.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/web/views/api/v2/common.py b/src/web/views/api/v2/common.py
index e375bd9b..64c76a7e 100644
--- a/src/web/views/api/v2/common.py
+++ b/src/web/views/api/v2/common.py
@@ -98,7 +98,7 @@ class PyAggAbstractResource(Resource):
continue
else:
parser.add_argument(attr_name, location='json', **attr)
- return parser.parse_args(req=in_values, strict=strict)
+ return parser.parse_args(req=req, strict=strict)
class PyAggResourceNew(PyAggAbstractResource):
bgstack15