- removed return_fields param

- no longer filter out None

diff --git a/PLC/Methods/GetNodes.py b/PLC/Methods/GetNodes.py
index 90a2c3b..2b270d0 100644 (file)
--- a/PLC/Methods/GetNodes.py
+++ b/PLC/Methods/GetNodes.py
@@ -23,7 +23,6 @@ class GetNodes(Method):
         PasswordAuth(),
         [Mixed(Node.fields['node_id'],
                Node.fields['hostname'])],
-        Parameter([str], 'List of fields to return')
         ]
 
     returns = [Node.fields]
@@ -33,7 +32,7 @@ class GetNodes(Method):
         # Update documentation with list of default fields returned
         self.__doc__ += os.linesep.join(Node.fields.keys())
 
-    def call(self, auth, node_id_or_hostname_list = None, return_fields = None):
+    def call(self, auth, node_id_or_hostname_list = None):
         # Authenticated function
         assert self.caller is not None
 
@@ -44,20 +43,10 @@ class GetNodes(Method):
             for key in ['boot_nonce', 'key', 'session', 'root_person_ids']:
                 valid_fields.remove(key)
 
-        # Make sure that only valid fields are specified
-        if return_fields is None:
-            return_fields = valid_fields
-        elif filter(lambda field: field not in valid_fields, return_fields):
-            raise PLCInvalidArgument, "Invalid return field specified"
-
         # Get node information
         nodes = Nodes(self.api, node_id_or_hostname_list).values()
 
-        # Filter out undesired or None fields (XML-RPC cannot marshal
-        # None) and turn each node into a real dict.
-        valid_return_fields_only = lambda (key, value): \
-                                   key in return_fields and value is not None
-        nodes = [dict(filter(valid_return_fields_only, node.items())) \
-                 for node in nodes]
+        # turn each node into a real dict.
+        nodes = [dict(node.items()) for node in nodes]
                     
         return nodes