diff options
| -rw-r--r-- | keystonemiddleware/audit.py | 2 | ||||
| -rw-r--r-- | keystonemiddleware/auth_token/__init__.py | 4 | ||||
| -rw-r--r-- | keystonemiddleware/auth_token/_memcache_crypt.py | 4 | ||||
| -rw-r--r-- | keystonemiddleware/auth_token/_user_plugin.py | 2 | ||||
| -rw-r--r-- | keystonemiddleware/ec2_token.py | 2 | ||||
| -rw-r--r-- | keystonemiddleware/s3_token.py | 2 | ||||
| -rw-r--r-- | tox.ini | 4 |
7 files changed, 9 insertions, 11 deletions
diff --git a/keystonemiddleware/audit.py b/keystonemiddleware/audit.py index 1e53b28..115071c 100644 --- a/keystonemiddleware/audit.py +++ b/keystonemiddleware/audit.py @@ -444,7 +444,7 @@ class AuditMiddleware(object): def filter_factory(global_conf, **local_conf): - """Returns a WSGI filter app for use with paste.deploy.""" + """Return a WSGI filter app for use with paste.deploy.""" conf = global_conf.copy() conf.update(local_conf) diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py index 959a43d..65d1443 100644 --- a/keystonemiddleware/auth_token/__init__.py +++ b/keystonemiddleware/auth_token/__init__.py @@ -915,7 +915,7 @@ class AuthProtocol(BaseAuthProtocol): raise ksm_exceptions.InvalidToken(msg) def _cms_verify(self, data, inform=cms.PKI_ASN1_FORM): - """Verifies the signature of the provided data's IAW CMS syntax. + """Verify the signature of the provided data's IAW CMS syntax. If either of the certificate files might be missing, fetch them and retry. @@ -1100,7 +1100,7 @@ class AuthProtocol(BaseAuthProtocol): def filter_factory(global_conf, **local_conf): - """Returns a WSGI filter app for use with paste.deploy.""" + """Return a WSGI filter app for use with paste.deploy.""" conf = global_conf.copy() conf.update(local_conf) diff --git a/keystonemiddleware/auth_token/_memcache_crypt.py b/keystonemiddleware/auth_token/_memcache_crypt.py index 2c88733..0efe0b7 100644 --- a/keystonemiddleware/auth_token/_memcache_crypt.py +++ b/keystonemiddleware/auth_token/_memcache_crypt.py @@ -88,7 +88,7 @@ if sys.version_info >= (3, 3): constant_time_compare = hmac.compare_digest else: def constant_time_compare(first, second): - """Returns True if both string inputs are equal, otherwise False. + """Return True if both string inputs are equal, otherwise False. This function should take a constant amount of time regardless of how many characters in the strings match. @@ -107,7 +107,7 @@ else: def derive_keys(token, secret, strategy): - """Derives keys for MAC and ENCRYPTION from the user-provided secret. + """Derive keys for MAC and ENCRYPTION from the user-provided secret. The resulting keys should be passed to the protect and unprotect functions. diff --git a/keystonemiddleware/auth_token/_user_plugin.py b/keystonemiddleware/auth_token/_user_plugin.py index ba4417b..75d09e7 100644 --- a/keystonemiddleware/auth_token/_user_plugin.py +++ b/keystonemiddleware/auth_token/_user_plugin.py @@ -95,7 +95,7 @@ class _TokenData(object): @property def trust_id(self): - """Returns the trust id associated with the authentication request.. + """Return the trust id associated with the authentication request.. :rtype: str """ diff --git a/keystonemiddleware/ec2_token.py b/keystonemiddleware/ec2_token.py index 0ee97e9..83b7809 100644 --- a/keystonemiddleware/ec2_token.py +++ b/keystonemiddleware/ec2_token.py @@ -206,7 +206,7 @@ class EC2Token(object): def filter_factory(global_conf, **local_conf): - """Returns a WSGI filter app for use with paste.deploy.""" + """Return a WSGI filter app for use with paste.deploy.""" conf = global_conf.copy() conf.update(local_conf) diff --git a/keystonemiddleware/s3_token.py b/keystonemiddleware/s3_token.py index d71ab27..2ce284c 100644 --- a/keystonemiddleware/s3_token.py +++ b/keystonemiddleware/s3_token.py @@ -261,7 +261,7 @@ class S3Token(object): def filter_factory(global_conf, **local_conf): - """Returns a WSGI filter app for use with paste.deploy.""" + """Return a WSGI filter app for use with paste.deploy.""" conf = global_conf.copy() conf.update(local_conf) @@ -47,9 +47,7 @@ commands = oslo_debug_helper {posargs} # D209: Multi-line docstring closing quotes should be on a separate line # D301: Use r""" if any backslashes in a docstring # D400: First line should end with a period -# D401: First line should be in imperative mood -# H403: multi line docstrings should end on a new line -ignore = D100,D101,D102,D103,D104,D105,D200,D202,D209,D301,D204,D400,D401,H403 +ignore = D100,D101,D102,D103,D104,D105,D200,D202,D209,D301,D204,D400 show-source = True exclude = .venv,.tox,dist,doc,*egg,build,*openstack/common* |