diff options
| author |   Frank A. Zdarsky <fzdarsky@redhat.com> | 2017-01-05 10:24:19 +0100 |
|---|---|---|
| committer | Frank A. Zdarsky <fzdarsky@redhat.com> | 2017-01-05 10:35:35 +0100 |
| commit | 81d2a7d8715527ba5bb6c79cb7e4e379745c8feb (patch) | |
| tree | cf27060188b3310b5d8e52a2987c0453a8ebafff /os_net_config/impl_eni.py | |
| parent | d929214c7a904da57a406dd56ac06f001fdc7d7b (diff) | |
Make os-net-config pass tox py3 tests
This patch improves Python 3 compatibility by replacing .iteritems()
with .items() for iterating over dicts and fixing two tests to use
portable string comparison.
Change-Id: I8e1acafe372f1696823561d6aa8aae5437d34025
Closes-Bug: #1654187
Diffstat (limited to 'os_net_config/impl_eni.py')
| -rw-r--r-- | os_net_config/impl_eni.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/os_net_config/impl_eni.py b/os_net_config/impl_eni.py index c6252ce..360d8c8 100644 --- a/os_net_config/impl_eni.py +++ b/os_net_config/impl_eni.py @@ -215,12 +215,12 @@ class ENINetConfig(os_net_config.NetConfig): # write out bridges first. This ensures that an ifup -a # on reboot brings them up first - for bridge_name, bridge_data in self.bridges.iteritems(): + for bridge_name, bridge_data in self.bridges.items(): route_data = self.routes.get(bridge_name) bridge_data += (route_data or '') new_config += bridge_data - for interface_name, iface_data in self.interfaces.iteritems(): + for interface_name, iface_data in self.interfaces.items(): route_data = self.routes.get(interface_name) iface_data += (route_data or '') new_config += iface_data |