summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-04 16:32:34 +0000
committerGerrit Code Review <review@openstack.org>2015-03-04 16:32:34 +0000
commit547dc2fcfbd49d1e220b6c2d71d26a6a14b457bd (patch)
treeae657c4272bbc8c2f1e5c351ac614c4e3deb95fa
parentc17d64563ccb4a6b840cd3f1c41fa990eb04c7c6 (diff)
parent7c55ce4a5aee24008fb8ac4ae974987071678aeb (diff)
downloadglance_store-547dc2fcfbd49d1e220b6c2d71d26a6a14b457bd.tar.gz
Merge "Unify using six.moves.range rename everywhere"
-rw-r--r--glance_store/_drivers/vmware_datastore.py2
-rw-r--r--glance_store/common/auth.py2
-rw-r--r--tests/unit/test_filesystem_store.py2
-rw-r--r--tests/unit/test_swift_store.py2
4 files changed, 8 insertions, 0 deletions
diff --git a/glance_store/_drivers/vmware_datastore.py b/glance_store/_drivers/vmware_datastore.py
index fb37adc..8f992f2 100644
--- a/glance_store/_drivers/vmware_datastore.py
+++ b/glance_store/_drivers/vmware_datastore.py
@@ -26,6 +26,8 @@ from oslo.vmware import constants
from oslo_config import cfg
from oslo_utils import excutils
from oslo_utils import units
+# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
+from six.moves import range
import six.moves.urllib.parse as urlparse
import glance_store
diff --git a/glance_store/common/auth.py b/glance_store/common/auth.py
index 76801cd..790cb0b 100644
--- a/glance_store/common/auth.py
+++ b/glance_store/common/auth.py
@@ -32,6 +32,8 @@ import httplib2
import logging
from oslo.serialization import jsonutils
+# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
+from six.moves import range
import six.moves.urllib.parse as urlparse
from glance_store import exceptions
diff --git a/tests/unit/test_filesystem_store.py b/tests/unit/test_filesystem_store.py
index f237a60..ac72e89 100644
--- a/tests/unit/test_filesystem_store.py
+++ b/tests/unit/test_filesystem_store.py
@@ -28,6 +28,8 @@ import uuid
import fixtures
from oslo_utils import units
import six
+# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
+from six.moves import range
from glance_store._drivers.filesystem import ChunkedFile
from glance_store._drivers.filesystem import Store
diff --git a/tests/unit/test_swift_store.py b/tests/unit/test_swift_store.py
index d2c3a9d..3f4ba8c 100644
--- a/tests/unit/test_swift_store.py
+++ b/tests/unit/test_swift_store.py
@@ -28,6 +28,8 @@ from oslo_utils import units
from oslotest import moxstubout
import requests_mock
import six
+# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
+from six.moves import range
import StringIO
import swiftclient