openstack/blazar
Code Issues Proposed changes

Merge "Replace six.iteritems() with .items()"

Browse Source
This commit is contained in:
Jenkins 2017-04-07 01:32:05 +00:00 committed by Gerrit Code Review
commit 1de9f3a53b
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blazar/api/v1/validation.py
View File

@ -15,8 +15,6 @@
import functools import functools
import six
from blazar.api.v1 import utils as api_utils from blazar.api.v1 import utils as api_utils
from blazar import exceptions from blazar import exceptions
@ -41,7 +39,7 @@ def check_exists(get_function, object_id=None, **get_args):
"""Decorator handler.""" """Decorator handler."""
get_kwargs = {} get_kwargs = {}
for k, v in six.iteritems(get_args): for k, v in get_args.items():
get_kwargs[k] = kwargs[v] get_kwargs[k] = kwargs[v]
try: try:

3
blazar/manager/service.py
View File

@ -18,7 +18,6 @@ import datetime
import eventlet import eventlet
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
import six
from stevedore import enabled from stevedore import enabled
from blazar.db import api as db_api from blazar.db import api as db_api
@ -106,7 +105,7 @@ class ManagerService(service_utils.RPCServer):
""" """
actions = {} actions = {}
for resource_type, plugin in six.iteritems(self.plugins): for resource_type, plugin in self.plugins.items():
plugin = self.plugins[resource_type] plugin = self.plugins[resource_type]
CONF.register_opts(plugin.get_plugin_opts(), group=resource_type) CONF.register_opts(plugin.get_plugin_opts(), group=resource_type)