From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 18 Jul 2015 14:09:54 +0000 (+0000)
Subject: Merge "Python 3: Wrap map() in a list call"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=dc8436c190905406d81976d26be457ef225f4593;p=openstack-build%2Fneutron-build.git

Merge "Python 3: Wrap map() in a list call"
---

dc8436c190905406d81976d26be457ef225f4593
diff --cc neutron/tests/unit/agent/l3/test_agent.py
index 7e07022a3,159b2a11c..2ad0a56ee
--- a/neutron/tests/unit/agent/l3/test_agent.py
+++ b/neutron/tests/unit/agent/l3/test_agent.py
@@@ -1519,9 -1518,9 +1519,9 @@@ class TestBasicRouterOperations(BasicRo
          ri = l3router.RouterInfo(_uuid(), {}, **self.ri_kwargs)
          ex_gw_port = {'fixed_ips': [{'ip_address': '192.168.1.4'}]}
          ri.router = {'distributed': False}
 -        ri._handle_router_snat_rules(ex_gw_port, "iface", "add_rules")
 +        ri._handle_router_snat_rules(ex_gw_port, "iface")
  
-         nat_rules = map(str, ri.iptables_manager.ipv4['nat'].rules)
+         nat_rules = list(map(str, ri.iptables_manager.ipv4['nat'].rules))
          wrap_name = ri.iptables_manager.wrap_name
  
          jump_float_rule = "-A %s-snat -j %s-float-snat" % (wrap_name,