summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-04 23:31:46 +0000
committerGerrit Code Review <review@openstack.org>2016-05-04 23:31:46 +0000
commit9f217b63ade96bf1fdcc8ef73d79143eb321dc2b (patch)
tree7e89675b774175bf1d600cfe7417f41792b1baaf
parent2f2fc1a07146bb7e9be72c0e3a409cb59bda5abe (diff)
parent4c180e691fe1deed3b253016c28e8f6987436074 (diff)
downloadpython-keystoneclient-9f217b63ade96bf1fdcc8ef73d79143eb321dc2b.tar.gz
Merge "Fixing D200 PEP257 violation."
-rw-r--r--keystoneclient/base.py4
-rw-r--r--keystoneclient/httpclient.py8
-rw-r--r--tox.ini3
3 files changed, 4 insertions, 11 deletions
diff --git a/keystoneclient/base.py b/keystoneclient/base.py
index 803df15..8b36123 100644
--- a/keystoneclient/base.py
+++ b/keystoneclient/base.py
@@ -15,9 +15,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-"""
-Base utilities to build API operation managers and objects on top of.
-"""
+"""Base utilities to build API operation managers and objects on top of."""
import abc
import copy
diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py
index df8e6c9..270fc12 100644
--- a/keystoneclient/httpclient.py
+++ b/keystoneclient/httpclient.py
@@ -15,9 +15,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
-"""
-OpenStack Client interface. Handles the REST calls and responses.
-"""
+"""OpenStack Client interface. Handles the REST calls and responses."""
import logging
import warnings
@@ -637,9 +635,7 @@ class HTTPClient(baseclient.Client, base.BaseAuthPlugin):
return (keyring_key, auth_ref)
def store_auth_ref_into_keyring(self, keyring_key):
- """Store auth_ref into keyring.
-
- """
+ """Store auth_ref into keyring."""
if self.use_keyring:
try:
keyring.set_password("keystoneclient_auth",
diff --git a/tox.ini b/tox.ini
index 9dd6687..e180fbc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,8 +46,7 @@ passenv = OS_*
# D103: Missing docstring in public function
# D104: Missing docstring in public package
# D105: Missing docstring in magic method
-# D200: One-line docstring should fit on one line with quotes
-ignore = D100,D101,D102,D103,D104,D105,D200
+ignore = D100,D101,D102,D103,D104,D105
show-source = True
exclude = .venv,.tox,dist,doc,*egg,build,*openstack/common*