From a436da59a0c6fa3ba1ab17dcfcb19b2751367e9f Mon Sep 17 00:00:00 2001 From: Chang Bo Guo Date: Sat, 9 Nov 2013 23:48:10 -0800 Subject: [PATCH] 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 --- neutron/agent/linux/ovs_lib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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): -- 2.45.2