diff --git a/keystoneauth1/identity/v3/tokenless_auth.py b/keystoneauth1/identity/v3/tokenless_auth.py
index f1b3c7a2..c794637f 100644
--- a/keystoneauth1/identity/v3/tokenless_auth.py
+++ b/keystoneauth1/identity/v3/tokenless_auth.py
@@ -109,8 +109,8 @@ class TokenlessAuth(plugin.BaseAuthPlugin):
         :return: A valid endpoint URL or None if not available.
         :rtype: string or None
         """
-        if (service_type is plugin.AUTH_INTERFACE
-                or service_type.lower() == 'identity'):
+        if (service_type is plugin.AUTH_INTERFACE or
+                service_type.lower() == 'identity'):
             return self.auth_url
 
         return None
diff --git a/keystoneauth1/session.py b/keystoneauth1/session.py
index b0469a84..a89f0f2b 100644
--- a/keystoneauth1/session.py
+++ b/keystoneauth1/session.py
@@ -498,8 +498,8 @@ class Session(object):
         # TODO(mordred) cinder uses volume in its microversion header. This
         # logic should be handled in the future by os-service-types but for
         # now hard-code for cinder.
-        if (service_type.startswith('volume')
-                or service_type == 'block-storage'):
+        if (service_type.startswith('volume') or
+                service_type == 'block-storage'):
             service_type = 'volume'
         headers.setdefault('OpenStack-API-Version',
                            '{service_type} {microversion}'.format(