From: Sandrine Avakian Date: Thu, 18 Oct 2012 12:56:14 +0000 (+0200) Subject: Merge branch 'master' into senslab2 X-Git-Tag: sfa-2.1-24~3^2~56 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=6872209af2d5ec927820f2b333b8d3b112260957;hp=-c Merge branch 'master' into senslab2 --- 6872209af2d5ec927820f2b333b8d3b112260957 diff --combined sfa/managers/registry_manager.py index d1a4c6f5,e921d6ef..f6f55eda --- a/sfa/managers/registry_manager.py +++ b/sfa/managers/registry_manager.py @@@ -142,7 -142,7 +142,7 @@@ class RegistryManager server_proxy = api.server_proxy(interface, credential) # should propagate the details flag but that's not supported in the xmlrpc interface yet #peer_records = server_proxy.Resolve(xrns, credential,type, details=details) - peer_records = server_proxy.Resolve(xrns, credential,type) + peer_records = server_proxy.Resolve(xrns, credential) # pass foreign records as-is # previous code used to read # records.extend([SfaRecord(dict=record).as_dict() for record in peer_records]) @@@ -155,7 -155,7 +155,7 @@@ local_records = dbsession.query(RegRecord).filter(RegRecord.hrn.in_(local_hrns)) if type: local_records = local_records.filter_by(type=type) - local_records=local_records.all() + local_records=local_records.all() for local_record in local_records: augment_with_sfa_builtins (local_record) @@@ -177,6 -177,7 +177,6 @@@ record.url=neighbour_dict[hrn].get_url() return for record in local_records: solve_neighbour_url (record) - # convert local record objects to dicts for xmlrpc # xxx somehow here calling dict(record) issues a weird error # however record.todict() seems to work fine