diff options
| -rw-r--r-- | glance_store/_drivers/filesystem.py | 4 | ||||
| -rw-r--r-- | glance_store/_drivers/gridfs.py | 2 | ||||
| -rw-r--r-- | glance_store/_drivers/s3.py | 4 | ||||
| -rw-r--r-- | glance_store/_drivers/sheepdog.py | 4 | ||||
| -rw-r--r-- | glance_store/_drivers/vmware_datastore.py | 4 | ||||
| -rw-r--r-- | glance_store/common/utils.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | tests/unit/test_filesystem_store.py | 2 | ||||
| -rw-r--r-- | tests/unit/test_s3_store.py | 2 | ||||
| -rw-r--r-- | tests/unit/test_swift_store.py | 2 | ||||
| -rw-r--r-- | tests/unit/test_vmware_store.py | 2 |
11 files changed, 15 insertions, 15 deletions
diff --git a/glance_store/_drivers/filesystem.py b/glance_store/_drivers/filesystem.py index f84be13..f45b05e 100644 --- a/glance_store/_drivers/filesystem.py +++ b/glance_store/_drivers/filesystem.py @@ -27,8 +27,8 @@ import urlparse from oslo.config import cfg from oslo.serialization import jsonutils -from oslo.utils import excutils -from oslo.utils import units +from oslo_utils import excutils +from oslo_utils import units import glance_store from glance_store.common import utils diff --git a/glance_store/_drivers/gridfs.py b/glance_store/_drivers/gridfs.py index 10754ba..c7003f7 100644 --- a/glance_store/_drivers/gridfs.py +++ b/glance_store/_drivers/gridfs.py @@ -20,7 +20,7 @@ import logging import urlparse from oslo.config import cfg -from oslo.utils import excutils +from oslo_utils import excutils import glance_store.driver from glance_store import exceptions diff --git a/glance_store/_drivers/s3.py b/glance_store/_drivers/s3.py index ae7c3c6..ef3ced1 100644 --- a/glance_store/_drivers/s3.py +++ b/glance_store/_drivers/s3.py @@ -26,8 +26,8 @@ import urlparse import boto.exception import eventlet from oslo.config import cfg -from oslo.utils import netutils -from oslo.utils import units +from oslo_utils import netutils +from oslo_utils import units import six import glance_store diff --git a/glance_store/_drivers/sheepdog.py b/glance_store/_drivers/sheepdog.py index a40acb7..a8cb851 100644 --- a/glance_store/_drivers/sheepdog.py +++ b/glance_store/_drivers/sheepdog.py @@ -20,8 +20,8 @@ import logging from oslo.concurrency import processutils from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import units +from oslo_utils import excutils +from oslo_utils import units import glance_store import glance_store.driver diff --git a/glance_store/_drivers/vmware_datastore.py b/glance_store/_drivers/vmware_datastore.py index ad2e375..3b89d4b 100644 --- a/glance_store/_drivers/vmware_datastore.py +++ b/glance_store/_drivers/vmware_datastore.py @@ -22,9 +22,9 @@ import os import socket from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import units from oslo.vmware import api +from oslo_utils import excutils +from oslo_utils import units import six.moves.urllib.parse as urlparse import glance_store diff --git a/glance_store/common/utils.py b/glance_store/common/utils.py index 6c0a2d4..48618dc 100644 --- a/glance_store/common/utils.py +++ b/glance_store/common/utils.py @@ -25,7 +25,7 @@ try: from eventlet import sleep except ImportError: from time import sleep -from oslo.utils import encodeutils +from oslo_utils import encodeutils import six diff --git a/requirements.txt b/requirements.txt index 381c84b..fd0c082 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ oslo.config>=1.2.0 oslo.i18n>=0.1.0 oslo.serialization>=1.0.0 # Apache-2.0 -oslo.utils>=1.0.0 # Apache-2.0 +oslo.utils>=1.2.0 # Apache-2.0 oslo.concurrency>=0.1.0 # Apache-2.0 stevedore>=0.12 diff --git a/tests/unit/test_filesystem_store.py b/tests/unit/test_filesystem_store.py index 0da59cf..ee979de 100644 --- a/tests/unit/test_filesystem_store.py +++ b/tests/unit/test_filesystem_store.py @@ -26,7 +26,7 @@ import StringIO import uuid import fixtures -from oslo.utils import units +from oslo_utils import units import six from glance_store._drivers.filesystem import ChunkedFile diff --git a/tests/unit/test_s3_store.py b/tests/unit/test_s3_store.py index 5078f86..27ec952 100644 --- a/tests/unit/test_s3_store.py +++ b/tests/unit/test_s3_store.py @@ -22,7 +22,7 @@ import xml.etree.ElementTree import boto.s3.connection import mock -from oslo.utils import units +from oslo_utils import units from glance_store._drivers import s3 from glance_store import exceptions diff --git a/tests/unit/test_swift_store.py b/tests/unit/test_swift_store.py index 957a570..b36ef19 100644 --- a/tests/unit/test_swift_store.py +++ b/tests/unit/test_swift_store.py @@ -25,7 +25,7 @@ import uuid import httpretty from oslo.config import cfg -from oslo.utils import units +from oslo_utils import units from oslotest import moxstubout import six import StringIO diff --git a/tests/unit/test_vmware_store.py b/tests/unit/test_vmware_store.py index d11a54d..014d037 100644 --- a/tests/unit/test_vmware_store.py +++ b/tests/unit/test_vmware_store.py @@ -19,8 +19,8 @@ import hashlib import uuid import mock -from oslo.utils import units from oslo.vmware import api +from oslo_utils import units import six import glance_store._drivers.vmware_datastore as vm_store |