From: Chang Bo Guo <guochbo@cn.ibm.com>
Date: Sun, 10 Nov 2013 07:48:10 +0000 (-0800)
Subject: Don't shadow str
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a436da59a0c6fa3ba1ab17dcfcb19b2751367e9f;p=openstack-build%2Fneutron-build.git

Don't shadow str

In the  agent/linux/ovs_lib.py we were shadowing the str keyword with
local variable. Let's not do that.

Change-Id: If800804b1e1f12d782bac524c92f300bd77fdd3c
---

diff --git a/neutron/agent/linux/ovs_lib.py b/neutron/agent/linux/ovs_lib.py
index 6a4e7c652..6857e9fb8 100644
--- a/neutron/agent/linux/ovs_lib.py
+++ b/neutron/agent/linux/ovs_lib.py
@@ -275,8 +275,8 @@ class OVSBridge(BaseOVS):
     def db_get_map(self, table, record, column):
         output = self.run_vsctl(["get", table, record, column])
         if output:
-            str = output.rstrip("\n\r")
-            return self.db_str_to_map(str)
+            output_str = output.rstrip("\n\r")
+            return self.db_str_to_map(output_str)
         return {}
 
     def db_get_val(self, table, record, column):