From 87eb9d86879981a6ee76c817633d78685213a9d3 Mon Sep 17 00:00:00 2001
From: "Chaozhe.Chen" <chaozhe.chen@easystack.cn>
Date: Sat, 26 Dec 2015 14:34:19 +0800
Subject: [PATCH] Trival: Remove unused logging import

In some files, oslo_log.log has been imported but not used.
So remove it.

Change-Id: I0cdd50fd764cfab503c1a0dd3c79d9f295eaeb8a
---
 keystone/assignment/V8_backends/sql.py           | 2 --
 keystone/assignment/backends/ldap.py             | 2 --
 keystone/assignment/backends/sql.py              | 2 --
 keystone/assignment/role_backends/ldap.py        | 2 --
 keystone/auth/plugins/mapped.py                  | 3 ---
 keystone/auth/plugins/oauth1.py                  | 4 ----
 keystone/auth/plugins/password.py                | 4 ----
 keystone/common/kvs/backends/memcached.py        | 2 --
 keystone/contrib/endpoint_policy/backends/sql.py | 4 ----
 keystone/contrib/endpoint_policy/routers.py      | 4 ----
 keystone/federation/core.py                      | 2 --
 keystone/middleware/core.py                      | 2 --
 keystone/oauth1/validator.py                     | 2 --
 keystone/resource/backends/ldap.py               | 2 --
 keystone/resource/controllers.py                 | 2 --
 keystone/revoke/core.py                          | 2 --
 keystone/tests/unit/core.py                      | 1 -
 keystone/tests/unit/test_v3_federation.py        | 2 --
 keystone/tests/unit/utils.py                     | 3 ---
 keystone/token/providers/fernet/core.py          | 2 --
 keystone/trust/backends/sql.py                   | 2 --
 keystone/trust/controllers.py                    | 3 ---
 keystone/trust/core.py                           | 3 ---
 keystone/version/controllers.py                  | 3 ---
 24 files changed, 60 deletions(-)

diff --git a/keystone/assignment/V8_backends/sql.py b/keystone/assignment/V8_backends/sql.py
index df690bca12..6ae563766e 100644
--- a/keystone/assignment/V8_backends/sql.py
+++ b/keystone/assignment/V8_backends/sql.py
@@ -13,7 +13,6 @@
 # under the License.
 
 from oslo_config import cfg
-from oslo_log import log
 import sqlalchemy
 from sqlalchemy.sql.expression import false
 
@@ -24,7 +23,6 @@ from keystone.i18n import _
 
 
 CONF = cfg.CONF
-LOG = log.getLogger(__name__)
 
 
 class AssignmentType(object):
diff --git a/keystone/assignment/backends/ldap.py b/keystone/assignment/backends/ldap.py
index 2afcc08f5d..72cfe01a74 100644
--- a/keystone/assignment/backends/ldap.py
+++ b/keystone/assignment/backends/ldap.py
@@ -15,7 +15,6 @@ from __future__ import absolute_import
 
 import ldap.filter
 from oslo_config import cfg
-from oslo_log import log
 from oslo_log import versionutils
 
 from keystone import assignment
@@ -28,7 +27,6 @@ from keystone.identity.backends import ldap as ldap_identity
 
 
 CONF = cfg.CONF
-LOG = log.getLogger(__name__)
 
 
 class Assignment(assignment.AssignmentDriverV9):
diff --git a/keystone/assignment/backends/sql.py b/keystone/assignment/backends/sql.py
index daed347a90..ee59e8328f 100644
--- a/keystone/assignment/backends/sql.py
+++ b/keystone/assignment/backends/sql.py
@@ -13,7 +13,6 @@
 # under the License.
 
 from oslo_config import cfg
-from oslo_log import log
 import sqlalchemy
 from sqlalchemy.sql.expression import false
 
@@ -24,7 +23,6 @@ from keystone.i18n import _
 
 
 CONF = cfg.CONF
-LOG = log.getLogger(__name__)
 
 
 class AssignmentType(object):
diff --git a/keystone/assignment/role_backends/ldap.py b/keystone/assignment/role_backends/ldap.py
index 3268721c18..b5eb345199 100644
--- a/keystone/assignment/role_backends/ldap.py
+++ b/keystone/assignment/role_backends/ldap.py
@@ -13,7 +13,6 @@
 from __future__ import absolute_import
 
 from oslo_config import cfg
-from oslo_log import log
 from oslo_log import versionutils
 
 from keystone import assignment
