Merge "Revert "Switch to oslo_log""

tackerclient/client.py

@@ -18,11 +18,11 @@ try:
     import json
 except ImportError:
     import simplejson as json
+import logging
 import os
 
 from keystoneclient import access
 from keystoneclient import adapter
-from oslo_log import log as logging
 import requests
 
 from tackerclient.common import exceptions
@@ -33,13 +33,13 @@ _logger = logging.getLogger(__name__)
 
 if os.environ.get('TACKERCLIENT_DEBUG'):
     ch = logging.StreamHandler()
-    _logger.logger.setLevel(logging.DEBUG)
+    _logger.setLevel(logging.DEBUG)
     _logger.addHandler(ch)
     _requests_log_level = logging.DEBUG
 else:
     _requests_log_level = logging.WARNING
 
-logging.getLogger("requests").logger.setLevel(_requests_log_level)
+logging.getLogger("requests").setLevel(_requests_log_level)
 MAX_URI_LEN = 8192
 
 

tackerclient/common/serializer.py

@@ -13,10 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import logging
 from xml.etree import ElementTree as etree
 from xml.parsers import expat
 
-from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import six
 

tackerclient/common/utils.py

@@ -18,9 +18,9 @@
 """Utilities and helper functions."""
 
 import argparse
+import logging
 import os
 
-from oslo_log import log as logging
 from oslo_log import versionutils
 from oslo_utils import encodeutils
 from oslo_utils import importutils

tackerclient/shell.py

@@ -24,6 +24,7 @@ import argparse
 import getpass
 import inspect
 import itertools
+import logging
 import os
 import sys
 
@@ -32,7 +33,6 @@ from keystoneclient.auth.identity import v3 as v3_auth
 from keystoneclient import discover
 from keystoneclient import exceptions as ks_exc
 from keystoneclient import session
-from oslo_log import log as logging
 from oslo_utils import encodeutils
 import six.moves.urllib.parse as urlparse
 

tackerclient/tacker/v1_0/__init__.py

@@ -18,12 +18,12 @@ from __future__ import print_function
 
 import abc
 import argparse
+import logging
 import re
 
 from cliff.formatters import table
 from cliff import lister
 from cliff import show
-from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import six
 

tackerclient/tests/unit/test_command_meta.py

@@ -14,7 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_log import log as logging
+import logging
+
 import testtools
 from testtools import helpers
 

tackerclient/tests/unit/test_shell.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 import argparse
+import logging
 import os
 import re
 import six
@@ -21,7 +22,6 @@ import sys
 
 import fixtures
 import mox
-from oslo_log import log as logging
 import testtools
 from testtools import matchers
 

tackerclient/v1_0/client.py

@@ -15,9 +15,9 @@
 #    under the License.
 #
 
+import logging
 import time
 
-from oslo_log import log as logging
 import requests
 import six.moves.urllib.parse as urlparse