summaryrefslogtreecommitdiffstats
path: root/api/escalator/common
diff options
context:
space:
mode:
Diffstat (limited to 'api/escalator/common')
-rw-r--r--api/escalator/common/auth.py4
-rw-r--r--api/escalator/common/client.py4
-rw-r--r--api/escalator/common/config.py6
-rw-r--r--api/escalator/common/rpc.py8
-rw-r--r--api/escalator/common/utils.py8
-rw-r--r--api/escalator/common/wsgi.py10
6 files changed, 20 insertions, 20 deletions
diff --git a/api/escalator/common/auth.py b/api/escalator/common/auth.py
index d3e2893..cc65935 100644
--- a/api/escalator/common/auth.py
+++ b/api/escalator/common/auth.py
@@ -29,8 +29,8 @@ Keystone (an identity management system).
http://service_endpoint/
"""
import httplib2
-from oslo_serialization import jsonutils
-from oslo_log import log as logging
+from oslo.serialization import jsonutils
+from oslo.log import log as logging
# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
from six.moves import range
import six.moves.urllib.parse as urlparse
diff --git a/api/escalator/common/client.py b/api/escalator/common/client.py
index 586d638..7eb2a9c 100644
--- a/api/escalator/common/client.py
+++ b/api/escalator/common/client.py
@@ -40,8 +40,8 @@ try:
except ImportError:
SENDFILE_SUPPORTED = False
-from oslo_log import log as logging
-from oslo_utils import encodeutils
+from oslo.log import log as logging
+from oslo.utils import encodeutils
import six
# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
from six.moves import range
diff --git a/api/escalator/common/config.py b/api/escalator/common/config.py
index 66a59f1..a381711 100644
--- a/api/escalator/common/config.py
+++ b/api/escalator/common/config.py
@@ -24,9 +24,9 @@ import logging.handlers
import os
import tempfile
-from oslo_concurrency import lockutils
-from oslo_config import cfg
-from oslo_policy import policy
+from oslo.concurrency import lockutils
+from oslo.config import cfg
+from oslo.policy import policy
from paste import deploy
from escalator import i18n
diff --git a/api/escalator/common/rpc.py b/api/escalator/common/rpc.py
index 4d50461..9825bd6 100644
--- a/api/escalator/common/rpc.py
+++ b/api/escalator/common/rpc.py
@@ -19,10 +19,10 @@ RPC Controller
import datetime
import traceback
-from oslo_config import cfg
-from oslo_log import log as logging
-import oslo_utils.importutils as imp
-from oslo_utils import timeutils
+from oslo.config import cfg
+from oslo.log import log as logging
+import oslo.utils.importutils as imp
+from oslo.utils import timeutils
import six
from webob import exc
diff --git a/api/escalator/common/utils.py b/api/escalator/common/utils.py
index 6cb1784..df97e29 100644
--- a/api/escalator/common/utils.py
+++ b/api/escalator/common/utils.py
@@ -39,10 +39,10 @@ import uuid
import copy
from OpenSSL import crypto
-from oslo_config import cfg
-from oslo_log import log as logging
-from oslo_utils import encodeutils
-from oslo_utils import excutils
+from oslo.config import cfg
+from oslo.log import log as logging
+from oslo.utils import encodeutils
+from oslo.utils import excutils
import six
from webob import exc
from escalator.common import exception
diff --git a/api/escalator/common/wsgi.py b/api/escalator/common/wsgi.py
index 8884ea4..453eb67 100644
--- a/api/escalator/common/wsgi.py
+++ b/api/escalator/common/wsgi.py
@@ -33,11 +33,11 @@ from eventlet.green import socket
from eventlet.green import ssl
import eventlet.greenio
import eventlet.wsgi
-from oslo_serialization import jsonutils
-from oslo_concurrency import processutils
-from oslo_config import cfg
-from oslo_log import log as logging
-from oslo_log import loggers
+from oslo.serialization import jsonutils
+from oslo.concurrency import processutils
+from oslo.config import cfg
+from oslo.log import log as logging
+from oslo.log import loggers
import routes
import routes.middleware
import six