From 6fd49fbbefc94537d8a3196cff1dc79b0cff262f Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 13 Oct 2006 14:42:40 +0000 Subject: [PATCH] - removed return_fields param - no longer filter out None - added event_type, object_type memeber vars --- PLC/Methods/GetSites.py | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/PLC/Methods/GetSites.py b/PLC/Methods/GetSites.py index 2fb73e0..50d5e84 100644 --- a/PLC/Methods/GetSites.py +++ b/PLC/Methods/GetSites.py @@ -21,32 +21,25 @@ class GetSites(Method): accepts = [ PasswordAuth(), [Mixed(Site.fields['site_id'], - Site.fields['login_base'])], - Parameter([str], 'List of fields to return') + Site.fields['login_base'])] ] returns = [Site.fields] + event_type = 'Get' + object_type = 'Site' + def __init__(self, *args, **kwds): Method.__init__(self, *args, **kwds) # Update documentation with list of default fields returned self.__doc__ += os.linesep.join(Site.fields.keys()) - def call(self, auth, site_id_or_login_base_list = None, return_fields = None): - # Make sure that only valid fields are specified - if return_fields is None: - return_fields = Site.fields - elif filter(lambda field: field not in Site.fields, return_fields): - raise PLCInvalidArgument, "Invalid return field specified" - + def call(self, auth, site_id_or_login_base_list = None): + # Get site information sites = Sites(self.api, site_id_or_login_base_list) - # Filter out undesired or None fields (XML-RPC cannot marshal - # None) and turn each site into a real dict. - valid_return_fields_only = lambda (key, value): \ - key in return_fields and value is not None - sites = [dict(filter(valid_return_fields_only, site.items())) \ - for site in sites.values()] - + # turn each site into a real dict. + sites = [dict(site.items()) for site in sites.values()] + return sites -- 2.43.0