From ed197a5f109409bd68ce19f0cc9f92cd5b108b46 Mon Sep 17 00:00:00 2001 From: Valeriy Ponomaryov Date: Mon, 7 Jul 2014 12:07:12 -0400 Subject: [PATCH] py33: use six.iteritems for item iterations (part1) Partially-implements blueprint py3-compatibility Change-Id: I0c3356cbaefeb77b6543711d79c370b3f1032683 --- manila/api/common.py | 12 ++++-------- manila/api/extensions.py | 11 ++++------- manila/api/v1/security_service.py | 5 ++--- manila/api/v1/share_networks.py | 5 +++-- manila/api/v1/shares.py | 3 ++- manila/api/views/limits.py | 6 +++--- manila/quota.py | 5 ++--- manila/scheduler/host_manager.py | 6 +++--- manila/share/api.py | 19 ++++++++----------- manila/share/volume_types.py | 12 ++++++------ manila/test.py | 3 ++- manila/wsgi.py | 6 ++---- 12 files changed, 41 insertions(+), 52 deletions(-) diff --git a/manila/api/common.py b/manila/api/common.py index ceff512b6e..7164b0bd4e 100644 --- a/manila/api/common.py +++ b/manila/api/common.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack LLC. # All Rights Reserved. # @@ -19,19 +17,17 @@ import os import re import urlparse +from oslo.config import cfg +import six import webob from manila.api.openstack import wsgi from manila.api import xmlutil from manila.openstack.common import log as logging from manila import utils -from oslo.config import cfg - -LOG = logging.getLogger(__name__) CONF = cfg.CONF - - +LOG = logging.getLogger(__name__) XML_NS_V1 = 'http://docs.openstack.org/volume/api/v1' @@ -186,7 +182,7 @@ def dict_to_query_str(params): # TODO(throughnothing): we should just use urllib.urlencode instead of this # But currently we don't work with urlencoded url's param_str = "" - for key, val in params.iteritems(): + for key, val in six.iteritems(params): param_str = param_str + '='.join([str(key), str(val)]) + '&' return param_str.rstrip('&') diff --git a/manila/api/extensions.py b/manila/api/extensions.py index 78958e53e0..a81024463f 100644 --- a/manila/api/extensions.py +++ b/manila/api/extensions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC. # Copyright 2011 Justin Santa Barbara # All Rights Reserved. @@ -18,6 +16,8 @@ import os +from oslo.config import cfg +import six import webob.dec import webob.exc @@ -25,15 +25,12 @@ import manila.api.openstack from manila.api.openstack import wsgi from manila.api import xmlutil from manila import exception - from manila.openstack.common import importutils from manila.openstack.common import log as logging import manila.policy -from oslo.config import cfg - -LOG = logging.getLogger(__name__) CONF = cfg.CONF +LOG = logging.getLogger(__name__) class ExtensionDescriptor(object): @@ -152,7 +149,7 @@ class ExtensionsResource(wsgi.Resource): @wsgi.serializers(xml=ExtensionsTemplate) def index(self, req): extensions = [] - for _alias, ext in self.extension_manager.extensions.iteritems(): + for _alias, ext in six.iteritems(self.extension_manager.extensions): extensions.append(self._translate(ext)) return dict(extensions=extensions) diff --git a/manila/api/v1/security_service.py b/manila/api/v1/security_service.py index 2dab172425..5ad7f8fc9e 100644 --- a/manila/api/v1/security_service.py +++ b/manila/api/v1/security_service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2014 Mirantis Inc. # All Rights Reserved. # @@ -17,6 +15,7 @@ """The security service api.""" +import six import webob from webob import exc @@ -141,7 +140,7 @@ class SecurityServiceController(wsgi.Controller): results = [] not_found = object() for service in security_services: - for opt, value in search_opts.iteritems(): + for opt, value in six.iteritems(search_opts): if service.get(opt, not_found) != value: break else: diff --git a/manila/api/v1/share_networks.py b/manila/api/v1/share_networks.py index 30f38a4cb6..031ca40f58 100644 --- a/manila/api/v1/share_networks.py +++ b/manila/api/v1/share_networks.py @@ -15,6 +15,7 @@ """The shares api.""" +import six import webob from webob import exc @@ -141,7 +142,7 @@ class ShareNetworkController(wsgi.Controller): context.project_id) if search_opts: - for key, value in search_opts.iteritems(): + for key, value in six.iteritems(search_opts): networks = [network for network in networks if network[key] == value] return self._view_builder.build_share_networks(networks, is_detail) @@ -235,7 +236,7 @@ class ShareNetworkController(wsgi.Controller): 'add_security_service': self._add_security_service, 'remove_security_service': self._remove_security_service } - for action, data in body.iteritems(): + for action, data in six.iteritems(body): try: return _actions[action](req, id, data) except KeyError: diff --git a/manila/api/v1/shares.py b/manila/api/v1/shares.py index b7b74fd52c..3765a9fba0 100644 --- a/manila/api/v1/shares.py +++ b/manila/api/v1/shares.py @@ -15,6 +15,7 @@ """The shares api.""" +import six import webob from webob import exc @@ -256,7 +257,7 @@ class ShareController(wsgi.Controller): # TODO(vish): Instance should be None at db layer instead of # trying to lazy load, but for now we turn it into # a dict to avoid an error. - return self._view_builder.summary(req, dict(new_share.iteritems())) + return self._view_builder.summary(req, dict(six.iteritems(new_share))) def create_resource(): diff --git a/manila/api/views/limits.py b/manila/api/views/limits.py index 244401841f..ec1a3ab333 100644 --- a/manila/api/views/limits.py +++ b/manila/api/views/limits.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack LLC. # All Rights Reserved. # @@ -17,6 +15,8 @@ import datetime +import six + from manila.openstack.common import timeutils @@ -50,7 +50,7 @@ class ViewBuilder(object): "share_networks": ["maxTotalShareNetworks"], } limits = {} - for name, value in absolute_limits.iteritems(): + for name, value in six.iteritems(absolute_limits): if name in limit_names and value is not None: for name in limit_names[name]: limits[name] = value diff --git a/manila/quota.py b/manila/quota.py index 3302218533..45f6c85725 100644 --- a/manila/quota.py +++ b/manila/quota.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. @@ -21,6 +19,7 @@ import datetime from oslo.config import cfg +import six from manila import db from manila import exception @@ -230,7 +229,7 @@ class DbQuotaDriver(object): project_id, user_id) # Use the project quota for default user quota. proj_quotas = db.quota_get_all_by_project(context, project_id) - for key, value in proj_quotas.iteritems(): + for key, value in six.iteritems(proj_quotas): if key not in user_quotas.keys(): user_quotas[key] = value user_usages = None diff --git a/manila/scheduler/host_manager.py b/manila/scheduler/host_manager.py index 8b962baa83..840e1d8e2c 100644 --- a/manila/scheduler/host_manager.py +++ b/manila/scheduler/host_manager.py @@ -20,10 +20,10 @@ Manage hosts in the current zone. import UserDict from oslo.config import cfg +import six from manila import db from manila import exception - from manila.openstack.common import log as logging from manila.openstack.common.scheduler import filters from manila.openstack.common.scheduler import weights @@ -267,12 +267,12 @@ class HostManager(object): if host_state: # copy capabilities to host_state.capabilities host_state.update_capabilities(capabilities, - dict(service.iteritems())) + dict(six.iteritems(service))) else: host_state = self.host_state_cls(host, capabilities=capabilities, service= - dict(service.iteritems())) + dict(six.iteritems(service))) self.host_state_map[host] = host_state # update host_state host_state.update_from_share_capability(capabilities) diff --git a/manila/share/api.py b/manila/share/api.py index 377b82cdee..51f0662c4f 100644 --- a/manila/share/api.py +++ b/manila/share/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. @@ -20,6 +18,9 @@ Handles all requests relating to shares. """ +from oslo.config import cfg +import six + from manila.db import base from manila import exception from manila.openstack.common import excutils @@ -30,11 +31,7 @@ from manila import quota from manila.scheduler import rpcapi as scheduler_rpcapi from manila.share import rpcapi as share_rpcapi -from oslo.config import cfg - - CONF = cfg.CONF - LOG = logging.getLogger(__name__) GB = 1048576 * 1024 QUOTAS = quota.QUOTAS @@ -317,7 +314,7 @@ class API(base.Base): results = [] not_found = object() for share in shares: - for opt, value in search_opts.iteritems(): + for opt, value in six.iteritems(search_opts): if share.get(opt, not_found) != value: break else: @@ -328,7 +325,7 @@ class API(base.Base): def get_snapshot(self, context, snapshot_id): policy.check_policy(context, 'share', 'get_snapshot') rv = self.db.share_snapshot_get(context, snapshot_id) - return dict(rv.iteritems()) + return dict(six.iteritems(rv)) def get_all_snapshots(self, context, search_opts=None): policy.check_policy(context, 'share', 'get_all_snapshots') @@ -349,7 +346,7 @@ class API(base.Base): results = [] not_found = object() for snapshot in snapshots: - for opt, value in search_opts.iteritems(): + for opt, value in six.iteritems(search_opts): if snapshot.get(opt, not_found) != value: break else: @@ -420,7 +417,7 @@ class API(base.Base): def get_share_metadata(self, context, share): """Get all metadata associated with a share.""" rv = self.db.share_metadata_get(context, share['id']) - return dict(rv.iteritems()) + return dict(six.iteritems(rv)) @policy.wrap_check_policy('share') def delete_share_metadata(self, context, share, key): @@ -431,7 +428,7 @@ class API(base.Base): if not metadata: metadata = {} - for k, v in metadata.iteritems(): + for k, v in six.iteritems(metadata): if len(k) == 0: msg = _("Metadata property key is blank") LOG.warn(msg) diff --git a/manila/share/volume_types.py b/manila/share/volume_types.py index 3baef01f82..f17f6555a4 100644 --- a/manila/share/volume_types.py +++ b/manila/share/volume_types.py @@ -16,13 +16,13 @@ from oslo.config import cfg +import six from manila import context from manila import db from manila import exception from manila.openstack.common import log as logging - CONF = cfg.CONF LOG = logging.getLogger(__name__) @@ -60,7 +60,7 @@ def get_all_types(context, inactive=0, search_opts={}): LOG.debug("Searching by: %s" % search_opts) def _check_extra_specs_match(vol_type, searchdict): - for k, v in searchdict.iteritems(): + for k, v in six.iteritems(searchdict): if (k not in vol_type['extra_specs'].keys() or vol_type['extra_specs'][k] != v): return False @@ -70,9 +70,9 @@ def get_all_types(context, inactive=0, search_opts={}): filter_mapping = {'extra_specs': _check_extra_specs_match} result = {} - for type_name, type_args in vol_types.iteritems(): + for type_name, type_args in six.iteritems(vol_types): # go over all filters in the list - for opt, values in search_opts.iteritems(): + for opt, values in six.iteritems(search_opts): try: filter_func = filter_mapping[opt] except KeyError: @@ -157,11 +157,11 @@ def volume_types_diff(context, vol_type_id1, vol_type_id2): dict1 = {} if dict2 is None: dict2 = {} - for k, v in dict1.iteritems(): + for k, v in six.iteritems(dict1): res[k] = (v, dict2.get(k)) if k not in dict2 or res[k][0] != res[k][1]: equal = False - for k, v in dict2.iteritems(): + for k, v in six.iteritems(dict2): res[k] = (dict1.get(k), v) if k not in dict1 or res[k][0] != res[k][1]: equal = False diff --git a/manila/test.py b/manila/test.py index b6088ff1e0..3c83374ffd 100644 --- a/manila/test.py +++ b/manila/test.py @@ -27,6 +27,7 @@ import uuid import mock from oslo.config import cfg from oslo.messaging import conffixture as messaging_conffixture +import six import testtools from manila.openstack.common import importutils @@ -124,7 +125,7 @@ class TestCase(testtools.TestCase): def flags(self, **kw): """Override flag variables for a test.""" - for k, v in kw.iteritems(): + for k, v in six.iteritems(kw): CONF.set_override(k, v) def start_service(self, name, host=None, **kwargs): diff --git a/manila/wsgi.py b/manila/wsgi.py index 0791d372ac..cc8ad58afd 100644 --- a/manila/wsgi.py +++ b/manila/wsgi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2010 OpenStack LLC. @@ -34,11 +32,11 @@ import greenlet from oslo.config import cfg from paste import deploy import routes.middleware +import six import webob.dec import webob.exc from manila import exception - from manila.openstack.common import log as logging from manila import utils @@ -402,7 +400,7 @@ class Debug(Middleware): resp = req.get_response(self.application) print(('*' * 40) + ' RESPONSE HEADERS') - for (key, value) in resp.headers.iteritems(): + for (key, value) in six.iteritems(resp.headers): print(key, '=', value) print()