Ticket #1213: 0001-let-the-logger-do-the-formatting.patch

po/sugar-toolkit.pot

@@ -8 +8 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-24 00:07+0530\n"
+"POT-Creation-Date: 2009-08-19 20:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17 +17 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../src/sugar/activity/activity.py:120
-msgid "Share with:"
+#: ../src/sugar/activity/activity.py:322
+#, python-format
+msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar/activity/activity.py:122
-msgid "Private"
+#: ../src/sugar/activity/activity.py:703
+msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar/activity/activity.py:123
-msgid "My Neighborhood"
+#: ../src/sugar/activity/activity.py:704
+msgid "Keep error: all changes will be lost"
+msgstr ""
+
+#: ../src/sugar/activity/activity.py:707
+msgid "Don't stop"
+msgstr ""
+
+#: ../src/sugar/activity/activity.py:710
+msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar/activity/activity.py:130
+#: ../src/sugar/activity/namingalert.py:79
+msgid "Name this entry"
+msgstr ""
+
+#: ../src/sugar/activity/namingalert.py:84
+#: ../src/sugar/activity/widgets.py:143
 msgid "Keep"
 msgstr ""
 
-#: ../src/sugar/activity/activity.py:136
+#: ../src/sugar/activity/namingalert.py:275
+msgid "Untitled"
+msgstr ""
+
+#: ../src/sugar/activity/namingalert.py:282
+msgid "Description:"
+msgstr ""
+
+#: ../src/sugar/activity/namingalert.py:306
+msgid "Tags:"
+msgstr ""
+
+#: ../src/sugar/activity/widgets.py:72
 msgid "Stop"
 msgstr ""
 
-#: ../src/sugar/activity/activity.py:251
+#: ../src/sugar/activity/widgets.py:82
 msgid "Undo"
 msgstr ""
 
-#: ../src/sugar/activity/activity.py:256
+#: ../src/sugar/activity/widgets.py:88
 msgid "Redo"
 msgstr ""
 
-#: ../src/sugar/activity/activity.py:266
+#: ../src/sugar/activity/widgets.py:93
 msgid "Copy"
 msgstr ""
 
-#: ../src/sugar/activity/activity.py:271
+#: ../src/sugar/activity/widgets.py:98
 msgid "Paste"
 msgstr ""
 
-#: ../src/sugar/activity/activity.py:297
-msgid "Activity"
+#: ../src/sugar/activity/widgets.py:106
+msgid "Private"
 msgstr ""
 
-#: ../src/sugar/activity/activity.py:469
-#, python-format
-msgid "%s Activity"
+#: ../src/sugar/activity/widgets.py:113
+msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar/activity/activity.py:856
-msgid "Keep error"
+#: ../src/sugar/activity/widgets.py:314
+msgid "Activity"
 msgstr ""
 
-#: ../src/sugar/activity/activity.py:857
-msgid "Keep error: all changes will be lost"
+#: ../src/sugar/graphics/alert.py:288 ../src/sugar/graphics/alert.py:367
+msgid "Cancel"
 msgstr ""
 
-#: ../src/sugar/activity/activity.py:860
-msgid "Don't stop"
+#: ../src/sugar/graphics/alert.py:292 ../src/sugar/graphics/alert.py:426
+msgid "Ok"
 msgstr ""
 
-#: ../src/sugar/activity/activity.py:863
-msgid "Stop anyway"
+#: ../src/sugar/graphics/alert.py:377
+msgid "Continue"
 msgstr ""
 
-#: ../src/sugar/graphics/alert.py:166 ../src/sugar/graphics/alert.py:209
-msgid "Cancel"
+#: ../src/sugar/graphics/colorbutton.py:49
+msgid "Choose a color"
 msgstr ""
 
-#: ../src/sugar/graphics/alert.py:170 ../src/sugar/graphics/alert.py:247
-msgid "Ok"
+#: ../src/sugar/graphics/colorbutton.py:267
+msgid "Red"
 msgstr ""
 
