Replace six.iteritems() with .items()

Code Issues Proposed changes

Change-Id: Ic061d62e61d364252fd6f69575fc71c6534e5840

This commit is contained in:

Li-zhigang

2016年11月22日 16:48:35 +08:00

parent 9d6331a454

commit 09d15143a5

2 changed files with 3 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4
networking_bgpvpn/neutron/services/common/utils.py

View File

@@ -13,8 +13,6 @@

# License for the specific language governing permissions and limitations

# under the License.

import six

def rtrd_list2str(list):

"""Format Route Target list to string"""

@@ -41,7 +39,7 @@ def rtrd_str2list(str):

def filter_resource(resource, filters=None):

if not filters:

filters = {}

for key, value in six.iteritems(filters):

for key, value in filters.items():

if key in resource.keys():

if isinstance(value, list):

if resource[key] not in value:

5
networking_bgpvpn/neutron/services/service_drivers/opencontrail/opencontrail_client.py

View File

@@ -20,7 +20,6 @@ from oslo_config import cfg

from oslo_log import log

from oslo_utils import uuidutils

import requests

import six

from six.moves import http_client as httplib

from six.moves.urllib import parse as urlparse

@@ -190,7 +189,7 @@ class RequestHandler(object):

curl_command.append('"%s"' % url)

for name, value in six.iteritems(req_params['headers']):

for name, value in req_params['headers'].items():

curl_command.append('-H "%s: %s"' % (name, value))

if ('data' in req_params.keys()

@@ -207,7 +206,7 @@ class RequestHandler(object):

resp.status_code,

resp.reason)]

dump.extend('%s: %s\n' % (k, v)

for k, v in six.iteritems(resp.headers))

for k, v in (resp.headers).items())

dump.append('\n')

if resp.content:

dump.extend([resp.content, '\n'])