openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Rename HTTPError -> HttpError"

Browse Source
This commit is contained in:
Jenkins
2014-04-15 22:22:25 +00:00
committed by Gerrit Code Review
parent 6395a5a5f3 ce92f37f0b
commit 6d70bad3d9
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
keystoneclient/auth/identity/base.py
View File

@@ -58,7 +58,7 @@ class BaseIdentityPlugin(base.BaseAuthPlugin):
when invoked. If you are looking to just retrieve the current auth when invoked. If you are looking to just retrieve the current auth
data then you should use get_access. data then you should use get_access.
:raises HTTPError: An error from an invalid HTTP response. :raises HttpError: An error from an invalid HTTP response.
:returns AccessInfo: Token access information. :returns AccessInfo: Token access information.
""" """
@@ -68,7 +68,7 @@ class BaseIdentityPlugin(base.BaseAuthPlugin):
If a valid token is not present then a new one will be fetched. If a valid token is not present then a new one will be fetched.
:raises HTTPError: An error from an invalid HTTP response. :raises HttpError: An error from an invalid HTTP response.
:return string: A valid token. :return string: A valid token.
""" """
@@ -80,7 +80,7 @@ class BaseIdentityPlugin(base.BaseAuthPlugin):
If a valid AccessInfo is present then it is returned otherwise a new If a valid AccessInfo is present then it is returned otherwise a new
one will be fetched. one will be fetched.
:raises HTTPError: An error from an invalid HTTP response. :raises HttpError: An error from an invalid HTTP response.
:returns AccessInfo: Valid AccessInfo :returns AccessInfo: Valid AccessInfo
""" """
@@ -106,7 +106,7 @@ class BaseIdentityPlugin(base.BaseAuthPlugin):
:param string region_name: The region the endpoint should exist in. :param string region_name: The region the endpoint should exist in.
(optional) (optional)
:raises HTTPError: An error from an invalid HTTP response. :raises HttpError: An error from an invalid HTTP response.
:return string or None: A valid endpoint URL or None if not available. :return string or None: A valid endpoint URL or None if not available.
""" """

1
keystoneclient/exceptions.py
View File

@@ -25,6 +25,7 @@ from keystoneclient.openstack.common.apiclient.exceptions import *
ConnectionError = ConnectionRefused ConnectionError = ConnectionRefused
HTTPNotImplemented = HttpNotImplemented HTTPNotImplemented = HttpNotImplemented
Timeout = RequestTimeout Timeout = RequestTimeout
HTTPError = HttpError
class CertificateConfigError(Exception): class CertificateConfigError(Exception):

2
keystoneclient/session.py
View File

@@ -385,7 +385,7 @@ class Session(object):
try: try:
return auth.get_token(self) return auth.get_token(self)
except exceptions.HTTPError as exc: except exceptions.HttpError as exc:
raise exceptions.AuthorizationFailure("Authentication failure: " raise exceptions.AuthorizationFailure("Authentication failure: "
"%s" % exc) "%s" % exc)

0
keystoneclient/tests/apiclient/__init__.py Normal file
View File