only use has_key method on dict instances
authorMarc Fiuczynski <mef@cs.princeton.edu>
Sat, 23 May 2009 03:30:47 +0000 (03:30 +0000)
committerMarc Fiuczynski <mef@cs.princeton.edu>
Sat, 23 May 2009 03:30:47 +0000 (03:30 +0000)
PLC/Methods/GetNodes.py
PLC/Methods/GetSlices.py

index 29c4ccb..cae07bb 100644 (file)
@@ -111,7 +111,7 @@ class v42GetNodes(v43GetNodes):
 
     def call(self, auth, node_filter = None, return_fields = None):
         # convert nodenetwork_ids -> interface_ids
-        if node_filter <> None and \
+        if node_filter <> None and isinstance(node_filter, dict)t, dict) and \
                node_filter.has_key('nodenetwork_ids') and \
                not node_filter.has_key('interface_ids'):
             node_filter['interface_ids']=node_filter['nodenetwork_ids']
index eed38df..2209526 100644 (file)
@@ -79,7 +79,7 @@ class v42GetSlices(v43GetSlices):
 
     def call(self, auth, slice_filter = None, return_fields = None):
         # convert nodenetwork_ids -> interface_ids
-        if slice_filter <> None and \
+        if slice_filter <> None and isinstance(slice_filter, dict) and \
                slice_filter.has_key('slice_attribute_ids') and \
                not slice_filter.has_key('slice_tag_ids'):
             slice_filter['slice_tag_ids']=slice_filter['slice_attribute_ids']