@@ -25,7 +24,6 @@ from keystone.identity.backends import ldap as ldap_identity
 
 
 CONF = cfg.CONF
-LOG = log.getLogger(__name__)
 
 
 class Role(assignment.RoleDriverV8):
diff --git a/keystone/auth/plugins/mapped.py b/keystone/auth/plugins/mapped.py
index 0a5b3d83f0..ad630911cf 100644
--- a/keystone/auth/plugins/mapped.py
+++ b/keystone/auth/plugins/mapped.py
@@ -12,7 +12,6 @@
 
 import functools
 
-from oslo_log import log
 from pycadf import cadftaxonomy as taxonomy
 from six.moves.urllib import parse
 
@@ -27,8 +26,6 @@ from keystone.models import token_model
 from keystone import notifications
 
 
-LOG = log.getLogger(__name__)
-
 METHOD_NAME = 'mapped'
 
 
diff --git a/keystone/auth/plugins/oauth1.py b/keystone/auth/plugins/oauth1.py
index e0da938abb..bf60f91c49 100644
--- a/keystone/auth/plugins/oauth1.py
+++ b/keystone/auth/plugins/oauth1.py
@@ -12,7 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo_log import log
 from oslo_utils import timeutils
 
 from keystone import auth
@@ -24,9 +23,6 @@ from keystone.oauth1 import core as oauth
 from keystone.oauth1 import validator
 
 
-LOG = log.getLogger(__name__)
-
-
 @dependency.requires('oauth_api')
 class OAuth(auth.AuthMethodHandler):
     def authenticate(self, context, auth_info, auth_context):
diff --git a/keystone/auth/plugins/password.py b/keystone/auth/plugins/password.py
index 2d1bef2d69..a16887b4c0 100644
--- a/keystone/auth/plugins/password.py
+++ b/keystone/auth/plugins/password.py
@@ -12,8 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo_log import log
-
 from keystone import auth
 from keystone.auth import plugins as auth_plugins
 from keystone.common import dependency
@@ -23,8 +21,6 @@ from keystone.i18n import _
 
 METHOD_NAME = 'password'
 
-LOG = log.getLogger(__name__)
-
 
 @dependency.requires('identity_api')
 class Password(auth.AuthMethodHandler):
diff --git a/keystone/common/kvs/backends/memcached.py b/keystone/common/kvs/backends/memcached.py
index 463c0738c7..a65cf8779f 100644
--- a/keystone/common/kvs/backends/memcached.py
+++ b/keystone/common/kvs/backends/memcached.py
@@ -21,7 +21,6 @@ from dogpile.cache import api
 from dogpile.cache.backends import memcached
 from oslo_cache.backends import memcache_pool
 from oslo_config import cfg
-from oslo_log import log
 from six.moves import range
 
 from keystone import exception
@@ -29,7 +28,6 @@ from keystone.i18n import _
 
 
 CONF = cfg.CONF
-LOG = log.getLogger(__name__)
 NO_VALUE = api.NO_VALUE
 random = _random.SystemRandom()
 
diff --git a/keystone/contrib/endpoint_policy/backends/sql.py b/keystone/contrib/endpoint_policy/backends/sql.py
index 54792f30b5..933317797a 100644
--- a/keystone/contrib/endpoint_policy/backends/sql.py
+++ b/keystone/contrib/endpoint_policy/backends/sql.py
@@ -10,14 +10,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import logging
-
 from oslo_log import versionutils
 
 from keystone.endpoint_policy.backends import sql
 
-LOG = logging.getLogger(__name__)
-
 _OLD = 'keystone.contrib.endpoint_policy.backends.sql.EndpointPolicy'
 _NEW = 'keystone.endpoint_policy.backends.sql.EndpointPolicy'
 
diff --git a/keystone/contrib/endpoint_policy/routers.py b/keystone/contrib/endpoint_policy/routers.py
index 714d166360..c8f7f15468 100644
--- a/keystone/contrib/endpoint_policy/routers.py
+++ b/keystone/contrib/endpoint_policy/routers.py
@@ -10,14 +10,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import logging
-
 from oslo_log import versionutils
 
 from keystone.common import wsgi
 
-LOG = logging.getLogger(__name__)
-
 _OLD = 'keystone.contrib.endpoint_policy.routers.EndpointPolicyExtension'
 _NEW = 'keystone.endpoint_policy.routers.Routers'
 
