From 741fd38741b41624349a7f63b5906704b3e2a752 Mon Sep 17 00:00:00 2001 From: Yasufumi Ogawa Date: Tue, 12 May 2020 04:22:49 +0000 Subject: [PATCH] Cleanup deprecated iteritems of dict To fix the issue because of using deprecated method in python3, replace iteritems() with items(). Change-Id: If3136a5ba471d2cd7ea9420b599567a2fa532cad Partial-Bug: 1872120 --- tackerclient/osc/v1/nfvo/ns.py | 2 +- tackerclient/osc/v1/nfvo/nsd.py | 2 +- tackerclient/osc/v1/nfvo/vim.py | 2 +- tackerclient/osc/v1/nfvo/vnffg.py | 2 +- tackerclient/osc/v1/nfvo/vnffgd.py | 2 +- tackerclient/osc/v1/vnfm/vnf.py | 2 +- tackerclient/osc/v1/vnfm/vnfd.py | 2 +- tackerclient/tacker/v1_0/__init__.py | 3 ++- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tackerclient/osc/v1/nfvo/ns.py b/tackerclient/osc/v1/nfvo/ns.py index f58d1e33..b3ad3663 100644 --- a/tackerclient/osc/v1/nfvo/ns.py +++ b/tackerclient/osc/v1/nfvo/ns.py @@ -195,7 +195,7 @@ class DeleteNS(command.Command): 'resource': _NS}) err_msg = _("\n\nUnable to delete the below" " %s(s):") % _NS - for failed_id, error in failed_items.iteritems(): + for failed_id, error in failed_items.items(): err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') % {'failed_id': failed_id, 'error': error}) diff --git a/tackerclient/osc/v1/nfvo/nsd.py b/tackerclient/osc/v1/nfvo/nsd.py index 6adce460..2ce22a23 100644 --- a/tackerclient/osc/v1/nfvo/nsd.py +++ b/tackerclient/osc/v1/nfvo/nsd.py @@ -133,7 +133,7 @@ class DeleteNSD(command.Command): 'resource': _NSD}) err_msg = _("\n\nUnable to delete the below" " %s(s):") % _NSD - for failed_id, error in failed_items.iteritems(): + for failed_id, error in failed_items.items(): err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') % {'failed_id': failed_id, 'error': error}) diff --git a/tackerclient/osc/v1/nfvo/vim.py b/tackerclient/osc/v1/nfvo/vim.py index 3ab883c0..aa0ba072 100644 --- a/tackerclient/osc/v1/nfvo/vim.py +++ b/tackerclient/osc/v1/nfvo/vim.py @@ -185,7 +185,7 @@ class DeleteVIM(command.Command): 'resource': _VIM}) err_msg = _("\n\nUnable to delete the below" " %s(s):") % _VIM - for failed_id, error in failed_items.iteritems(): + for failed_id, error in failed_items.items(): err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') % {'failed_id': failed_id, 'error': error}) diff --git a/tackerclient/osc/v1/nfvo/vnffg.py b/tackerclient/osc/v1/nfvo/vnffg.py index 0957d010..f0060dc1 100644 --- a/tackerclient/osc/v1/nfvo/vnffg.py +++ b/tackerclient/osc/v1/nfvo/vnffg.py @@ -213,7 +213,7 @@ class DeleteVNFFG(command.Command): 'resource': _VNFFG}) err_msg = _("\n\nUnable to delete the below" " %s(s):") % _VNFFG - for failed_id, error in failed_items.iteritems(): + for failed_id, error in failed_items.items(): err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') % {'failed_id': failed_id, 'error': error}) diff --git a/tackerclient/osc/v1/nfvo/vnffgd.py b/tackerclient/osc/v1/nfvo/vnffgd.py index e8358318..6a76d529 100644 --- a/tackerclient/osc/v1/nfvo/vnffgd.py +++ b/tackerclient/osc/v1/nfvo/vnffgd.py @@ -131,7 +131,7 @@ class DeleteVNFFGD(command.Command): 'resource': _VNFFGD}) err_msg = _("\n\nUnable to delete the below" " %s(s):") % _VNFFGD - for failed_id, error in failed_items.iteritems(): + for failed_id, error in failed_items.items(): err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') % {'failed_id': failed_id, 'error': error}) diff --git a/tackerclient/osc/v1/vnfm/vnf.py b/tackerclient/osc/v1/vnfm/vnf.py index d646ee52..71859a4b 100644 --- a/tackerclient/osc/v1/vnfm/vnf.py +++ b/tackerclient/osc/v1/vnfm/vnf.py @@ -229,7 +229,7 @@ class DeleteVNF(command.Command): 'resource': _VNF}) err_msg = _("\n\nUnable to delete the below" " %s(s):") % _VNF - for failed_id, error in failed_items.iteritems(): + for failed_id, error in failed_items.items(): err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') % {'failed_id': failed_id, 'error': error}) diff --git a/tackerclient/osc/v1/vnfm/vnfd.py b/tackerclient/osc/v1/vnfm/vnfd.py index 76b1182e..cbbcbd9f 100644 --- a/tackerclient/osc/v1/vnfm/vnfd.py +++ b/tackerclient/osc/v1/vnfm/vnfd.py @@ -134,7 +134,7 @@ class DeleteVNFD(command.Command): 'resource': _VNFD}) err_msg = _("\n\nUnable to delete the below" " %s(s):") % _VNFD - for failed_id, error in failed_items.iteritems(): + for failed_id, error in failed_items.items(): err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') % {'failed_id': failed_id, 'error': error}) diff --git a/tackerclient/tacker/v1_0/__init__.py b/tackerclient/tacker/v1_0/__init__.py index e9cf4c87..a16e71dc 100644 --- a/tackerclient/tacker/v1_0/__init__.py +++ b/tackerclient/tacker/v1_0/__init__.py @@ -332,6 +332,7 @@ class TableFormater(table.TableFormatter): https://bugs.launchpad.net/python-tackerclient/+bug/1165962 """ + def emit_list(self, column_names, data, stdout, parsed_args): if column_names: super(TableFormater, self).emit_list(column_names, data, stdout, @@ -559,7 +560,7 @@ class DeleteCommand(TackerCommand): 'resource': self.resource}) err_msg = _("\n\nUnable to delete the below" " %s(s):") % self.resource - for failed_id, error in failed_items.iteritems(): + for failed_id, error in failed_items.items(): err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') % {'failed_id': failed_id, 'error': error})