-#: ../src/sugar/graphics/alert.py:219
-msgid "Continue"
+#: ../src/sugar/graphics/colorbutton.py:269
+msgid "Green"
+msgstr ""
+
+#: ../src/sugar/graphics/colorbutton.py:271
+msgid "Blue"
 msgstr ""
 
-#: ../src/sugar/util.py:181
+#: ../src/sugar/util.py:196
 msgid " and "
 msgstr ""
 
-#: ../src/sugar/util.py:182
+#: ../src/sugar/util.py:197
 msgid ", "
 msgstr ""
 
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
-#: ../src/sugar/util.py:185
+#: ../src/sugar/util.py:200
 msgid "Seconds ago"
 msgstr ""
 
 #. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
 #. "[2 minutes] in the past", or "[3 years, 1 month] earlier"
-#: ../src/sugar/util.py:189
+#: ../src/sugar/util.py:204
 #, python-format
 msgid "%s ago"
 msgstr ""
 
 #. TRANS: Relative dates (eg. 1 month and 5 days).
-#: ../src/sugar/util.py:202
+#: ../src/sugar/util.py:217
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/sugar/util.py:203
+#: ../src/sugar/util.py:218
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/sugar/util.py:204
+#: ../src/sugar/util.py:219
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/sugar/util.py:205
+#: ../src/sugar/util.py:220
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/sugar/util.py:206
+#: ../src/sugar/util.py:221
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/sugar/util.py:207
+#: ../src/sugar/util.py:222
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"

src/sugar/activity/activity.py

@@ -305 +305 @@
             else:
                 self.__joined_cb(self.shared_activity, True, None)
         elif share_scope != SCOPE_PRIVATE:
-            logging.debug("*** Act %s no existing mesh instance, but used to " \
-                          "be shared, will share" % self._activity_id)
+            logging.debug('*** Act %s no existing mesh instance, but used to '
+                'be shared, will share', self._activity_id)
             # no existing mesh instance, but activity used to be shared, so
             # restart the share
             if share_scope == SCOPE_INVITE_ONLY:
@@ -314 +314 @@
             elif share_scope == SCOPE_NEIGHBORHOOD:
                 self.share(private=False)
             else:
-                logging.debug("Unknown share scope %r" % share_scope)
+                logging.debug('Unknown share scope %r', share_scope)
 
         if handle.object_id is None and create_jobject:
             logging.debug('Creating a jobject.')
@@ -409 +409 @@
         pass
 
     def __jobject_error_cb(self, err):
-        logging.debug("Error creating activity datastore object: %s" % err)
+        logging.debug('Error creating activity datastore object: %s', err)
 
     def get_activity_root(self):
         """ FIXME: Deprecated. This part of the API has been moved 
@@ -486 +486 @@
         if self._closing:
             self._show_keep_failed_dialog()
             self._closing = False
-        logging.debug("Error saving activity object to datastore: %s" % err)
+        logging.debug('Error saving activity object to datastore: %s', err)
 
     def _cleanup_jobject(self):
         if self._jobject:
             if self._owns_file and os.path.isfile(self._jobject.file_path):
-                logging.debug('_cleanup_jobject: removing %r' %
-                              self._jobject.file_path)
+                logging.debug('_cleanup_jobject: removing %r',
+                    self._jobject.file_path)
                 os.remove(self._jobject.file_path)
             self._owns_file = False
             self._jobject.destroy()
@@ -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
 
@@ -609 +609 @@
         self.shared_activity.disconnect(self._join_id)
         self._join_id = None
         if not success:
-            logging.debug("Failed to join activity: %s" % err)
+            logging.debug('Failed to join activity: %s', err)
             return
 
         self.present()
@@ -633 +633 @@
         self._pservice.disconnect(self._share_id)
         self._share_id = None
         if not success:
-            logging.debug('Share of activity %s failed: %s.' %
-                          (self._activity_id, err))
+            logging.debug('Share of activity %s failed: %s.',
+                self._activity_id, err)
             return
 
         logging.debug('Share of activity %s successful, PS activity is %r.',
@@ -652 +652 @@
 
     def _invite_response_cb(self, error):
         if error:
-            logging.error('Invite failed: %s' % error)
+            logging.error('Invite failed: %s', error)
 
     def _send_invites(self):
         while self._invites_queue:
@@ -662 +662 @@
                 self.shared_activity.invite(
                             buddy, '', self._invite_response_cb)
             else:
-                logging.error('Cannot invite %s, no such buddy.' % buddy_key)
+                logging.error('Cannot invite %s, no such buddy.', buddy_key)
 
     def invite(self, buddy_key):
         """Invite a buddy to join this Activity.
