From 09d15143a5be8840403cbb7a6318e31d231e99ff Mon Sep 17 00:00:00 2001
From: Li-zhigang <li.zhigang3@zte.com.cn>
Date: 2016年11月22日 16:48:35 +0800
Subject: [PATCH] Replace six.iteritems() with .items()
Change-Id: Ic061d62e61d364252fd6f69575fc71c6534e5840
---
 networking_bgpvpn/neutron/services/common/utils.py &#124; 4 +---
 .../service_drivers/opencontrail/opencontrail_client.py &#124; 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/networking_bgpvpn/neutron/services/common/utils.py b/networking_bgpvpn/neutron/services/common/utils.py
index 8f92e517..61c0a2db 100644
--- a/networking_bgpvpn/neutron/services/common/utils.py
+++ b/networking_bgpvpn/neutron/services/common/utils.py
@@ -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:
diff --git a/networking_bgpvpn/neutron/services/service_drivers/opencontrail/opencontrail_client.py b/networking_bgpvpn/neutron/services/service_drivers/opencontrail/opencontrail_client.py
index b1bc2bc4..ad24e983 100644
--- a/networking_bgpvpn/neutron/services/service_drivers/opencontrail/opencontrail_client.py
+++ b/networking_bgpvpn/neutron/services/service_drivers/opencontrail/opencontrail_client.py
@@ -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'])
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/networking-bgpvpn/commit/09d15143a5be8840403cbb7a6318e31d231e99ff.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/networking-bgpvpn/commit/09d15143a5be8840403cbb7a6318e31d231e99ff.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>