Merge pull request #4 from reaperhulk/master

removed stray print statement and all references to marconiclient

barbicanclient/client.py

@@ -133,7 +133,6 @@ class Connection(object):
 
     def get_secret_by_id(self, secret_id):
         href = "{0}/{1}/{2}".format(self._tenant, self.SECRETS_PATH, secret_id)
-        print href
         return self.get_secret(href)
 
     def get_secret(self, href):

barbicanclient/common/auth.py

@@ -14,7 +14,7 @@ def authenticate(auth_url, user, key, tenant, **kwargs):
     :param auth_url: The keystone auth endpoint to use
     :param user: The username to use for auth
     :param key: The apikey to use for authentiation
-    :param endpoint: The Marconi endpoint to use. IOW, don't
+    :param endpoint: The Barbican endpoint to use. IOW, don't
         look up an endpoint in the service catalog, just use
         this one instead.
     :param tenant_name: The optional tenant-name to use
@@ -26,7 +26,7 @@ def authenticate(auth_url, user, key, tenant, **kwargs):
         the service catalog
     :param region_name The region to pass for authentication
 
-    :returns: Tuple containing Marconi endpoint and token
+    :returns: Tuple containing Barbican endpoint and token
 
     :raises: ClientException
     """
@@ -67,4 +67,4 @@ def authenticate(auth_url, user, key, tenant, **kwargs):
         except exceptions.EndpointNotFound as ex:
             raise ClientException('Endpoint not found in service catalog')
 
-    return endpoint, _ksclient.auth_token
+    return endpoint, _ksclient.auth_token

tox.ini

@@ -24,7 +24,7 @@ commands = flake8
 commands = {posargs}
 
 [testenv:cover]
-commands = nosetests --with-coverage --cover-package=marconiclient
+commands = nosetests --with-coverage --cover-package=barbicanclient
 
 [tox:jenkins]
 downloadcache = ~/cache/pip