@@ -692 +692 @@
             raise RuntimeError("Activity %s already shared." %
                                self._activity_id)
         verb = private and 'private' or 'public'
-        logging.debug('Requesting %s share of activity %s.' %
-                      (verb, self._activity_id))
+        logging.debug('Requesting %s share of activity %s.', verb,
+            self._activity_id)
         self._share_id = self._pservice.connect("activity-shared", 
                                                 self.__share_cb)
         self._pservice.share_activity(self, private=private)

src/sugar/activity/activityfactory.py

@@ -143 +143 @@
         if os.path.exists(absolute_path):
             command[0] = absolute_path
 
-    logging.debug('launching: %r' % command)
+    logging.debug('launching: %r', command)
 
     return command
 
@@ -300 +300 @@
         pass
 
     def _notify_launch_failure_error_handler(self, err):
-        logging.error('Notify launch failure failed %s' % err)
+        logging.error('Notify launch failure failed %s', err)
 
     def _notify_launch_error_handler(self, err):
-        logging.debug('Notify launch failed %s' % err)
+        logging.debug('Notify launch failed %s', err)
 
     def _activate_reply_handler(self, activated):
         if not activated:
             self._create_activity()
 
     def _activate_error_handler(self, err):
-        logging.error("Activity activation request failed %s" % err)
+        logging.error('Activity activation request failed %s', err)
 
     def _create_reply_handler(self):
-        logging.debug("Activity created %s (%s)." %
-            (self._handle.activity_id, self._service_name))
+        logging.debug('Activity created %s (%s).',
+            self._handle.activity_id, self._service_name)
 
     def _create_error_handler(self, err):
-        logging.error("Couldn't create activity %s (%s): %s" %
-            (self._handle.activity_id, self._service_name, err))
+        logging.error("Couldn't create activity %s (%s): %s",
+            self._handle.activity_id, self._service_name, err)
         self._shell.NotifyLaunchFailure(
             self._handle.activity_id, reply_handler=self._no_reply_handler,
             error_handler=self._notify_launch_failure_error_handler)
@@ -331 +331 @@
         self._launch_activity()
 
     def _find_object_error_handler(self, err):
-        logging.error("Datastore find failed %s" % err)
+        logging.error('Datastore find failed %s', err)
         self._launch_activity()
 
 def create(bundle, activity_handle=None):

src/sugar/activity/activityservice.py

@@ -61 +61 @@
 
     @dbus.service.method(_ACTIVITY_INTERFACE)
     def SetActive(self, active):
-        logging.debug('ActivityService.set_active: %s.' % active)
+        logging.debug('ActivityService.set_active: %s.', active)
         self._activity.props.active = active
 
     @dbus.service.method(_ACTIVITY_INTERFACE)

src/sugar/bundle/activitybundle.py

@@ -110 +110 @@
             # Remove duplicates
             if line in lines[0:num]:
                 lines[num] = ""
-                logging.warning("Bundle %s: duplicate entry in MANIFEST: %s"
-                                % (self._name,line))
+                logging.warning('Bundle %s: duplicate entry in MANIFEST: %s',
+                    self._name, line)
                 continue
             
             # Remove MANIFEST
             if line == "MANIFEST":
                 lines[num] = ""
