Merge "Remove six.moves.range usage"

glance/cmd/control.py

@@ -38,8 +38,6 @@ if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
 
 from oslo_config import cfg
 from oslo_utils import units
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
 
 from glance.common import config
 from glance.i18n import _

glance/common/auth.py

@@ -35,8 +35,6 @@ import httplib2
 from keystoneclient import service_catalog as ks_service_catalog
 from oslo_serialization import jsonutils
 from six.moves import http_client as http
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
 import six.moves.urllib.parse as urlparse
 
 from glance.common import exception

glance/common/client.py

@@ -44,8 +44,6 @@ from oslo_utils import encodeutils
 from oslo_utils import netutils
 import six
 from six.moves import http_client
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
 import six.moves.urllib.parse as urlparse
 
 from glance.common import auth

glance/common/crypt.py

@@ -27,8 +27,6 @@ from cryptography.hazmat.primitives.ciphers import Cipher
 from cryptography.hazmat.primitives.ciphers import modes
 from oslo_utils import encodeutils
 import six
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
 
 
 def urlsafe_encrypt(key, plaintext, blocksize=16):

glance/db/sqlalchemy/api.py

@@ -32,8 +32,6 @@ from oslo_log import log as logging
 from oslo_utils import excutils
 import osprofiler.sqlalchemy
 from retrying import retry
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
 import sqlalchemy
 from sqlalchemy.ext.compiler import compiles
 from sqlalchemy import MetaData, Table

glance/tests/functional/__init__.py

@@ -44,8 +44,6 @@ import glance_store
 from os_win import utilsfactory as os_win_utilsfactory
 from oslo_config import cfg
 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
 import testtools
 import webob

glance/tests/functional/db/base.py

@@ -22,8 +22,6 @@ import uuid
 
 from oslo_db import exception as db_exception
 from oslo_db.sqlalchemy import utils as sqlalchemyutils
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
 from six.moves import reduce
 from sqlalchemy.dialects import sqlite
 

glance/tests/functional/serial/test_scrubber.py

@@ -22,8 +22,6 @@ from oslo_config import cfg
 from oslo_serialization import jsonutils
 from oslo_utils.fixture import uuidsentinel as uuids
 from six.moves import http_client
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
 
 from glance import context
 import glance.db as db_api

glance/tests/functional/v2/test_images.py

@@ -27,8 +27,6 @@ from oslo_utils.secretutils import md5
 from oslo_utils import units
 import requests
 from six.moves import http_client as http
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
 from six.moves import urllib
 
 from glance.quota import keystone as ks_quota

glance/tests/integration/v2/test_property_quota_violations.py

@@ -16,8 +16,6 @@
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from six.moves import http_client
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
 
 from glance.tests.integration.v2 import base
 

glance/tests/unit/common/test_property_utils.py

@@ -13,9 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
-
 from glance.api import policy
 from glance.common import exception
 from glance.common import property_utils

glance/tests/unit/test_cache_middleware.py

@@ -16,9 +16,7 @@ from unittest.mock import patch
 
 from oslo_policy import policy
 from oslo_utils.fixture import uuidsentinel as uuids
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
 from six.moves import http_client as http
-from six.moves import range
 import testtools
 import webob
 

glance/tests/unit/test_context.py

@@ -13,11 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
 from unittest import mock
 
 from oslo_config import cfg
-from six.moves import range
 
 from glance import context
 from glance.tests.unit import utils as unit_utils

glance/tests/unit/test_domain_proxy.py

@@ -14,11 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
 from unittest import mock
 
-from six.moves import range
-
 from glance.domain import proxy
 import glance.tests.utils as test_utils
 

glance/tests/unit/test_image_cache.py

@@ -26,8 +26,6 @@ import glance_store as store
 from oslo_config import cfg
 from oslo_utils import secretutils
 from oslo_utils import units
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
 
 from glance import async_
 from glance.common import exception

glance/tests/unit/test_misc.py

@@ -16,8 +16,6 @@
 import os
 
 import six
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
 
 from glance.common import crypt
 from glance.common import utils

glance/tests/unit/test_quota.py

@@ -12,6 +12,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
 import copy
 import fixtures
 from unittest import mock
@@ -22,9 +23,6 @@ from oslo_limit import exception as ol_exc
 from oslo_utils import encodeutils
 from oslo_utils import units
 
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
-
 from glance.common import exception
 from glance.common import store_utils
 import glance.quota

glance/tests/unit/test_scrubber.py

@@ -19,8 +19,6 @@ import uuid
 
 import glance_store
 from oslo_config import cfg
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
 
 from glance.common import exception
 from glance.db.sqlalchemy import api as db_api

glance/tests/unit/v2/test_images_resource.py

@@ -27,8 +27,6 @@ from oslo_serialization import jsonutils
 from oslo_utils import fixture
 import six
 from six.moves import http_client as http
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
 import testtools
 import webob
 import webob.exc

glance/tests/unit/v2/test_tasks_resource.py

@@ -21,8 +21,6 @@ import uuid
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from six.moves import http_client as http
-# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
-from six.moves import range
 import webob
 
 import glance.api.v2.tasks