Merge "use oslo.log instead of logging"ocata-em4.14.0

15 files changed, 15 insertions, 16 deletions

diff --git a/keystonemiddleware/audit/__init__.py b/keystonemiddleware/audit/__init__.py
index 546a55c..ade5891 100644
--- a/keystonemiddleware/audit/__init__.py
+++ b/keystonemiddleware/audit/__init__.py
@@ -21,10 +21,10 @@ provides.
 
 import copy
 import functools
-import logging
 
 from oslo_config import cfg
 from oslo_context import context as oslo_context
+from oslo_log import log as logging
 from pycadf import cadftaxonomy as taxonomy
 from pycadf import cadftype
 from pycadf import reason
diff --git a/keystonemiddleware/audit/_api.py b/keystonemiddleware/audit/_api.py
index 0d3361f..4e453f7 100644
--- a/keystonemiddleware/audit/_api.py
+++ b/keystonemiddleware/audit/_api.py
@@ -11,9 +11,9 @@
 # under the License.
 
 import collections
-import logging
 import re
 
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from pycadf import cadftaxonomy as taxonomy
 from pycadf import cadftype
diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py
index c2d886e..8d86ce4 100644
--- a/keystonemiddleware/auth_token/__init__.py
+++ b/keystonemiddleware/auth_token/__init__.py
@@ -215,7 +215,6 @@ object is stored.
 import binascii
 import copy
 import datetime
-import logging
 import warnings
 
 from keystoneauth1 import access
@@ -226,6 +225,7 @@ from keystoneauth1 import loading
 from keystoneauth1.loading import session as session_loading
 from keystoneclient.common import cms
 from keystoneclient import exceptions as ksc_exceptions
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import six
 import webob.dec
diff --git a/keystonemiddleware/auth_token/_auth.py b/keystonemiddleware/auth_token/_auth.py
index de98c95..84c7538 100644
--- a/keystonemiddleware/auth_token/_auth.py
+++ b/keystonemiddleware/auth_token/_auth.py
@@ -10,13 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import logging
-
 from keystoneauth1 import discover
 from keystoneauth1.identity import v2
 from keystoneauth1 import plugin
 from keystoneauth1 import token_endpoint
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from keystonemiddleware.auth_token import _base
 from keystonemiddleware.i18n import _, _LW
diff --git a/keystonemiddleware/auth_token/_memcache_pool.py b/keystonemiddleware/auth_token/_memcache_pool.py
index de0d3c3..360be39 100644
--- a/keystonemiddleware/auth_token/_memcache_pool.py
+++ b/keystonemiddleware/auth_token/_memcache_pool.py
@@ -21,9 +21,9 @@
 import collections
 import contextlib
 import itertools
-import logging
 import time
 
+from oslo_log import log as logging
 from six.moves import queue
 
 from keystonemiddleware.i18n import _LC
diff --git a/keystonemiddleware/auth_token/_revocations.py b/keystonemiddleware/auth_token/_revocations.py
index a68356a..b6d0fa3 100644
--- a/keystonemiddleware/auth_token/_revocations.py
+++ b/keystonemiddleware/auth_token/_revocations.py
@@ -11,9 +11,9 @@
 # under the License.
 
 import datetime
-import logging
 import os
 
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 
diff --git a/keystonemiddleware/auth_token/_signing_dir.py b/keystonemiddleware/auth_token/_signing_dir.py
index 3ef53ac..b843447 100644
--- a/keystonemiddleware/auth_token/_signing_dir.py
+++ b/keystonemiddleware/auth_token/_signing_dir.py
@@ -10,11 +10,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import logging
 import os
 import stat
 import tempfile
 
+from oslo_log import log as logging
 import six
 
 from keystonemiddleware.auth_token import _exceptions as exc
diff --git a/keystonemiddleware/ec2_token.py b/keystonemiddleware/ec2_token.py
index 27375a7..5fe6096 100644
--- a/keystonemiddleware/ec2_token.py
+++ b/keystonemiddleware/ec2_token.py
@@ -18,9 +18,9 @@
 """Starting point for routing EC2 requests."""
 
 import hashlib
-import logging
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import requests
 import six
diff --git a/keystonemiddleware/fixture.py b/keystonemiddleware/fixture.py
index ca8ef2e..add22d3 100644
--- a/keystonemiddleware/fixture.py
+++ b/keystonemiddleware/fixture.py
@@ -10,11 +10,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import logging
 import uuid
 
 import fixtures
 from keystoneauth1 import fixture as client_fixtures
+from oslo_log import log as logging
 from oslo_utils import timeutils
 from positional import positional
 
diff --git a/keystonemiddleware/s3_token.py b/keystonemiddleware/s3_token.py
index 6da8b41..c1f0ff7 100644
--- a/keystonemiddleware/s3_token.py
+++ b/keystonemiddleware/s3_token.py
@@ -31,9 +31,9 @@ This WSGI component:
 
 """
 
-import logging
 import webob
 
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import strutils
 import requests
diff --git a/keystonemiddleware/tests/unit/auth_token/base.py b/keystonemiddleware/tests/unit/auth_token/base.py
index 1ff4816..34a50f9 100644
--- a/keystonemiddleware/tests/unit/auth_token/base.py
+++ b/keystonemiddleware/tests/unit/auth_token/base.py
@@ -10,11 +10,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import logging
-
 import fixtures
 from oslo_config import cfg
 from oslo_config import fixture as cfg_fixture
+from oslo_log import log as logging
 from requests_mock.contrib import fixture as rm_fixture
 import six
 from six.moves import http_client
diff --git a/keystonemiddleware/tests/unit/auth_token/test_auth.py b/keystonemiddleware/tests/unit/auth_token/test_auth.py
index c22f35a..f3b48aa 100644
--- a/keystonemiddleware/tests/unit/auth_token/test_auth.py
+++ b/keystonemiddleware/tests/unit/auth_token/test_auth.py
@@ -10,12 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import logging
 import uuid
 
 from keystoneauth1 import fixture
 from keystoneauth1 import plugin as ksa_plugin
 from keystoneauth1 import session
+from oslo_log import log as logging
 from requests_mock.contrib import fixture as rm_fixture
 import six
 
diff --git a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
index 224dc34..2165660 100644
--- a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
+++ b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
@@ -13,7 +13,6 @@
 # under the License.
 
 import datetime
-import logging
 import os
 import shutil
 import stat
@@ -29,6 +28,7 @@ from keystoneauth1 import session
 from keystoneclient.common import cms
 from keystoneclient import exceptions as ksc_exceptions
 import mock
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 import pbr.version
diff --git a/keystonemiddleware/tests/unit/utils.py b/keystonemiddleware/tests/unit/utils.py
index 38a0d95..6a07ec1 100644
--- a/keystonemiddleware/tests/unit/utils.py
+++ b/keystonemiddleware/tests/unit/utils.py
@@ -10,7 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
 import sys
 import time
 import uuid
@@ -18,6 +17,7 @@ import warnings
 
 import fixtures
 import mock
+from oslo_log import log as logging
 import oslotest.base as oslotest
 import requests
 import webob
diff --git a/requirements.txt b/requirements.txt
index abd56e8..70df7e1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,6 +6,7 @@ keystoneauth1>=2.17.0 # Apache-2.0
 oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
 oslo.context>=2.9.0 # Apache-2.0
 oslo.i18n>=2.1.0 # Apache-2.0
+oslo.log>=3.11.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
 oslo.utils>=3.18.0 # Apache-2.0
 pbr>=1.8 # Apache-2.0