diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-08-18 18:47:34 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-08-18 18:47:34 +0000 |
commit | 04b5534b7c43d4ff7edfbed46c88fcdca6f691d8 (patch) | |
tree | 42aa8b207e7dd96fcda221d696dff80a454a09fe | |
parent | 12ccd0e52a705d81afcb2baa57559c2dd9c9d262 (diff) | |
parent | 2bb07e746dddabf87869ba980e200a91218efd5d (diff) | |
download | python-keystoneclient-04b5534b7c43d4ff7edfbed46c88fcdca6f691d8.tar.gz |
Merge "Fix no content return type doc"
-rw-r--r-- | keystoneclient/v3/domains.py | 3 | ||||
-rw-r--r-- | keystoneclient/v3/groups.py | 3 | ||||
-rw-r--r-- | keystoneclient/v3/projects.py | 3 | ||||
-rw-r--r-- | keystoneclient/v3/users.py | 15 |
4 files changed, 16 insertions, 8 deletions
diff --git a/keystoneclient/v3/domains.py b/keystoneclient/v3/domains.py index b7f5a5a..9a828dc 100644 --- a/keystoneclient/v3/domains.py +++ b/keystoneclient/v3/domains.py @@ -116,7 +116,8 @@ class DomainManager(base.CrudManager): :param domain: the domain to be deleted on the server. :type domain: str or :class:`keystoneclient.v3.domains.Domain` - :returns: 204 No Content. + :returns: Response object with 204 status. + :rtype: :class:`requests.models.Response` """ return super(DomainManager, self).delete( diff --git a/keystoneclient/v3/groups.py b/keystoneclient/v3/groups.py index e718168..2eec324 100644 --- a/keystoneclient/v3/groups.py +++ b/keystoneclient/v3/groups.py @@ -137,7 +137,8 @@ class GroupManager(base.CrudManager): :param group: the group to be deleted on the server. :type group: str or :class:`keystoneclient.v3.groups.Group` - :returns: 204 No Content. + :returns: Response object with 204 status. + :rtype: :class:`requests.models.Response` """ return super(GroupManager, self).delete( diff --git a/keystoneclient/v3/projects.py b/keystoneclient/v3/projects.py index 3b4b9db..81dcf8d 100644 --- a/keystoneclient/v3/projects.py +++ b/keystoneclient/v3/projects.py @@ -214,7 +214,8 @@ class ProjectManager(base.CrudManager): :param project: the project to be deleted on the server. :type project: str or :class:`keystoneclient.v3.projects.Project` - :returns: 204 No Content. + :returns: Response object with 204 status. + :rtype: :class:`requests.models.Response` """ return super(ProjectManager, self).delete( diff --git a/keystoneclient/v3/users.py b/keystoneclient/v3/users.py index e1990ce..31cad39 100644 --- a/keystoneclient/v3/users.py +++ b/keystoneclient/v3/users.py @@ -210,7 +210,8 @@ class UserManager(base.CrudManager): :param str old_password: the user's old password :param str new_password: the user's new password - :returns: 204 No Content. + :returns: Response object with 204 status. + :rtype: :class:`requests.models.Response` """ if not (old_password and new_password): @@ -236,7 +237,8 @@ class UserManager(base.CrudManager): :param group: the group to put the user in. :type group: str or :class:`keystoneclient.v3.groups.Group` - :returns: 204 No Content. + :returns: Response object with 204 status. + :rtype: :class:`requests.models.Response` """ self._require_user_and_group(user, group) @@ -254,7 +256,8 @@ class UserManager(base.CrudManager): :param group: the group to check the user in. :type group: str or :class:`keystoneclient.v3.groups.Group` - :returns: 204 No Content. + :returns: Response object with 204 status. + :rtype: :class:`requests.models.Response` """ self._require_user_and_group(user, group) @@ -272,7 +275,8 @@ class UserManager(base.CrudManager): :param group: the group to remove the user from. :type group: str or :class:`keystoneclient.v3.groups.Group` - :returns: 204 No Content. + :returns: Response object with 204 status. + :rtype: :class:`requests.models.Response` """ self._require_user_and_group(user, group) @@ -288,7 +292,8 @@ class UserManager(base.CrudManager): :param user: the user to be deleted on the server. :type user: str or :class:`keystoneclient.v3.users.User` - :returns: 204 No Content. + :returns: Response object with 204 status. + :rtype: :class:`requests.models.Response` """ return super(UserManager, self).delete( |