refactoring...

[ti2/ti2.git] / linkpair / formatter / springy.py

diff --git a/linkpair/formatter/springy.py b/linkpair/formatter/springy.py
index d8d5350..97bd262 100755 (executable)
--- a/linkpair/formatter/springy.py
+++ b/linkpair/formatter/springy.py
@@ -79,19 +79,23 @@ jQuery(function(){
     def format_linkpair(cls, linkpair):
         formatted_lp = ""
         device1_label = linkpair.device1
-        device2_label = linkpair.device2        
+        device2_label = linkpair.device2
         port1_label = linkpair.port1
         port2_label = linkpair.port2
-        
-        if linkpair.port1.metadata.has_key("remote_ip"):
-            port1_label = port1_label + " remote=" + linkpair.port1.metadata["remote_ip"].replace("\"", "\\\"")
-        if linkpair.port1.metadata.has_key("tag"):
-            port1_label = port1_label + " vlan=" + linkpair.port1.metadata["tag"]
-        if linkpair.port2.metadata.has_key("remote_ip"):
-            port2_label = port2_label + " remote=" + linkpair.port2.metadata["remote_ip"]
-        if linkpair.port2.metadata.has_key("tag"):
-            port2_label = port2_label + " vlan=" + linkpair.port2.metadata["tag"]
-            
+
+        if "remote_ip" in linkpair.port1.metadata:
+            port1_label = port1_label + " remote=" + \
+                linkpair.port1.metadata["remote_ip"].replace("\"", "\\\"")
+        if "tag" in linkpair.port1.metadata:
+            port1_label = port1_label + " vlan=" + \
+                linkpair.port1.metadata["tag"]
+        if "remote_ip" in linkpair.port2.metadata:
+            port2_label = port2_label + " remote=" + \
+                linkpair.port2.metadata["remote_ip"]
+        if "tag" in linkpair.port2.metadata:
+            port2_label = port2_label + " vlan=" + \
+                linkpair.port2.metadata["tag"]
+
         formatted_lp = linkpair.format % (
             device1_label,
             device2_label,