-                logging.warning("Bundle %s: MANIFEST includes itself: %s"
-                                % (self._name,line))
+                logging.warning('Bundle %s: MANIFEST includes itself: %s',
+                    self._name, line)
                 
             # Remove invalid files
             if not self.is_file(line):
                 lines[num] = ""
-                logging.warning("Bundle %s: invalid entry in MANIFEST: %s"
-                                % (self._name,line))
+                logging.warning('Bundle %s: invalid entry in MANIFEST: %s',
+                    self._name, line)
 
         return lines
     
@@ -311 +311 @@
             if path in manifestfiles:
                 manifestfiles.remove(path)
             elif path != "MANIFEST":
-                logging.warning("Bundle %s: %s not in MANIFEST"%
-                                (self._name,path))
+                logging.warning('Bundle %s: %s not in MANIFEST', self._name,
+                    path)
                 if strict_manifest:
                     os.remove(os.path.join(install_path, path))
                     

src/sugar/bundle/bundle.py

@@ -121 +121 @@
                 data = self._zip_file.read(path)
                 f = StringIO.StringIO(data)
             except KeyError:
-                logging.debug('%s not found.' % filename)
+                logging.debug('%s not found.', filename)
 
         return f
     

src/sugar/datastore/datastore.py

@@ -183 +183 @@
                                                   transfer_ownership)
         ds_object.metadata['uid'] = ds_object.object_id
         # TODO: register the object for updates
-    logging.debug('Written object %s to the datastore.' % ds_object.object_id)
+    logging.debug('Written object %s to the datastore.', ds_object.object_id)
 
 def delete(object_id):
     logging.debug('datastore.delete')

src/sugar/datastore/dbus_helpers.py

@@ -52 +52 @@
     debug_props = properties.copy()
     if debug_props.has_key("preview"):
         debug_props["preview"] = "<omitted>"
-    logging.debug('dbus_helpers.update: %s, %s, %s, %s' %
-                  (uid, filename, debug_props, transfer_ownership))
+    logging.debug('dbus_helpers.update: %s, %s, %s, %s', uid, filename,
+        debug_props, transfer_ownership)
     if reply_handler and error_handler:
         _get_data_store().update(uid, dbus.Dictionary(properties), filename,
                 transfer_ownership,
@@ -65 +65 @@
                                  filename, transfer_ownership)
 
 def delete(uid):
-    logging.debug('dbus_helpers.delete: %r' % uid)
+    logging.debug('dbus_helpers.delete: %r', uid)
     _get_data_store().delete(uid)
         
 def get_properties(uid):
-    logging.debug('dbus_helpers.get_properties: %s' % uid)
+    logging.debug('dbus_helpers.get_properties: %s', uid)
     return _get_data_store().get_properties(uid, byte_arrays=True)
 
 def get_filename(uid):
     filename = _get_data_store().get_filename(uid)
-    logging.debug('dbus_helpers.get_filename: %s, %s' % (uid, filename))
+    logging.debug('dbus_helpers.get_filename: %s, %s', uid, filename)
     return filename
 
 def find(query, properties, reply_handler, error_handler):
