s/url/discovery_url/r

cabby/__init__.py

@@ -14,7 +14,7 @@
 
 
 def create_client(host=None, port=None, discovery_path=None, use_https=False,
-                  url=None, version="1.1", headers=None):
+                  discovery_url=None, version="1.1", headers=None):
     '''Create a client instance (TAXII version specific).
 
     ``host``, ``port``, ``use_https``, ``discovery_path`` values
@@ -25,16 +25,17 @@ def create_client(host=None, port=None, discovery_path=None, use_https=False,
     :param int port: TAXII server port
     :param str discovery_path: Discovery Service relative path
     :param bool use_https: if HTTPS should be used
-    :param string url: URL to infer host, port, discovery_path, and use_https
+    :param string discovery_url: URL to infer host, port, discovery_path,
+                                 and use_https.
     :param string version: TAXII version (1.1 or 1.0)
     :param dict headers: additional headers to pass with TAXII messages
 
     :return: client instance
     :rtype: :py:class:`cabby.client11.Client11` or
             :py:class:`cabby.client10.Client10`
     '''
-    if url:
-        parsed = urlparse(url)
+    if discovery_url:
+        parsed = urlparse(discovery_url)
         if not host and parsed.hostname:
             host = parsed.hostname
         if not port and parsed.port:

tests/test_client.py

@@ -3,7 +3,7 @@
 
 def test_url_parse():
     url = 'https://eiq-test.com:1337/path/to/discovery'
-    client = cabby.create_client(url=url)
+    client = cabby.create_client(discovery_url=url)
     assert client.host == 'eiq-test.com'
     assert client.port == 1337
     assert client.use_https is True