diff --git a/keystone/federation/core.py b/keystone/federation/core.py
index 3fc1244065..43638cd68b 100644
--- a/keystone/federation/core.py
+++ b/keystone/federation/core.py
@@ -15,7 +15,6 @@
 import abc
 
 from oslo_config import cfg
-from oslo_log import log as logging
 import six
 
 from keystone.common import dependency
@@ -26,7 +25,6 @@ from keystone.federation import utils
 
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
 EXTENSION_DATA = {
     'name': 'OpenStack Federation APIs',
     'namespace': 'http://docs.openstack.org/identity/api/ext/'
diff --git a/keystone/middleware/core.py b/keystone/middleware/core.py
index 0efbbd836c..daa5a5aa4c 100644
--- a/keystone/middleware/core.py
+++ b/keystone/middleware/core.py
@@ -13,7 +13,6 @@
 # under the License.
 
 from oslo_config import cfg
-from oslo_log import log
 from oslo_serialization import jsonutils
 
 from keystone.common import wsgi
@@ -21,7 +20,6 @@ from keystone import exception
 
 
 CONF = cfg.CONF
-LOG = log.getLogger(__name__)
 
 
 # Header used to transmit the auth token
diff --git a/keystone/oauth1/validator.py b/keystone/oauth1/validator.py
index 8023abf4ce..f21a02d7d0 100644
--- a/keystone/oauth1/validator.py
+++ b/keystone/oauth1/validator.py
@@ -14,7 +14,6 @@
 
 """oAuthlib request validator."""
 
-from oslo_log import log
 import six
 
 from keystone.common import dependency
@@ -23,7 +22,6 @@ from keystone.oauth1 import core as oauth1
 
 
 METHOD_NAME = 'oauth_validator'
-LOG = log.getLogger(__name__)
 
 
 @dependency.requires('oauth_api')
diff --git a/keystone/resource/backends/ldap.py b/keystone/resource/backends/ldap.py
index b8f733a575..5f6d8e0c9c 100644
--- a/keystone/resource/backends/ldap.py
+++ b/keystone/resource/backends/ldap.py
@@ -15,7 +15,6 @@ from __future__ import absolute_import
 import uuid
 
 from oslo_config import cfg
-from oslo_log import log
 from oslo_log import versionutils
 
 from keystone.common import clean
@@ -29,7 +28,6 @@ from keystone import resource
 
 
 CONF = cfg.CONF
-LOG = log.getLogger(__name__)
 
 
 class Resource(resource.ResourceDriverV8):
diff --git a/keystone/resource/controllers.py b/keystone/resource/controllers.py
index 3e6104c125..ef28085cbf 100644
--- a/keystone/resource/controllers.py
+++ b/keystone/resource/controllers.py
@@ -18,7 +18,6 @@
 import uuid
 
 from oslo_config import cfg
-from oslo_log import log
 
 from keystone.common import controller
 from keystone.common import dependency
@@ -31,7 +30,6 @@ from keystone.resource import schema
 
 
 CONF = cfg.CONF
-LOG = log.getLogger(__name__)
 
 
 @dependency.requires('resource_api')
diff --git a/keystone/revoke/core.py b/keystone/revoke/core.py
index d9b3df36c8..0b2bc9403e 100644
--- a/keystone/revoke/core.py
+++ b/keystone/revoke/core.py
@@ -16,7 +16,6 @@ import abc
 import datetime
 
 from oslo_config import cfg
-from oslo_log import log
 from oslo_log import versionutils
 from oslo_utils import timeutils
 import six
@@ -32,7 +31,6 @@ from keystone.revoke import model
 
 
 CONF = cfg.CONF
-LOG = log.getLogger(__name__)
 
 
 EXTENSION_DATA = {
diff --git a/keystone/tests/unit/core.py b/keystone/tests/unit/core.py
index 45665a4cbc..6a9c40bcd4 100644
--- a/keystone/tests/unit/core.py
+++ b/keystone/tests/unit/core.py
@@ -63,7 +63,6 @@ from keystone.version import service
 
 config.configure()
 
-LOG = log.getLogger(__name__)
 PID = six.text_type(os.getpid())
 TESTSDIR = os.path.dirname(os.path.abspath(__file__))
 TESTCONF = os.path.join(TESTSDIR, 'config_files')
diff --git a/keystone/tests/unit/test_v3_federation.py b/keystone/tests/unit/test_v3_federation.py
index 17720efe6a..2efbda300d 100644
--- a/keystone/tests/unit/test_v3_federation.py
+++ b/keystone/tests/unit/test_v3_federation.py
@@ -19,7 +19,6 @@ import fixtures
 from lxml import etree
 import mock
 from oslo_config import cfg
-from oslo_log import log
 from oslo_log import versionutils
 from oslo_utils import importutils
 from oslotest import mockpatch
@@ -51,7 +50,6 @@ from keystone.token.providers import common as token_common
 subprocess = environment.subprocess
 
 CONF = cfg.CONF
-LOG = log.getLogger(__name__)
 ROOTDIR = os.path.dirname(os.path.abspath(__file__))
 XMLDIR = os.path.join(ROOTDIR, 'saml2/')
 
diff --git a/keystone/tests/unit/utils.py b/keystone/tests/unit/utils.py
index 93a57af99e..e3e49e70dc 100644
--- a/keystone/tests/unit/utils.py
+++ b/keystone/tests/unit/utils.py
@@ -17,13 +17,10 @@ import os
 import time
 import uuid
 
-from oslo_log import log
 import six
 from testtools import testcase
 
 
-LOG = log.getLogger(__name__)
-
 TZ = None
 
 
diff --git a/keystone/token/providers/fernet/core.py b/keystone/token/providers/fernet/core.py
index 643250f658..631afae5a2 100644
--- a/keystone/token/providers/fernet/core.py
+++ b/keystone/token/providers/fernet/core.py
@@ -11,7 +11,6 @@
 # under the License.
 
 from oslo_config import cfg
-from oslo_log import log
 
 from keystone.common import dependency
 from keystone.common import utils as ks_utils
@@ -24,7 +23,6 @@ from keystone.token.providers.fernet import token_formatters as tf
 
 
 CONF = cfg.CONF
-LOG = log.getLogger(__name__)
 
 
 @dependency.requires('trust_api')
diff --git a/keystone/trust/backends/sql.py b/keystone/trust/backends/sql.py
index 29daf5b645..e3c8822116 100644
--- a/keystone/trust/backends/sql.py
+++ b/keystone/trust/backends/sql.py
@@ -14,7 +14,6 @@
 
 import time
 
-from oslo_log import log
 from oslo_utils import timeutils
 from six.moves import range
 
@@ -23,7 +22,6 @@ from keystone import exception
 from keystone import trust
 
 
-LOG = log.getLogger(__name__)
 # The maximum number of iterations that will be attempted for optimistic
 # locking on consuming a limited-use trust.
 MAXIMUM_CONSUME_ATTEMPTS = 10
diff --git a/keystone/trust/controllers.py b/keystone/trust/controllers.py
index c55c468511..d91894157c 100644
--- a/keystone/trust/controllers.py
+++ b/keystone/trust/controllers.py
@@ -15,7 +15,6 @@
 import uuid
 
 from oslo_config import cfg
-from oslo_log import log
 from oslo_utils import timeutils
 import six
 
@@ -32,8 +31,6 @@ from keystone.trust import schema
 
 CONF = cfg.CONF
 
-LOG = log.getLogger(__name__)
-
 
 def _trustor_trustee_only(trust, user_id):
     if (user_id != trust.get('trustee_user_id') and
diff --git a/keystone/trust/core.py b/keystone/trust/core.py
index dc80c1d5d5..0bfcfaea0e 100644
--- a/keystone/trust/core.py
+++ b/keystone/trust/core.py
@@ -17,7 +17,6 @@
 import abc
 
 from oslo_config import cfg
-from oslo_log import log
 import six
 from six.moves import zip
 
@@ -30,8 +29,6 @@ from keystone import notifications
 
 CONF = cfg.CONF
 
-LOG = log.getLogger(__name__)
-
 
 @dependency.requires('identity_api')
 @dependency.provider('trust_api')
diff --git a/keystone/version/controllers.py b/keystone/version/controllers.py
index 682f7066c1..68f5ffbaed 100644
--- a/keystone/version/controllers.py
+++ b/keystone/version/controllers.py
@@ -12,7 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo_log import log
 from oslo_serialization import jsonutils
 import webob
 
@@ -22,8 +21,6 @@ from keystone.common import wsgi
 from keystone import exception
 
 
-LOG = log.getLogger(__name__)
-
 MEDIA_TYPE_JSON = 'application/vnd.openstack.identity-%s+json'
 
 _VERSIONS = []