BackTrackZ/scrapy
BackTrackZ/scrapy
1
0
Fork 0
mirror of https://github.com/scrapy/scrapy.git synced 2025-02-25 20:23:56 +00:00
Code Releases Wiki Activity

Check that arguments and keyword arguments are not passed simultaneously in jsonrpc_client_call()

Browse Source
This commit is contained in:
Pablo Hoffman 2010-08-27 13:45:52 -03:00
parent ffad8e08e7
commit 88c99e0b83
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scrapy/tests/test_utils_jsonrpc.py
View File

@ -36,6 +36,9 @@ class JsonRpcUtilsTestCase(unittest.TestCase):
crawler = CrawlerMock([])
self.json_decoder = ScrapyJSONDecoder(crawler=crawler)
def test_jsonrpc_client_call_args_kwargs_raises(self):
self.assertRaises(ValueError, jsonrpc_client_call, 'url', 'test', 'one', kw=123)
def test_jsonrpc_client_call_request(self):
ul = urllib_mock(1)
jsonrpc_client_call('url', 'test', 'one', 2, _urllib=ul)

2
scrapy/utils/jsonrpc.py
View File

@ -31,6 +31,8 @@ class JsonRpcError(Exception):
def jsonrpc_client_call(url, method, *args, **kwargs):
"""Execute a JSON-RPC call on the given url"""
_urllib = kwargs.pop('_urllib', urllib)
if args and kwargs:
raise ValueError("Pass *args or **kwargs but not both to jsonrpc_client_call")
req = {'jsonrpc': '2.0', 'method': method, 'params': args or kwargs, 'id': 1}
res = json.loads(_urllib.urlopen(url, json.dumps(req)).read())
if 'result' in res: