summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-17 21:19:33 +0000
committerGerrit Code Review <review@openstack.org>2017-01-17 21:19:33 +0000
commit3a36cc2d0a8504a9df77c5a833edc50a88828252 (patch)
treec1d8f4a58e1f5232e46c21092aaed3447869373b
parent50ffbe30235054d9c255dd34d4d88355938a72e1 (diff)
parentf4d453ec30dacc6824ca6148a56ae91249979dce (diff)
Merge "use oslo.log instead of logging"4.14.0
-rw-r--r--keystonemiddleware/audit/__init__.py2
-rw-r--r--keystonemiddleware/audit/_api.py2
-rw-r--r--keystonemiddleware/auth_token/__init__.py2
-rw-r--r--keystonemiddleware/auth_token/_auth.py3
-rw-r--r--keystonemiddleware/auth_token/_memcache_pool.py2
-rw-r--r--keystonemiddleware/auth_token/_revocations.py2
-rw-r--r--keystonemiddleware/auth_token/_signing_dir.py2
-rw-r--r--keystonemiddleware/ec2_token.py2
-rw-r--r--keystonemiddleware/fixture.py2
-rw-r--r--keystonemiddleware/s3_token.py2
-rw-r--r--keystonemiddleware/tests/unit/auth_token/base.py3
-rw-r--r--keystonemiddleware/tests/unit/auth_token/test_auth.py2
-rw-r--r--keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py2
-rw-r--r--keystonemiddleware/tests/unit/utils.py2
-rw-r--r--requirements.txt1
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.
21 21
22import copy 22import copy
23import functools 23import functools
24import logging
25 24
26from oslo_config import cfg 25from oslo_config import cfg
27from oslo_context import context as oslo_context 26from oslo_context import context as oslo_context
27from oslo_log import log as logging
28from pycadf import cadftaxonomy as taxonomy 28from pycadf import cadftaxonomy as taxonomy
29from pycadf import cadftype 29from pycadf import cadftype
30from pycadf import reason 30from 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 @@
11# under the License. 11# under the License.
12 12
13import collections 13import collections
14import logging
15import re 14import re
16 15
16from oslo_log import log as logging
17from oslo_serialization import jsonutils 17from oslo_serialization import jsonutils
18from pycadf import cadftaxonomy as taxonomy 18from pycadf import cadftaxonomy as taxonomy
19from pycadf import cadftype 19from 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.
215import binascii 215import binascii
216import copy 216import copy
217import datetime 217import datetime
218import logging
219import warnings 218import warnings
220 219
221from keystoneauth1 import access 220from keystoneauth1 import access
@@ -226,6 +225,7 @@ from keystoneauth1 import loading
226from keystoneauth1.loading import session as session_loading 225from keystoneauth1.loading import session as session_loading
227from keystoneclient.common import cms 226from keystoneclient.common import cms
228from keystoneclient import exceptions as ksc_exceptions 227from keystoneclient import exceptions as ksc_exceptions
228from oslo_log import log as logging
229from oslo_serialization import jsonutils 229from oslo_serialization import jsonutils
230import six 230import six
231import webob.dec 231import 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 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13import logging
14
15from keystoneauth1 import discover 13from keystoneauth1 import discover
16from keystoneauth1.identity import v2 14from keystoneauth1.identity import v2
17from keystoneauth1 import plugin 15from keystoneauth1 import plugin
18from keystoneauth1 import token_endpoint 16from keystoneauth1 import token_endpoint
19from oslo_config import cfg 17from oslo_config import cfg
18from oslo_log import log as logging
20 19
21from keystonemiddleware.auth_token import _base 20from keystonemiddleware.auth_token import _base
22from keystonemiddleware.i18n import _, _LW 21from 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 @@
21import collections 21import collections
22import contextlib 22import contextlib
23import itertools 23import itertools
24import logging
25import time 24import time
26 25
26from oslo_log import log as logging
27from six.moves import queue 27from six.moves import queue
28 28
29from keystonemiddleware.i18n import _LC 29from 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 @@
11# under the License. 11# under the License.
12 12
13import datetime 13import datetime
14import logging
15import os 14import os
16 15
16from oslo_log import log as logging
17from oslo_serialization import jsonutils 17from oslo_serialization import jsonutils
18from oslo_utils import timeutils 18from oslo_utils import timeutils
19 19
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 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13import logging
14import os 13import os
15import stat 14import stat
16import tempfile 15import tempfile
17 16
17from oslo_log import log as logging
18import six 18import six
19 19
20from keystonemiddleware.auth_token import _exceptions as exc 20from 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 @@
18"""Starting point for routing EC2 requests.""" 18"""Starting point for routing EC2 requests."""
19 19
20import hashlib 20import hashlib
21import logging
22 21
23from oslo_config import cfg 22from oslo_config import cfg
23from oslo_log import log as logging
24from oslo_serialization import jsonutils 24from oslo_serialization import jsonutils
25import requests 25import requests
26import six 26import 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 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13import logging
14import uuid 13import uuid
15 14
16import fixtures 15import fixtures
17from keystoneauth1 import fixture as client_fixtures 16from keystoneauth1 import fixture as client_fixtures
17from oslo_log import log as logging
18from oslo_utils import timeutils 18from oslo_utils import timeutils
19from positional import positional 19from positional import positional
20 20
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:
31 31
32""" 32"""
33 33
34import logging
35import webob 34import webob
36 35
36from oslo_log import log as logging
37from oslo_serialization import jsonutils 37from oslo_serialization import jsonutils
38from oslo_utils import strutils 38from oslo_utils import strutils
39import requests 39import 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 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13import logging
14
15import fixtures 13import fixtures
16from oslo_config import cfg 14from oslo_config import cfg
17from oslo_config import fixture as cfg_fixture 15from oslo_config import fixture as cfg_fixture
16from oslo_log import log as logging
18from requests_mock.contrib import fixture as rm_fixture 17from requests_mock.contrib import fixture as rm_fixture
19import six 18import six
20from six.moves import http_client 19from 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 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13import logging
14import uuid 13import uuid
15 14
16from keystoneauth1 import fixture 15from keystoneauth1 import fixture
17from keystoneauth1 import plugin as ksa_plugin 16from keystoneauth1 import plugin as ksa_plugin
18from keystoneauth1 import session 17from keystoneauth1 import session
18from oslo_log import log as logging
19from requests_mock.contrib import fixture as rm_fixture 19from requests_mock.contrib import fixture as rm_fixture
20import six 20import six
21 21
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 @@
13# under the License. 13# under the License.
14 14
15import datetime 15import datetime
16import logging
17import os 16import os
18import shutil 17import shutil
19import stat 18import stat
@@ -29,6 +28,7 @@ from keystoneauth1 import session
29from keystoneclient.common import cms 28from keystoneclient.common import cms
30from keystoneclient import exceptions as ksc_exceptions 29from keystoneclient import exceptions as ksc_exceptions
31import mock 30import mock
31from oslo_log import log as logging
32from oslo_serialization import jsonutils 32from oslo_serialization import jsonutils
33from oslo_utils import timeutils 33from oslo_utils import timeutils
34import pbr.version 34import 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 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13import logging
14import sys 13import sys
15import time 14import time
16import uuid 15import uuid
@@ -18,6 +17,7 @@ import warnings
18 17
19import fixtures 18import fixtures
20import mock 19import mock
20from oslo_log import log as logging
21import oslotest.base as oslotest 21import oslotest.base as oslotest
22import requests 22import requests
23import webob 23import 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
6oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 6oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
7oslo.context>=2.9.0 # Apache-2.0 7oslo.context>=2.9.0 # Apache-2.0
8oslo.i18n>=2.1.0 # Apache-2.0 8oslo.i18n>=2.1.0 # Apache-2.0
9oslo.log>=3.11.0 # Apache-2.0
9oslo.serialization>=1.10.0 # Apache-2.0 10oslo.serialization>=1.10.0 # Apache-2.0
10oslo.utils>=3.18.0 # Apache-2.0 11oslo.utils>=3.18.0 # Apache-2.0
11pbr>=1.8 # Apache-2.0 12pbr>=1.8 # Apache-2.0