Merge "fix bug:range() is not same in py3.x and py2.x"

glance/cmd/control.py

@@ -40,6 +40,7 @@ if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
 from oslo.config import cfg
+from six.moves import xrange
 
 from glance.common import config
 from glance.openstack.common import units

glance/common/client.py

@@ -38,6 +38,7 @@ try:
     SENDFILE_SUPPORTED = True
 except ImportError:
     SENDFILE_SUPPORTED = False
+from six.moves import xrange
 
 from glance.common import auth
 from glance.common import exception, utils

glance/db/sqlalchemy/api.py

@@ -21,6 +21,7 @@
 """Defines interface for DB access."""
 
 from oslo.config import cfg
+from six.moves import xrange
 import sqlalchemy
 import sqlalchemy.orm as sa_orm
 import sqlalchemy.sql as sa_sql

glance/tests/functional/test_bin_glance_cache_manage.py

@@ -21,6 +21,8 @@ import httplib2
 import os
 import sys
 
+from six.moves import xrange
+
 from glance.openstack.common import jsonutils
 from glance.openstack.common import units
 from glance.tests import functional

glance/tests/functional/test_cache_middleware.py

@@ -27,6 +27,7 @@ import sys
 import time
 
 import httplib2
+from six.moves import xrange
 
 from glance.openstack.common import jsonutils
 from glance.openstack.common import units

glance/tests/functional/test_scrubber.py

@@ -18,6 +18,7 @@ import sys
 import time
 
 import httplib2
+from six.moves import xrange
 import swiftclient
 
 from glance.common import crypt

glance/tests/functional/v1/test_copy_to_file.py

@@ -24,6 +24,8 @@ import httplib2
 import tempfile
 import time
 
+from six.moves import xrange
+
 from glance.openstack.common import jsonutils
 from glance.openstack.common import units
 from glance.tests import functional

glance/tests/unit/common/test_property_utils.py

@@ -13,6 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from six.moves import xrange
+
 from glance.api import policy
 from glance.common import exception
 from glance.common import property_utils

glance/tests/unit/test_domain_proxy.py

@@ -15,6 +15,7 @@
 #    under the License.
 
 import mock
+from six.moves import xrange
 
 from glance.domain import proxy
 import glance.tests.utils as test_utils

glance/tests/unit/test_http_store.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from six.moves import xrange
 import stubout
 
 from glance.common import exception

glance/tests/unit/test_image_cache.py

@@ -22,6 +22,7 @@ import tempfile
 import time
 
 import fixtures
+from six.moves import xrange
 import stubout
 
 from glance.common import exception

glance/tests/unit/test_migrations.py

@@ -35,6 +35,7 @@ import uuid
 
 from migrate.versioning.repository import Repository
 from oslo.config import cfg
+from six.moves import xrange
 import sqlalchemy
 
 from glance.common import crypt