Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Saller <bcsaller@objectrealms.net>2007-10-09 15:34:11 (GMT)
committer Benjamin Saller <bcsaller@objectrealms.net>2007-10-09 15:34:11 (GMT)
commitf6cac3e333dc0846d425e6caba845158fbd25aee (patch)
tree041fa6134d32e5ef096bcc1dfe8e52058f556ebd
parentf0c0a4fcb020778ce6b9c8ae5881aa9ac64a1524 (diff)
changes to api to reflect the DBus compat requests of #4064
-rw-r--r--src/olpc/datastore/datastore.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/olpc/datastore/datastore.py b/src/olpc/datastore/datastore.py
index b5d67b9..9073845 100644
--- a/src/olpc/datastore/datastore.py
+++ b/src/olpc/datastore/datastore.py
@@ -255,9 +255,9 @@ class DataStore(dbus.service.Object):
#@utils.sanitize_dbus
@dbus.service.method(DS_DBUS_INTERFACE,
- in_signature='a{sv}as',
+ in_signature='a{sv}',
out_signature='aa{sv}u')
- def find(self, query=None, properties=None, **kwargs):
+ def find(self, query=None, **kwargs):
"""find(query)
takes a dict of parameters and returns data in the following
format
@@ -294,7 +294,8 @@ class DataStore(dbus.service.Object):
else:
if 'query' not in kwargs:
kwargs['query'] = query
-
+
+ properties = kwargs.pop("properties", [])
include_files = kwargs.pop('include_files', False)
order_by = kwargs.pop('order_by', [])