Merge lp:~seif/zeitgeist/fix-691167 into lp:zeitgeist/0.1

[Seif Lotfy]

Fix for 691167

[Siegfried Gevatter (rainct)]

I don't see where you're using bytearray here. According to [0], this byte_array=True thing is to request something unrelated (a different ByteArray class which is part of python-dbus and is a subclass of string).

[0] http://dbus.freedesktop.org/doc/dbus-python/api/dbus.ByteArray-class.html

review: Needs Fixing

Unmerged revisions

1750. By Seif Lotfy on 2011-05-05

add byte_arrays=True to dbus signals and methods for which gives us the simple mapping dbus.ByteArray <-> str
Fix indents

=== modified file '_zeitgeist/engine/remote.py'
--- _zeitgeist/engine/remote.py	2011-04-11 18:13:58 +0000
+++ _zeitgeist/engine/remote.py	2011-05-05 21:42:28 +0000
@@ -84,7 +84,7 @@
 	@dbus.service.method(constants.DBUS_INTERFACE,
 						in_signature="au",
 						out_signature="a("+constants.SIG_EVENT+")",
-						sender_keyword="sender")
+						sender_keyword="sender", byte_arrays=True)
 	def GetEvents(self, event_ids, sender):
 		"""Get full event data for a set of event IDs
 		
@@ -101,11 +101,11 @@
 		:rtype: A list of serialized events. DBus signature a(asaasay).
 		"""
 		return self._make_events_sendable(self._engine.get_events(ids=event_ids,
-		    sender=sender))
+			sender=sender))
 	
 	@dbus.service.method(constants.DBUS_INTERFACE,
 						in_signature="(xx)a("+constants.SIG_EVENT+")a("+constants.SIG_EVENT+")uuu",
-						out_signature="as")
+						out_signature="as", byte_arrays=True)
 	def FindRelatedUris(self, time_range, event_templates,
 		result_event_templates, storage_state, num_events, result_type):
 		"""Warning: This API is EXPERIMENTAL and is not fully supported yet.
@@ -153,7 +153,8 @@
 	
 	@dbus.service.method(constants.DBUS_INTERFACE,
 						in_signature="(xx)a("+constants.SIG_EVENT+")uuu",
-						out_signature="au")
+						out_signature="au",
+						byte_arrays=True)
 	def FindEventIds(self, time_range, event_templates, storage_state,
 			num_events, result_type):
 		"""Search for events matching a given set of templates and return
@@ -217,7 +218,8 @@
 	@dbus.service.method(constants.DBUS_INTERFACE,
 						in_signature="(xx)a("+constants.SIG_EVENT+")uuu",
 						out_signature="a("+constants.SIG_EVENT+")",
-						sender_keyword="sender")
+						sender_keyword="sender",
+						byte_arrays=True)
 	def FindEvents(self, time_range, event_templates, storage_state,
 			num_events, result_type, sender):
 		"""Get events matching a given set of templates.
@@ -275,7 +277,8 @@
 	@dbus.service.method(constants.DBUS_INTERFACE,
 						in_signature="a("+constants.SIG_EVENT+")",
 						out_signature="au",
-						sender_keyword="sender")
+						sender_keyword="sender",
+						byte_arrays=True)
 	def InsertEvents(self, events, sender):
 		"""Inserts events into the log. Returns an array containing the IDs
 		of the inserted events
@@ -324,9 +327,9 @@
 		return event_ids
 	
 	@dbus.service.method(constants.DBUS_INTERFACE,
-	                     in_signature="au",
-	                     out_signature="(xx)",
-	                     sender_keyword="sender")
+						in_signature="au",
+						out_signature="(xx)",
+						sender_keyword="sender")
 	def DeleteEvents(self, event_ids, sender):
 		"""Delete a set of events from the log given their IDs
 		
@@ -339,7 +342,7 @@
 			# We need to check the return value, as the events could already
 			# have been deleted before or the IDs might even have been invalid.
 			self._notifications.notify_delete(
-			    TimeRange(timestamps[0], timestamps[1]), event_ids)
+				TimeRange(timestamps[0], timestamps[1]), event_ids)
 		if timestamps is None:
 			# unknown event id, see doc of delete_events()
 			return (-1, -1)
@@ -348,7 +351,8 @@
 		timestamp_end = timestamp_end if timestamp_end is not None else -1
 		return (timestamp_start, timestamp_end)
 
-	@dbus.service.method(constants.DBUS_INTERFACE, in_signature="", out_signature="")
+	@dbus.service.method(constants.DBUS_INTERFACE, in_signature="", out_signature=""
+						)
 	def DeleteLog(self):
 		"""Delete the log file and all its content
 		
@@ -430,7 +434,8 @@
 	# Notifications interface
 	
 	@dbus.service.method(constants.DBUS_INTERFACE,
-			in_signature="o(xx)a("+constants.SIG_EVENT+")", sender_keyword="owner")
+			in_signature="o(xx)a("+constants.SIG_EVENT+")", sender_keyword="owner", 
+			byte_arrays=True)
 	def InstallMonitor(self, monitor_path, time_range, event_templates, owner=None):
 		"""Register a client side monitor object to receive callbacks when
 		events matching *time_range* and *event_templates* are inserted or