**params -> params

tomchristie · tomchristie · commit dff33a280a4e · 2016-01-08T16:47:08.000Z
diff --git a/coreapi/__init__.py b/coreapi/__init__.py
@@ -49,9 +49,9 @@ def get(url):
     return session.get(url)
 
 
-def action(document, keys, **params):
+def action(document, keys, params=None):
     session = _default_session
-    return session.action(document, keys, **params)
+    return session.action(document, keys, params)
 
 
 def load(bytestring, content_type=None):
diff --git a/coreapi/commandline.py b/coreapi/commandline.py
@@ -30,7 +30,7 @@ def coerce_key_types(doc, keys):
         try:
             active = active[key]
         except (KeyError, IndexError, ValueError, TypeError):
-            ret += keys[idx+1:]
+            ret += keys[idx + 1:]
             break
 
     return ret
diff --git a/coreapi/sessions.py b/coreapi/sessions.py
@@ -112,10 +112,13 @@ def get(self, url):
         link = Link(url, action='get')
         return transport.transition(link, session=self)
 
-    def action(self, document, keys, **params):
+    def action(self, document, keys, params=None):
         if isinstance(keys, string_types):
             keys = [keys]
 
+        if params is None:
+            params = {}
+
         # Validate the keys and link parameters.
         link, link_ancestors = validate_keys_to_link(document, keys)
         validate_parameters(link, params)
diff --git a/tests/test_commandline.py b/tests/test_commandline.py
@@ -1,22 +1,22 @@
 from coreapi import Document, Link
-from coreapi.commandline import dotted_path_to_list
+from coreapi.commandline import coerce_key_types
 
 
 # Test dotted path notation maps to list of keys correctly.
 
 def test_dotted_path_notation():
     doc = Document({'rows': [Document({'edit': Link()})]})
-    keys = dotted_path_to_list(doc, 'rows.0.edit')
+    keys = coerce_key_types(doc, ['rows', 0, 'edit'])
     assert keys == ['rows', 0, 'edit']
 
 
 def test_dotted_path_notation_with_invalid_array_lookup():
     doc = Document({'rows': [Document({'edit': Link()})]})
-    keys = dotted_path_to_list(doc, 'rows.zero.edit')
+    keys = coerce_key_types(doc, ['rows', 'zero', 'edit'])
     assert keys == ['rows', 'zero', 'edit']
 
 
 def test_dotted_path_notation_with_invalid_key():
     doc = Document({'rows': [Document({'edit': Link()})]})
-    keys = dotted_path_to_list(doc, 'dummy.0.edit')
+    keys = coerce_key_types(doc, ['dummy', '0', 'edit'])
     assert keys == ['dummy', '0', 'edit']
diff --git a/tests/test_transitions.py b/tests/test_transitions.py
@@ -10,7 +10,7 @@ def transition(self, link, params=None, session=None, link_ancestors=None):
         if link.action == 'get':
             document = Document(title='new', content={'new': 123})
         elif link.action in ('put', 'post'):
-            document = Document(title='new', content={'new': 123, 'param': params.get('param')})
+            document = Document(title='new', content={'new': 123, 'foo': params.get('foo')})
         else:
             document = None
 
@@ -25,9 +25,9 @@ def doc():
     return Document(title='original', content={
         'nested': Document(content={
             'follow': Link(url='mock://example.com', action='get'),
-            'action': Link(url='mock://example.com', action='post', transition='inline', fields=['param']),
-            'create': Link(url='mock://example.com', action='post', fields=['param']),
-            'update': Link(url='mock://example.com', action='put', fields=['param']),
+            'action': Link(url='mock://example.com', action='post', transition='inline', fields=['foo']),
+            'create': Link(url='mock://example.com', action='post', fields=['foo']),
+            'update': Link(url='mock://example.com', action='put', fields=['foo']),
             'delete': Link(url='mock://example.com', action='delete')
         })
     })
@@ -42,20 +42,20 @@ def test_get(doc):
 
 
 def test_inline_post(doc):
-    new = session.action(doc, ['nested', 'action'], param=123)
-    assert new == {'nested': {'new': 123, 'param': 123}}
+    new = session.action(doc, ['nested', 'action'], params={'foo': 123})
+    assert new == {'nested': {'new': 123, 'foo': 123}}
     assert new.title == 'original'
 
 
 def test_post(doc):
-    new = session.action(doc, ['nested', 'create'], param=456)
-    assert new == {'new': 123, 'param': 456}
+    new = session.action(doc, ['nested', 'create'], params={'foo': 456})
+    assert new == {'new': 123, 'foo': 456}
     assert new.title == 'new'
 
 
 def test_put(doc):
-    new = session.action(doc, ['nested', 'update'], param=789)
-    assert new == {'nested': {'new': 123, 'param': 789}}
+    new = session.action(doc, ['nested', 'update'], params={'foo': 789})
+    assert new == {'nested': {'new': 123, 'foo': 789}}
     assert new.title == 'original'
 
 
