From 62b0b6652aab03fcf7c411de4d2cbd242ed05ec9 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Fri, 19 Aug 2016 21:24:07 +0200 Subject: [PATCH] testing: Make json a keyword arg --- flask/testing.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flask/testing.py b/flask/testing.py index 6527c8b4..34b66600 100644 --- a/flask/testing.py +++ b/flask/testing.py @@ -21,7 +21,7 @@ except ImportError: from urlparse import urlsplit as url_parse -def make_test_environ_builder(app, path='/', base_url=None, json=None, *args, **kwargs): +def make_test_environ_builder(app, path='/', base_url=None, *args, **kwargs): """Creates a new test builder with some application defaults thrown in.""" http_host = app.config.get('SERVER_NAME') app_root = app.config.get('APPLICATION_ROOT') @@ -35,10 +35,10 @@ def make_test_environ_builder(app, path='/', base_url=None, json=None, *args, ** if url.query: path += '?' + url.query - if json is not None: + if 'json' in kwargs: if 'data' in kwargs: raise ValueError('Client cannot provide both `json` and `data`') - kwargs['data'] = json_dumps(json) + kwargs['data'] = json_dumps(kwargs['json']) # Only set Content-Type when not explicitly provided if 'content_type' not in kwargs: