Merge "Use logging intead of oslo_log"

oslo_privsep/comm.py

@@ -21,13 +21,13 @@ bytes of UTF-8 JSON data.
 """
 
 import json
+import logging
 import socket
 import struct
 import threading
 
 import six
 
-from oslo_log import log as logging
 from oslo_privsep._i18n import _
 
 

oslo_privsep/priv_context.py

@@ -15,10 +15,10 @@
 
 import enum
 import functools
+import logging
 
 from oslo_config import cfg
 from oslo_config import types
-from oslo_log import log as logging
 
 from oslo_privsep import capabilities
 from oslo_privsep import daemon

oslo_privsep/tests/fixture.py

@@ -14,11 +14,11 @@
 
 
 import fixtures
+import logging
 import os
 import sys
 
 from oslo_config import fixture as cfg_fixture
-from oslo_log import log as logging
 
 from oslo_privsep import priv_context
 

oslo_privsep/tests/test_daemon.py

@@ -13,11 +13,11 @@
 #    under the License.
 
 import fixtures
+import logging
 import mock
 import platform
 import time
 
-from oslo_log import log as logging
 from oslotest import base
 import testtools
 

oslo_privsep/tests/test_priv_context.py

@@ -13,12 +13,12 @@
 #    under the License.
 
 
+import logging
 import os
 import pipes
 import platform
 import sys
 
-from oslo_log import log as logging
 import testtools
 
 from oslo_privsep import daemon