-    logging.debug('dbus_helpers.find: %r %r' % (query, properties))
+    logging.debug('dbus_helpers.find: %r %r', query, properties)
     if reply_handler and error_handler:
         return _get_data_store().find(query, properties,
                 reply_handler=reply_handler, error_handler=error_handler,

src/sugar/graphics/icon.py

@@ -143 +143 @@
 
                 del info
             else:
-                logging.warning('No icon with the name %s '
-                                'was found in the theme.' % self.icon_name)
+                logging.warning('No icon with the name %s was found in the '
+                    'theme.', self.icon_name)
 
         return icon_info
 

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()
@@ -118 +118 @@
     def __chooser_cancelled_cb(self, chooser_id):
         if chooser_id != self._chooser_id:
             return
-        logging.debug('ObjectChooser.__chooser_cancelled_cb: %r' % chooser_id)
+        logging.debug('ObjectChooser.__chooser_cancelled_cb: %r', chooser_id)
         self._response_code = gtk.RESPONSE_CANCEL
         self._cleanup()
 

src/sugar/graphics/palette.py

@@ -180 +180 @@
         return self._full_request
 
     def popup(self, immediate=False, state=None):
-        logging.debug('Palette.popup immediate %r' % immediate)
+        logging.debug('Palette.popup immediate %r', immediate)
 
         if self._invoker is not None:
             self._update_full_request()

src/sugar/graphics/palettewindow.py

@@ -197 +197 @@
             self._invoker_hids.append(self._invoker.connect(
                 'right-click', self._invoker_right_click_cb))
 
-        logging.debug('         Invoker set to %r' % self._invoker)
+        logging.debug('         Invoker set to %r', self._invoker)
 
     def get_invoker(self):
         return self._invoker
@@ -296 +296 @@
         gtk.Bin.do_expose_event(self, event)
 
     def update_position(self):
-        logging.debug('    update_position    1 %r %r' % (self._invoker, self._alignment))
+        logging.debug('    update_position    1 %r %r', self._invoker,
+            self._alignment)
         invoker = self._invoker
         if invoker is None or self._alignment is None:
             logging.error('Cannot update the palette position.')
@@ -307 +308 @@
         if position is None:
             position = invoker.get_position(rect)
 
-        logging.debug('    update_position    %r %r' % (position.x, position.y))
+        logging.debug('    update_position    %r %r', position.x, position.y)
         self.move(position.x, position.y)
 
     def get_full_size_request(self):
@@ -329 +330 @@
             self.show()
 
     def popdown(self, immediate=False):
-        logging.debug('Palette.popdown immediate %r' % immediate)
+        logging.debug('Palette.popdown immediate %r', immediate)
         self._popup_anim.stop()
 
         self._mouse_detector.stop()

src/sugar/graphics/toolbarbox.py

@@ -205 +205 @@
     def _handle_focus(self, delta):
         self._focus += delta
         if self._focus not in (0, 1):
-            logging.error('_Palette._focus=%s not in (0, 1)' % self._focus)
+            logging.error('_Palette._focus=%s not in (0, 1)', self._focus)
 
         if self._focus == 0:
             group = palettegroup.get_group('default')

src/sugar/presence/presenceservice.py

@@ -473 +473 @@
 
     def _share_activity_error_cb(self, activity, err):
         """Notify with GObject event of unsuccessful sharing of activity"""
-        _logger.debug("Error sharing activity %s: %s" %
-                      (activity.get_id(), err))
+        _logger.debug('Error sharing activity %s: %s', activity.get_id(),
+            err)
         self.emit("activity-shared", False, None, err)
 
     def share_activity(self, activity, properties=None, private=True):

src/sugar/profile.py

@@ -66 +66 @@
             f = open(key_path, "r")
             lines = f.readlines()
             f.close()
-        except IOError, e:
-            logging.error("Error reading public key: %s" % e)
+        except IOError:
+            logging.exception('Error reading public key')
             return None
 
         magic = "ssh-dss "
@@ -92 +92 @@
             f = open(key_path, "r")
             lines = f.readlines()
             f.close()
-        except IOError, e:
-            logging.error("Error reading private key: %s" % e)
+        except IOError:
+            logging.exception('Error reading private key')
             return None
 
         key = ""

src/sugar/util.py

@@ -272 +272 @@
         if path is None:
             fd, path = tempfile.mkstemp()
             os.close(fd)
-        logging.debug('TempFilePath created %r' % path)
+        logging.debug('TempFilePath created %r', path)
 
         if path in _tracked_paths:
             _tracked_paths[path] += 1
@@ -287 +287 @@
             
             if os.path.exists(self):
                 os.unlink(self)
-                logging.debug('TempFilePath deleted %r' % self)
+                logging.debug('TempFilePath deleted %r', self)
             else:
-                logging.warning('TempFilePath already deleted %r' % self)
+                logging.warning('TempFilePath already deleted %r', self)
         else:
             _tracked_paths[self] -= 1