From dc7e4fc15d80eed5a814f0b87e1860f0cd86c2ee Mon Sep 17 00:00:00 2001
From: Tang Chen <chen.tang@easystack.cn>
Date: Sat, 12 Mar 2016 10:58:28 +0800
Subject: Fix dict.keys() compatibility for python 3

In Python 2, dict.keys() will return a list.
But in Python 3, it will return an iterator.
So we need to fix all the places that assuming
dict.keys() is a list.

Change-Id: I8d1cc536377b3e5c644cfaa0892e40d0bd7c11b1
Closes-Bug: #1556350
---
 openstackclient/network/v2/floating_ip.py         | 2 +-
 openstackclient/network/v2/network.py             | 2 +-
 openstackclient/network/v2/port.py                | 2 +-
 openstackclient/network/v2/router.py              | 2 +-
 openstackclient/network/v2/security_group_rule.py | 2 +-
 openstackclient/network/v2/subnet.py              | 2 +-
 openstackclient/network/v2/subnet_pool.py         | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'openstackclient/network/v2')

diff --git a/openstackclient/network/v2/floating_ip.py b/openstackclient/network/v2/floating_ip.py
index e0a65a48..16f2b574 100644
--- a/openstackclient/network/v2/floating_ip.py
+++ b/openstackclient/network/v2/floating_ip.py
@@ -18,7 +18,7 @@ from openstackclient.network import common
 
 
 def _get_columns(item):
-    columns = item.keys()
+    columns = list(item.keys())
     if 'tenant_id' in columns:
         columns.remove('tenant_id')
         columns.append('project_id')
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py
index 612a1775..074b2754 100644
--- a/openstackclient/network/v2/network.py
+++ b/openstackclient/network/v2/network.py
@@ -38,7 +38,7 @@ _formatters = {
 
 
 def _get_columns(item):
-    columns = item.keys()
+    columns = list(item.keys())
     if 'tenant_id' in columns:
         columns.remove('tenant_id')
         columns.append('project_id')
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index b618a4b0..241699ae 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -36,7 +36,7 @@ _formatters = {
 
 
 def _get_columns(item):
-    columns = item.keys()
+    columns = list(item.keys())
     if 'tenant_id' in columns:
         columns.remove('tenant_id')
         columns.append('project_id')
diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py
index 96aa55b2..39431111 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -42,7 +42,7 @@ _formatters = {
 
 
 def _get_columns(item):
-    columns = item.keys()
+    columns = list(item.keys())
     if 'tenant_id' in columns:
         columns.remove('tenant_id')
         columns.append('project_id')
diff --git a/openstackclient/network/v2/security_group_rule.py b/openstackclient/network/v2/security_group_rule.py
index 92f28cce..9309b326 100644
--- a/openstackclient/network/v2/security_group_rule.py
+++ b/openstackclient/network/v2/security_group_rule.py
@@ -27,7 +27,7 @@ def _format_security_group_rule_show(obj):
 
 
 def _get_columns(item):
-    columns = item.keys()
+    columns = list(item.keys())
     if 'tenant_id' in columns:
         columns.remove('tenant_id')
         columns.append('project_id')
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
index b514a88f..9e53ee84 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -31,7 +31,7 @@ _formatters = {
 
 
 def _get_columns(item):
-    columns = item.keys()
+    columns = list(item.keys())
     if 'tenant_id' in columns:
         columns.remove('tenant_id')
         columns.append('project_id')
diff --git a/openstackclient/network/v2/subnet_pool.py b/openstackclient/network/v2/subnet_pool.py
index 44f30207..d0d8d058 100644
--- a/openstackclient/network/v2/subnet_pool.py
+++ b/openstackclient/network/v2/subnet_pool.py
@@ -20,7 +20,7 @@ from openstackclient.common import utils
 
 
 def _get_columns(item):
-    columns = item.keys()
+    columns = list(item.keys())
     if 'tenant_id' in columns:
         columns.remove('tenant_id')
         columns.append('project_id')
-- 
cgit v1.2.1