Ticket #1202: 0001-compatible-changes-to-prepare-for-version-support.patch

src/sugar/activity/activity.py

@@ -470 +470 @@
         """
         raise NotImplementedError
 
-    def __save_cb(self):
+    def __save_cb(self, object_id=None):
         logging.debug('Activity.__save_cb')
         self._updating_jobject = False
         if self._quit_requested:
@@ -550 +550 @@
             logging.debug('Cannot save, no journal object.')
             return
 
-        logging.debug('Activity.save: %r' % self._jobject.object_id)
+        logging.debug('Activity.save: %r', self._jobject.object_id)
 
         if self._updating_jobject:
             logging.info('Activity.save: still processing a previous request.')
@@ -594 +594 @@
         Activities should not override this method. Instead, like save() do any
         copy work that needs to be done in write_file()
         """
-        logging.debug('Activity.copy: %r' % self._jobject.object_id)
+        logging.debug('Activity.copy: %r', self._jobject.object_id)
         self.save()
         self._jobject.object_id = None
 

src/sugar/activity/activityfactory.py

@@ -319 +319 @@
     def _find_object_reply_handler(self, jobjects, count):
         if count > 0:
             if count > 1:
-                logging.debug("Multiple objects has the same activity_id.")
+                logging.debug("Multiple objects have the same activity_id.")
             self._handle.object_id = jobjects[0]['uid']
         self._launch_activity()
 

src/sugar/activity/activityhandle.py

@@ -38 +38 @@
             since new activities does not have an 
             associated object (yet).
             
-            XXX Not clear how this relates to the activity
-            id yet, i.e. not sure we really need both. TBF
         uri -- URI associated with the activity. Used when 
             opening an external file or resource in the 
             activity, rather than a journal object 

src/sugar/datastore/__init__.py

@@ -14 +14 @@
 # License along with this library; if not, write to the
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
+
+
+class NoSpaceLeftError(Exception):
+    """There is not enough space left on disk to safely store data and/or
+    metadata.
+
+    Operation aborted, everything still at the previous state.
+    """
+
+class InvalidArgumentError(Exception):
+    """One or several of the passed parameters were invalid.
+
+    See formatted string for details. This should only happen if the caller
+    is doing something wrong, not during normal operation.
+    """
+
+class CorruptionError(Exception):
+    """The internal data structures of the data store or one of its backends
+    are corrupted.
+
+    Should only happen in case of hardware defects or OS bugs.
+    """
+
+class BusyError(Exception):
+    """Data store is busy recovering from a crash.
+
+    Please wait for Ready() before starting to issue any API call (except
+    check_ready()).
+    """

src/sugar/graphics/objectchooser.py

@@ -110 +110 @@
     def __chooser_response_cb(self, chooser_id, object_id):
         if chooser_id != self._chooser_id:
             return
-        logging.debug('ObjectChooser.__chooser_response_cb: %r' % object_id)
+        logging.debug('ObjectChooser.__chooser_response_cb: %r', object_id)
         self._response_code = gtk.RESPONSE_ACCEPT
         self._object_id = object_id
         self._cleanup()