diff options
author | Doug Hellmann <doug@doughellmann.com> | 2015-01-21 18:23:56 -0500 |
---|---|---|
committer | Doug Hellmann <doug@doughellmann.com> | 2015-01-21 18:23:56 -0500 |
commit | c0a43732e8a46c3e7fe4a0328aa3ed61239c0a1f (patch) | |
tree | e54bda7f0639971fbdf0cb6e8a4846f99590ce0f | |
parent | 67c6f02bb9cff33320a2a92ec3dff41c7ac75337 (diff) | |
download | oslo-db-c0a43732e8a46c3e7fe4a0328aa3ed61239c0a1f.tar.gz |
Update Oslo imports to remove namespace package
Change-Id: I4ec9b2a310471e4e07867073e9577731ac34027d
Blueprint: drop-namespace-packages
-rw-r--r-- | oslo_db/api.py | 2 | ||||
-rw-r--r-- | oslo_db/concurrency.py | 2 | ||||
-rw-r--r-- | oslo_db/options.py | 2 | ||||
-rw-r--r-- | oslo_db/sqlalchemy/models.py | 2 | ||||
-rw-r--r-- | oslo_db/sqlalchemy/session.py | 2 | ||||
-rw-r--r-- | oslo_db/sqlalchemy/utils.py | 2 | ||||
-rw-r--r-- | oslo_db/tests/sqlalchemy/test_options.py | 4 | ||||
-rw-r--r-- | oslo_db/tests/sqlalchemy/test_sqlalchemy.py | 2 | ||||
-rw-r--r-- | oslo_db/tests/test_api.py | 4 | ||||
-rw-r--r-- | oslo_db/tests/utils.py | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/oslo_db/api.py b/oslo_db/api.py index e673b37..0031e6c 100644 --- a/oslo_db/api.py +++ b/oslo_db/api.py @@ -27,7 +27,7 @@ import logging import threading import time -from oslo.utils import importutils +from oslo_utils import importutils import six from oslo_db._i18n import _LE diff --git a/oslo_db/concurrency.py b/oslo_db/concurrency.py index 2c59623..07ede0a 100644 --- a/oslo_db/concurrency.py +++ b/oslo_db/concurrency.py @@ -17,7 +17,7 @@ import copy import logging import threading -from oslo.config import cfg +from oslo_config import cfg from oslo_db._i18n import _LE from oslo_db import api diff --git a/oslo_db/options.py b/oslo_db/options.py index b855064..5daba74 100644 --- a/oslo_db/options.py +++ b/oslo_db/options.py @@ -12,7 +12,7 @@ import copy -from oslo.config import cfg +from oslo_config import cfg database_opts = [ diff --git a/oslo_db/sqlalchemy/models.py b/oslo_db/sqlalchemy/models.py index 818c1b4..80fa01d 100644 --- a/oslo_db/sqlalchemy/models.py +++ b/oslo_db/sqlalchemy/models.py @@ -22,7 +22,7 @@ SQLAlchemy models. import six -from oslo.utils import timeutils +from oslo_utils import timeutils from sqlalchemy import Column, Integer from sqlalchemy import DateTime from sqlalchemy.orm import object_mapper diff --git a/oslo_db/sqlalchemy/session.py b/oslo_db/sqlalchemy/session.py index ef253b9..7e33075 100644 --- a/oslo_db/sqlalchemy/session.py +++ b/oslo_db/sqlalchemy/session.py @@ -283,7 +283,7 @@ import logging import re import time -from oslo.utils import timeutils +from oslo_utils import timeutils import six import sqlalchemy.orm from sqlalchemy import pool diff --git a/oslo_db/sqlalchemy/utils.py b/oslo_db/sqlalchemy/utils.py index 919ac9e..5505b79 100644 --- a/oslo_db/sqlalchemy/utils.py +++ b/oslo_db/sqlalchemy/utils.py @@ -20,7 +20,7 @@ import collections import logging import re -from oslo.utils import timeutils +from oslo_utils import timeutils import six import sqlalchemy from sqlalchemy import Boolean diff --git a/oslo_db/tests/sqlalchemy/test_options.py b/oslo_db/tests/sqlalchemy/test_options.py index 22a6e4f..f58c530 100644 --- a/oslo_db/tests/sqlalchemy/test_options.py +++ b/oslo_db/tests/sqlalchemy/test_options.py @@ -11,8 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.config import fixture as config +from oslo_config import cfg +from oslo_config import fixture as config from oslo_db import options from oslo_db.tests import utils as test_utils diff --git a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py index 28ae411..7acbc1e 100644 --- a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py +++ b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py @@ -21,7 +21,7 @@ import logging import fixtures import mock -from oslo.config import cfg +from oslo_config import cfg from oslotest import base as oslo_test import sqlalchemy from sqlalchemy import Column, MetaData, Table diff --git a/oslo_db/tests/test_api.py b/oslo_db/tests/test_api.py index 5874a01..171e360 100644 --- a/oslo_db/tests/test_api.py +++ b/oslo_db/tests/test_api.py @@ -16,8 +16,8 @@ """Unit tests for DB API.""" import mock -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from oslo_db import api from oslo_db import exception diff --git a/oslo_db/tests/utils.py b/oslo_db/tests/utils.py index 44eb1ae..00eb468 100644 --- a/oslo_db/tests/utils.py +++ b/oslo_db/tests/utils.py @@ -15,7 +15,7 @@ import contextlib -from oslo.config import cfg +from oslo_config import cfg from oslotest import base as test_base from oslotest import moxstubout import six |