Add a DeprecationWarning, while using old loader arg.

aio-libs · Nov 27, 2015 · 78fa7c3 · 78fa7c3
1 parent e50da35
commit 78fa7c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/aiohttp/web_reqrep.py b/aiohttp/web_reqrep.py
@@ -326,8 +326,13 @@ def text(self):
         return bytes_body.decode(encoding)
 
     @asyncio.coroutine
-    def json(self, *, loads=json.loads):
+    def json(self, *, loads=json.loads, loader=None):
         """Return BODY as JSON."""
+        if loader:
+            warnings.warn(
+                'Using `loader` is deprecated, use `loads` instead',
+                DeprecationWarning)
+            loads = loader
         body = yield from self.text()
         return loads(body)
 

diff --git a/tests/test_web_functional.py b/tests/test_web_functional.py
@@ -144,6 +144,8 @@ def handler(request):
             self.assertEqual(dct, data)
             data2 = yield from request.json(loads=json.loads)
             self.assertEqual(data, data2)
+            data3 = yield from request.json(loader=json.loads)
+            self.assertEqual(data, data3)
             resp = web.Response()
             resp.content_type = 'application/json'
             resp.body = json.dumps(data).encode('utf8')