Merge "use oslo.log instead of logging"

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

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

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

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

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

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
 

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

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

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
 

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

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

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
 

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

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

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