From cc65ad1df867aa9bc781c64d94f1b8bb6ba748cf Mon Sep 17 00:00:00 2001
From: Sascha Silbe <sascha@silbe.org>
Date: Wed, 19 Aug 2009 21:06:53 +0200
Subject: [PATCH] let the logger do the formatting
---
po/sugar-toolkit.pot | 113 +++++++++++++++++++++------------
src/sugar/activity/activity.py | 32 +++++-----
src/sugar/activity/activityfactory.py | 18 +++---
src/sugar/activity/activityservice.py | 2 +-
src/sugar/bundle/activitybundle.py | 16 +++---
src/sugar/bundle/bundle.py | 2 +-
src/sugar/datastore/datastore.py | 2 +-
src/sugar/datastore/dbus_helpers.py | 12 ++--
src/sugar/graphics/icon.py | 4 +-
src/sugar/graphics/objectchooser.py | 4 +-
src/sugar/graphics/palette.py | 2 +-
src/sugar/graphics/palettewindow.py | 9 ++-
src/sugar/graphics/toolbarbox.py | 2 +-
src/sugar/presence/presenceservice.py | 4 +-
src/sugar/profile.py | 8 +-
src/sugar/util.py | 6 +-
16 files changed, 133 insertions(+), 103 deletions(-)
diff --git a/po/sugar-toolkit.pot b/po/sugar-toolkit.pot
index aad88d1..519beb2 100644
a
|
b
|
msgid "" |
8 | 8 | msgstr "" |
9 | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | 10 | "Report-Msgid-Bugs-To: \n" |
11 | | "POT-Creation-Date: 2008-06-24 00:07+0530\n" |
| 11 | "POT-Creation-Date: 2009-08-19 20:54+0200\n" |
12 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
… |
… |
msgstr "" |
17 | 17 | "Content-Transfer-Encoding: 8bit\n" |
18 | 18 | "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" |
19 | 19 | |
20 | | #: ../src/sugar/activity/activity.py:120 |
21 | | msgid "Share with:" |
| 20 | #: ../src/sugar/activity/activity.py:322 |
| 21 | #, python-format |
| 22 | msgid "%s Activity" |
22 | 23 | msgstr "" |
23 | 24 | |
24 | | #: ../src/sugar/activity/activity.py:122 |
25 | | msgid "Private" |
| 25 | #: ../src/sugar/activity/activity.py:703 |
| 26 | msgid "Keep error" |
26 | 27 | msgstr "" |
27 | 28 | |
28 | | #: ../src/sugar/activity/activity.py:123 |
29 | | msgid "My Neighborhood" |
| 29 | #: ../src/sugar/activity/activity.py:704 |
| 30 | msgid "Keep error: all changes will be lost" |
| 31 | msgstr "" |
| 32 | |
| 33 | #: ../src/sugar/activity/activity.py:707 |
| 34 | msgid "Don't stop" |
| 35 | msgstr "" |
| 36 | |
| 37 | #: ../src/sugar/activity/activity.py:710 |
| 38 | msgid "Stop anyway" |
30 | 39 | msgstr "" |
31 | 40 | |
32 | | #: ../src/sugar/activity/activity.py:130 |
| 41 | #: ../src/sugar/activity/namingalert.py:79 |
| 42 | msgid "Name this entry" |
| 43 | msgstr "" |
| 44 | |
| 45 | #: ../src/sugar/activity/namingalert.py:84 |
| 46 | #: ../src/sugar/activity/widgets.py:143 |
33 | 47 | msgid "Keep" |
34 | 48 | msgstr "" |
35 | 49 | |
36 | | #: ../src/sugar/activity/activity.py:136 |
| 50 | #: ../src/sugar/activity/namingalert.py:275 |
| 51 | msgid "Untitled" |
| 52 | msgstr "" |
| 53 | |
| 54 | #: ../src/sugar/activity/namingalert.py:282 |
| 55 | msgid "Description:" |
| 56 | msgstr "" |
| 57 | |
| 58 | #: ../src/sugar/activity/namingalert.py:306 |
| 59 | msgid "Tags:" |
| 60 | msgstr "" |
| 61 | |
| 62 | #: ../src/sugar/activity/widgets.py:72 |
37 | 63 | msgid "Stop" |
38 | 64 | msgstr "" |
39 | 65 | |
40 | | #: ../src/sugar/activity/activity.py:251 |
| 66 | #: ../src/sugar/activity/widgets.py:82 |
41 | 67 | msgid "Undo" |
42 | 68 | msgstr "" |
43 | 69 | |
44 | | #: ../src/sugar/activity/activity.py:256 |
| 70 | #: ../src/sugar/activity/widgets.py:88 |
45 | 71 | msgid "Redo" |
46 | 72 | msgstr "" |
47 | 73 | |
48 | | #: ../src/sugar/activity/activity.py:266 |
| 74 | #: ../src/sugar/activity/widgets.py:93 |
49 | 75 | msgid "Copy" |
50 | 76 | msgstr "" |
51 | 77 | |
52 | | #: ../src/sugar/activity/activity.py:271 |
| 78 | #: ../src/sugar/activity/widgets.py:98 |
53 | 79 | msgid "Paste" |
54 | 80 | msgstr "" |
55 | 81 | |
56 | | #: ../src/sugar/activity/activity.py:297 |
57 | | msgid "Activity" |
| 82 | #: ../src/sugar/activity/widgets.py:106 |
| 83 | msgid "Private" |
58 | 84 | msgstr "" |
59 | 85 | |
60 | | #: ../src/sugar/activity/activity.py:469 |
61 | | #, python-format |
62 | | msgid "%s Activity" |
| 86 | #: ../src/sugar/activity/widgets.py:113 |
| 87 | msgid "My Neighborhood" |
63 | 88 | msgstr "" |
64 | 89 | |
65 | | #: ../src/sugar/activity/activity.py:856 |
66 | | msgid "Keep error" |
| 90 | #: ../src/sugar/activity/widgets.py:314 |
| 91 | msgid "Activity" |
67 | 92 | msgstr "" |
68 | 93 | |
69 | | #: ../src/sugar/activity/activity.py:857 |
70 | | msgid "Keep error: all changes will be lost" |
| 94 | #: ../src/sugar/graphics/alert.py:288 ../src/sugar/graphics/alert.py:367 |
| 95 | msgid "Cancel" |
71 | 96 | msgstr "" |
72 | 97 | |
73 | | #: ../src/sugar/activity/activity.py:860 |
74 | | msgid "Don't stop" |
| 98 | #: ../src/sugar/graphics/alert.py:292 ../src/sugar/graphics/alert.py:426 |
| 99 | msgid "Ok" |
75 | 100 | msgstr "" |
76 | 101 | |
77 | | #: ../src/sugar/activity/activity.py:863 |
78 | | msgid "Stop anyway" |
| 102 | #: ../src/sugar/graphics/alert.py:377 |
| 103 | msgid "Continue" |
79 | 104 | msgstr "" |
80 | 105 | |
81 | | #: ../src/sugar/graphics/alert.py:166 ../src/sugar/graphics/alert.py:209 |
82 | | msgid "Cancel" |
| 106 | #: ../src/sugar/graphics/colorbutton.py:49 |
| 107 | msgid "Choose a color" |
83 | 108 | msgstr "" |
84 | 109 | |
85 | | #: ../src/sugar/graphics/alert.py:170 ../src/sugar/graphics/alert.py:247 |
86 | | msgid "Ok" |
| 110 | #: ../src/sugar/graphics/colorbutton.py:267 |
| 111 | msgid "Red" |
87 | 112 | msgstr "" |
88 | 113 | |
89 | | #: ../src/sugar/graphics/alert.py:219 |
90 | | msgid "Continue" |
| 114 | #: ../src/sugar/graphics/colorbutton.py:269 |
| 115 | msgid "Green" |
| 116 | msgstr "" |
| 117 | |
| 118 | #: ../src/sugar/graphics/colorbutton.py:271 |
| 119 | msgid "Blue" |
91 | 120 | msgstr "" |
92 | 121 | |
93 | | #: ../src/sugar/util.py:181 |
| 122 | #: ../src/sugar/util.py:196 |
94 | 123 | msgid " and " |
95 | 124 | msgstr "" |
96 | 125 | |
97 | | #: ../src/sugar/util.py:182 |
| 126 | #: ../src/sugar/util.py:197 |
98 | 127 | msgid ", " |
99 | 128 | msgstr "" |
100 | 129 | |
101 | 130 | #. TRANS: Indicating something that just happened, eg. "just now", "moments ago" |
102 | | #: ../src/sugar/util.py:185 |
| 131 | #: ../src/sugar/util.py:200 |
103 | 132 | msgid "Seconds ago" |
104 | 133 | msgstr "" |
105 | 134 | |
106 | 135 | #. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago", |
107 | 136 | #. "[2 minutes] in the past", or "[3 years, 1 month] earlier" |
108 | | #: ../src/sugar/util.py:189 |
| 137 | #: ../src/sugar/util.py:204 |
109 | 138 | #, python-format |
110 | 139 | msgid "%s ago" |
111 | 140 | msgstr "" |
112 | 141 | |
113 | 142 | #. TRANS: Relative dates (eg. 1 month and 5 days). |
114 | | #: ../src/sugar/util.py:202 |
| 143 | #: ../src/sugar/util.py:217 |
115 | 144 | #, python-format |
116 | 145 | msgid "%d year" |
117 | 146 | msgid_plural "%d years" |
118 | 147 | msgstr[0] "" |
119 | 148 | msgstr[1] "" |
120 | 149 | |
121 | | #: ../src/sugar/util.py:203 |
| 150 | #: ../src/sugar/util.py:218 |
122 | 151 | #, python-format |
123 | 152 | msgid "%d month" |
124 | 153 | msgid_plural "%d months" |
125 | 154 | msgstr[0] "" |
126 | 155 | msgstr[1] "" |
127 | 156 | |
128 | | #: ../src/sugar/util.py:204 |
| 157 | #: ../src/sugar/util.py:219 |
129 | 158 | #, python-format |
130 | 159 | msgid "%d week" |
131 | 160 | msgid_plural "%d weeks" |
132 | 161 | msgstr[0] "" |
133 | 162 | msgstr[1] "" |
134 | 163 | |
135 | | #: ../src/sugar/util.py:205 |
| 164 | #: ../src/sugar/util.py:220 |
136 | 165 | #, python-format |
137 | 166 | msgid "%d day" |
138 | 167 | msgid_plural "%d days" |
139 | 168 | msgstr[0] "" |
140 | 169 | msgstr[1] "" |
141 | 170 | |
142 | | #: ../src/sugar/util.py:206 |
| 171 | #: ../src/sugar/util.py:221 |
143 | 172 | #, python-format |
144 | 173 | msgid "%d hour" |
145 | 174 | msgid_plural "%d hours" |
146 | 175 | msgstr[0] "" |
147 | 176 | msgstr[1] "" |
148 | 177 | |
149 | | #: ../src/sugar/util.py:207 |
| 178 | #: ../src/sugar/util.py:222 |
150 | 179 | #, python-format |
151 | 180 | msgid "%d minute" |
152 | 181 | msgid_plural "%d minutes" |
diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
index f20d402..05c5b00 100644
a
|
b
|
class Activity(Window, gtk.Container): |
305 | 305 | else: |
306 | 306 | self.__joined_cb(self.shared_activity, True, None) |
307 | 307 | elif share_scope != SCOPE_PRIVATE: |
308 | | logging.debug("*** Act %s no existing mesh instance, but used to " \ |
309 | | "be shared, will share" % self._activity_id) |
| 308 | logging.debug('*** Act %s no existing mesh instance, but used to ' |
| 309 | 'be shared, will share', self._activity_id) |
310 | 310 | # no existing mesh instance, but activity used to be shared, so |
311 | 311 | # restart the share |
312 | 312 | if share_scope == SCOPE_INVITE_ONLY: |
… |
… |
class Activity(Window, gtk.Container): |
314 | 314 | elif share_scope == SCOPE_NEIGHBORHOOD: |
315 | 315 | self.share(private=False) |
316 | 316 | else: |
317 | | logging.debug("Unknown share scope %r" % share_scope) |
| 317 | logging.debug('Unknown share scope %r', share_scope) |
318 | 318 | |
319 | 319 | if handle.object_id is None and create_jobject: |
320 | 320 | logging.debug('Creating a jobject.') |
… |
… |
class Activity(Window, gtk.Container): |
409 | 409 | pass |
410 | 410 | |
411 | 411 | def __jobject_error_cb(self, err): |
412 | | logging.debug("Error creating activity datastore object: %s" % err) |
| 412 | logging.debug('Error creating activity datastore object: %s', err) |
413 | 413 | |
414 | 414 | def get_activity_root(self): |
415 | 415 | """ FIXME: Deprecated. This part of the API has been moved |
… |
… |
class Activity(Window, gtk.Container): |
486 | 486 | if self._closing: |
487 | 487 | self._show_keep_failed_dialog() |
488 | 488 | self._closing = False |
489 | | logging.debug("Error saving activity object to datastore: %s" % err) |
| 489 | logging.debug('Error saving activity object to datastore: %s', err) |
490 | 490 | |
491 | 491 | def _cleanup_jobject(self): |
492 | 492 | if self._jobject: |
493 | 493 | if self._owns_file and os.path.isfile(self._jobject.file_path): |
494 | | logging.debug('_cleanup_jobject: removing %r' % |
495 | | self._jobject.file_path) |
| 494 | logging.debug('_cleanup_jobject: removing %r', |
| 495 | self._jobject.file_path) |
496 | 496 | os.remove(self._jobject.file_path) |
497 | 497 | self._owns_file = False |
498 | 498 | self._jobject.destroy() |
… |
… |
class Activity(Window, gtk.Container): |
550 | 550 | logging.debug('Cannot save, no journal object.') |
551 | 551 | return |
552 | 552 | |
553 | | logging.debug('Activity.save: %r' % self._jobject.object_id) |
| 553 | logging.debug('Activity.save: %r', self._jobject.object_id) |
554 | 554 | |
555 | 555 | if self._updating_jobject: |
556 | 556 | logging.info('Activity.save: still processing a previous request.') |
… |
… |
class Activity(Window, gtk.Container): |
594 | 594 | Activities should not override this method. Instead, like save() do any |
595 | 595 | copy work that needs to be done in write_file() |
596 | 596 | """ |
597 | | logging.debug('Activity.copy: %r' % self._jobject.object_id) |
| 597 | logging.debug('Activity.copy: %r', self._jobject.object_id) |
598 | 598 | self.save() |
599 | 599 | self._jobject.object_id = None |
600 | 600 | |
… |
… |
class Activity(Window, gtk.Container): |
609 | 609 | self.shared_activity.disconnect(self._join_id) |
610 | 610 | self._join_id = None |
611 | 611 | if not success: |
612 | | logging.debug("Failed to join activity: %s" % err) |
| 612 | logging.debug('Failed to join activity: %s', err) |
613 | 613 | return |
614 | 614 | |
615 | 615 | self.present() |
… |
… |
class Activity(Window, gtk.Container): |
633 | 633 | self._pservice.disconnect(self._share_id) |
634 | 634 | self._share_id = None |
635 | 635 | if not success: |
636 | | logging.debug('Share of activity %s failed: %s.' % |
637 | | (self._activity_id, err)) |
| 636 | logging.debug('Share of activity %s failed: %s.', |
| 637 | self._activity_id, err) |
638 | 638 | return |
639 | 639 | |
640 | 640 | logging.debug('Share of activity %s successful, PS activity is %r.', |
… |
… |
class Activity(Window, gtk.Container): |
652 | 652 | |
653 | 653 | def _invite_response_cb(self, error): |
654 | 654 | if error: |
655 | | logging.error('Invite failed: %s' % error) |
| 655 | logging.error('Invite failed: %s', error) |
656 | 656 | |
657 | 657 | def _send_invites(self): |
658 | 658 | while self._invites_queue: |
… |
… |
class Activity(Window, gtk.Container): |
662 | 662 | self.shared_activity.invite( |
663 | 663 | buddy, '', self._invite_response_cb) |
664 | 664 | else: |
665 | | logging.error('Cannot invite %s, no such buddy.' % buddy_key) |
| 665 | logging.error('Cannot invite %s, no such buddy.', buddy_key) |
666 | 666 | |
667 | 667 | def invite(self, buddy_key): |
668 | 668 | """Invite a buddy to join this Activity. |
… |
… |
class Activity(Window, gtk.Container): |
692 | 692 | raise RuntimeError("Activity %s already shared." % |
693 | 693 | self._activity_id) |
694 | 694 | verb = private and 'private' or 'public' |
695 | | logging.debug('Requesting %s share of activity %s.' % |
696 | | (verb, self._activity_id)) |
| 695 | logging.debug('Requesting %s share of activity %s.', verb, |
| 696 | self._activity_id) |
697 | 697 | self._share_id = self._pservice.connect("activity-shared", |
698 | 698 | self.__share_cb) |
699 | 699 | self._pservice.share_activity(self, private=private) |
diff --git a/src/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py
index dcd840f..d731c3a 100644
a
|
b
|
def get_command(activity, activity_id=None, object_id=None, uri=None): |
143 | 143 | if os.path.exists(absolute_path): |
144 | 144 | command[0] = absolute_path |
145 | 145 | |
146 | | logging.debug('launching: %r' % command) |
| 146 | logging.debug('launching: %r', command) |
147 | 147 | |
148 | 148 | return command |
149 | 149 | |
… |
… |
class ActivityCreationHandler(gobject.GObject): |
300 | 300 | pass |
301 | 301 | |
302 | 302 | def _notify_launch_failure_error_handler(self, err): |
303 | | logging.error('Notify launch failure failed %s' % err) |
| 303 | logging.error('Notify launch failure failed %s', err) |
304 | 304 | |
305 | 305 | def _notify_launch_error_handler(self, err): |
306 | | logging.debug('Notify launch failed %s' % err) |
| 306 | logging.debug('Notify launch failed %s', err) |
307 | 307 | |
308 | 308 | def _activate_reply_handler(self, activated): |
309 | 309 | if not activated: |
310 | 310 | self._create_activity() |
311 | 311 | |
312 | 312 | def _activate_error_handler(self, err): |
313 | | logging.error("Activity activation request failed %s" % err) |
| 313 | logging.error('Activity activation request failed %s', err) |
314 | 314 | |
315 | 315 | def _create_reply_handler(self): |
316 | | logging.debug("Activity created %s (%s)." % |
317 | | (self._handle.activity_id, self._service_name)) |
| 316 | logging.debug('Activity created %s (%s).', |
| 317 | self._handle.activity_id, self._service_name) |
318 | 318 | |
319 | 319 | def _create_error_handler(self, err): |
320 | | logging.error("Couldn't create activity %s (%s): %s" % |
321 | | (self._handle.activity_id, self._service_name, err)) |
| 320 | logging.error("Couldn't create activity %s (%s): %s", |
| 321 | self._handle.activity_id, self._service_name, err) |
322 | 322 | self._shell.NotifyLaunchFailure( |
323 | 323 | self._handle.activity_id, reply_handler=self._no_reply_handler, |
324 | 324 | error_handler=self._notify_launch_failure_error_handler) |
… |
… |
class ActivityCreationHandler(gobject.GObject): |
331 | 331 | self._launch_activity() |
332 | 332 | |
333 | 333 | def _find_object_error_handler(self, err): |
334 | | logging.error("Datastore find failed %s" % err) |
| 334 | logging.error('Datastore find failed %s', err) |
335 | 335 | self._launch_activity() |
336 | 336 | |
337 | 337 | def create(bundle, activity_handle=None): |
diff --git a/src/sugar/activity/activityservice.py b/src/sugar/activity/activityservice.py
index ff806f3..20cf7fe 100644
a
|
b
|
class ActivityService(dbus.service.Object): |
61 | 61 | |
62 | 62 | @dbus.service.method(_ACTIVITY_INTERFACE) |
63 | 63 | def SetActive(self, active): |
64 | | logging.debug('ActivityService.set_active: %s.' % active) |
| 64 | logging.debug('ActivityService.set_active: %s.', active) |
65 | 65 | self._activity.props.active = active |
66 | 66 | |
67 | 67 | @dbus.service.method(_ACTIVITY_INTERFACE) |
diff --git a/src/sugar/bundle/activitybundle.py b/src/sugar/bundle/activitybundle.py
index 7877229..6f4f578 100644
a
|
b
|
class ActivityBundle(Bundle): |
110 | 110 | # Remove duplicates |
111 | 111 | if line in lines[0:num]: |
112 | 112 | lines[num] = "" |
113 | | logging.warning("Bundle %s: duplicate entry in MANIFEST: %s" |
114 | | % (self._name,line)) |
| 113 | logging.warning('Bundle %s: duplicate entry in MANIFEST: %s', |
| 114 | self._name, line) |
115 | 115 | continue |
116 | 116 | |
117 | 117 | # Remove MANIFEST |
118 | 118 | if line == "MANIFEST": |
119 | 119 | lines[num] = "" |
120 | | logging.warning("Bundle %s: MANIFEST includes itself: %s" |
121 | | % (self._name,line)) |
| 120 | logging.warning('Bundle %s: MANIFEST includes itself: %s', |
| 121 | self._name, line) |
122 | 122 | |
123 | 123 | # Remove invalid files |
124 | 124 | if not self.is_file(line): |
125 | 125 | lines[num] = "" |
126 | | logging.warning("Bundle %s: invalid entry in MANIFEST: %s" |
127 | | % (self._name,line)) |
| 126 | logging.warning('Bundle %s: invalid entry in MANIFEST: %s', |
| 127 | self._name, line) |
128 | 128 | |
129 | 129 | return lines |
130 | 130 | |
… |
… |
class ActivityBundle(Bundle): |
311 | 311 | if path in manifestfiles: |
312 | 312 | manifestfiles.remove(path) |
313 | 313 | elif path != "MANIFEST": |
314 | | logging.warning("Bundle %s: %s not in MANIFEST"% |
315 | | (self._name,path)) |
| 314 | logging.warning('Bundle %s: %s not in MANIFEST', self._name, |
| 315 | path) |
316 | 316 | if strict_manifest: |
317 | 317 | os.remove(os.path.join(install_path, path)) |
318 | 318 | |
diff --git a/src/sugar/bundle/bundle.py b/src/sugar/bundle/bundle.py
index a1b2686..5979d5b 100644
a
|
b
|
class Bundle(object): |
121 | 121 | data = self._zip_file.read(path) |
122 | 122 | f = StringIO.StringIO(data) |
123 | 123 | except KeyError: |
124 | | logging.debug('%s not found.' % filename) |
| 124 | logging.debug('%s not found.', filename) |
125 | 125 | |
126 | 126 | return f |
127 | 127 | |
diff --git a/src/sugar/datastore/datastore.py b/src/sugar/datastore/datastore.py
index 80d5936..1217c6a 100644
a
|
b
|
def write(ds_object, update_mtime=True, transfer_ownership=False, |
183 | 183 | transfer_ownership) |
184 | 184 | ds_object.metadata['uid'] = ds_object.object_id |
185 | 185 | # TODO: register the object for updates |
186 | | logging.debug('Written object %s to the datastore.' % ds_object.object_id) |
| 186 | logging.debug('Written object %s to the datastore.', ds_object.object_id) |
187 | 187 | |
188 | 188 | def delete(object_id): |
189 | 189 | logging.debug('datastore.delete') |
diff --git a/src/sugar/datastore/dbus_helpers.py b/src/sugar/datastore/dbus_helpers.py
index 9115382..94bf68a 100644
a
|
b
|
def update(uid, properties, filename, transfer_ownership=False, |
52 | 52 | debug_props = properties.copy() |
53 | 53 | if debug_props.has_key("preview"): |
54 | 54 | debug_props["preview"] = "<omitted>" |
55 | | logging.debug('dbus_helpers.update: %s, %s, %s, %s' % |
56 | | (uid, filename, debug_props, transfer_ownership)) |
| 55 | logging.debug('dbus_helpers.update: %s, %s, %s, %s', uid, filename, |
| 56 | debug_props, transfer_ownership) |
57 | 57 | if reply_handler and error_handler: |
58 | 58 | _get_data_store().update(uid, dbus.Dictionary(properties), filename, |
59 | 59 | transfer_ownership, |
… |
… |
def update(uid, properties, filename, transfer_ownership=False, |
65 | 65 | filename, transfer_ownership) |
66 | 66 | |
67 | 67 | def delete(uid): |
68 | | logging.debug('dbus_helpers.delete: %r' % uid) |
| 68 | logging.debug('dbus_helpers.delete: %r', uid) |
69 | 69 | _get_data_store().delete(uid) |
70 | 70 | |
71 | 71 | def get_properties(uid): |
72 | | logging.debug('dbus_helpers.get_properties: %s' % uid) |
| 72 | logging.debug('dbus_helpers.get_properties: %s', uid) |
73 | 73 | return _get_data_store().get_properties(uid, byte_arrays=True) |
74 | 74 | |
75 | 75 | def get_filename(uid): |
76 | 76 | filename = _get_data_store().get_filename(uid) |
77 | | logging.debug('dbus_helpers.get_filename: %s, %s' % (uid, filename)) |
| 77 | logging.debug('dbus_helpers.get_filename: %s, %s', uid, filename) |
78 | 78 | return filename |
79 | 79 | |
80 | 80 | def find(query, properties, reply_handler, error_handler): |
81 | | logging.debug('dbus_helpers.find: %r %r' % (query, properties)) |
| 81 | logging.debug('dbus_helpers.find: %r %r', query, properties) |
82 | 82 | if reply_handler and error_handler: |
83 | 83 | return _get_data_store().find(query, properties, |
84 | 84 | reply_handler=reply_handler, error_handler=error_handler, |
diff --git a/src/sugar/graphics/icon.py b/src/sugar/graphics/icon.py
index 2790775..51bb584 100644
a
|
b
|
class _IconBuffer(object): |
143 | 143 | |
144 | 144 | del info |
145 | 145 | else: |
146 | | logging.warning('No icon with the name %s ' |
147 | | 'was found in the theme.' % self.icon_name) |
| 146 | logging.warning('No icon with the name %s was found in the ' |
| 147 | 'theme.', self.icon_name) |
148 | 148 | |
149 | 149 | return icon_info |
150 | 150 | |
diff --git a/src/sugar/graphics/objectchooser.py b/src/sugar/graphics/objectchooser.py
index fb3703d..aa46738 100644
a
|
b
|
class ObjectChooser(object): |
110 | 110 | def __chooser_response_cb(self, chooser_id, object_id): |
111 | 111 | if chooser_id != self._chooser_id: |
112 | 112 | return |
113 | | logging.debug('ObjectChooser.__chooser_response_cb: %r' % object_id) |
| 113 | logging.debug('ObjectChooser.__chooser_response_cb: %r', object_id) |
114 | 114 | self._response_code = gtk.RESPONSE_ACCEPT |
115 | 115 | self._object_id = object_id |
116 | 116 | self._cleanup() |
… |
… |
class ObjectChooser(object): |
118 | 118 | def __chooser_cancelled_cb(self, chooser_id): |
119 | 119 | if chooser_id != self._chooser_id: |
120 | 120 | return |
121 | | logging.debug('ObjectChooser.__chooser_cancelled_cb: %r' % chooser_id) |
| 121 | logging.debug('ObjectChooser.__chooser_cancelled_cb: %r', chooser_id) |
122 | 122 | self._response_code = gtk.RESPONSE_CANCEL |
123 | 123 | self._cleanup() |
124 | 124 | |
diff --git a/src/sugar/graphics/palette.py b/src/sugar/graphics/palette.py
index 42d2beb..f0cf87a 100644
a
|
b
|
class Palette(PaletteWindow): |
180 | 180 | return self._full_request |
181 | 181 | |
182 | 182 | def popup(self, immediate=False, state=None): |
183 | | logging.debug('Palette.popup immediate %r' % immediate) |
| 183 | logging.debug('Palette.popup immediate %r', immediate) |
184 | 184 | |
185 | 185 | if self._invoker is not None: |
186 | 186 | self._update_full_request() |
diff --git a/src/sugar/graphics/palettewindow.py b/src/sugar/graphics/palettewindow.py
index 53b5f7c..6d95bac 100644
a
|
b
|
class PaletteWindow(gtk.Window): |
197 | 197 | self._invoker_hids.append(self._invoker.connect( |
198 | 198 | 'right-click', self._invoker_right_click_cb)) |
199 | 199 | |
200 | | logging.debug(' Invoker set to %r' % self._invoker) |
| 200 | logging.debug(' Invoker set to %r', self._invoker) |
201 | 201 | |
202 | 202 | def get_invoker(self): |
203 | 203 | return self._invoker |
… |
… |
class PaletteWindow(gtk.Window): |
296 | 296 | gtk.Bin.do_expose_event(self, event) |
297 | 297 | |
298 | 298 | def update_position(self): |
299 | | logging.debug(' update_position 1 %r %r' % (self._invoker, self._alignment)) |
| 299 | logging.debug(' update_position 1 %r %r', self._invoker, |
| 300 | self._alignment) |
300 | 301 | invoker = self._invoker |
301 | 302 | if invoker is None or self._alignment is None: |
302 | 303 | logging.error('Cannot update the palette position.') |
… |
… |
class PaletteWindow(gtk.Window): |
307 | 308 | if position is None: |
308 | 309 | position = invoker.get_position(rect) |
309 | 310 | |
310 | | logging.debug(' update_position %r %r' % (position.x, position.y)) |
| 311 | logging.debug(' update_position %r %r', position.x, position.y) |
311 | 312 | self.move(position.x, position.y) |
312 | 313 | |
313 | 314 | def get_full_size_request(self): |
… |
… |
class PaletteWindow(gtk.Window): |
329 | 330 | self.show() |
330 | 331 | |
331 | 332 | def popdown(self, immediate=False): |
332 | | logging.debug('Palette.popdown immediate %r' % immediate) |
| 333 | logging.debug('Palette.popdown immediate %r', immediate) |
333 | 334 | self._popup_anim.stop() |
334 | 335 | |
335 | 336 | self._mouse_detector.stop() |
diff --git a/src/sugar/graphics/toolbarbox.py b/src/sugar/graphics/toolbarbox.py
index f3d624d..48b5e1a 100644
a
|
b
|
class _ToolbarPalette(PaletteWindow): |
205 | 205 | def _handle_focus(self, delta): |
206 | 206 | self._focus += delta |
207 | 207 | if self._focus not in (0, 1): |
208 | | logging.error('_Palette._focus=%s not in (0, 1)' % self._focus) |
| 208 | logging.error('_Palette._focus=%s not in (0, 1)', self._focus) |
209 | 209 | |
210 | 210 | if self._focus == 0: |
211 | 211 | group = palettegroup.get_group('default') |
diff --git a/src/sugar/presence/presenceservice.py b/src/sugar/presence/presenceservice.py
index a7fd1a4..cc72800 100644
a
|
b
|
class PresenceService(gobject.GObject): |
473 | 473 | |
474 | 474 | def _share_activity_error_cb(self, activity, err): |
475 | 475 | """Notify with GObject event of unsuccessful sharing of activity""" |
476 | | _logger.debug("Error sharing activity %s: %s" % |
477 | | (activity.get_id(), err)) |
| 476 | _logger.debug('Error sharing activity %s: %s', activity.get_id(), |
| 477 | err) |
478 | 478 | self.emit("activity-shared", False, None, err) |
479 | 479 | |
480 | 480 | def share_activity(self, activity, properties=None, private=True): |
diff --git a/src/sugar/profile.py b/src/sugar/profile.py
index d5012bd..9d897ba 100644
a
|
b
|
class Profile(object): |
66 | 66 | f = open(key_path, "r") |
67 | 67 | lines = f.readlines() |
68 | 68 | f.close() |
69 | | except IOError, e: |
70 | | logging.error("Error reading public key: %s" % e) |
| 69 | except IOError: |
| 70 | logging.exception('Error reading public key') |
71 | 71 | return None |
72 | 72 | |
73 | 73 | magic = "ssh-dss " |
… |
… |
class Profile(object): |
92 | 92 | f = open(key_path, "r") |
93 | 93 | lines = f.readlines() |
94 | 94 | f.close() |
95 | | except IOError, e: |
96 | | logging.error("Error reading private key: %s" % e) |
| 95 | except IOError: |
| 96 | logging.exception('Error reading private key') |
97 | 97 | return None |
98 | 98 | |
99 | 99 | key = "" |
diff --git a/src/sugar/util.py b/src/sugar/util.py
index 26bbe83..034038b 100644
a
|
b
|
class TempFilePath(str): |
272 | 272 | if path is None: |
273 | 273 | fd, path = tempfile.mkstemp() |
274 | 274 | os.close(fd) |
275 | | logging.debug('TempFilePath created %r' % path) |
| 275 | logging.debug('TempFilePath created %r', path) |
276 | 276 | |
277 | 277 | if path in _tracked_paths: |
278 | 278 | _tracked_paths[path] += 1 |
… |
… |
class TempFilePath(str): |
287 | 287 | |
288 | 288 | if os.path.exists(self): |
289 | 289 | os.unlink(self) |
290 | | logging.debug('TempFilePath deleted %r' % self) |
| 290 | logging.debug('TempFilePath deleted %r', self) |
291 | 291 | else: |
292 | | logging.warning('TempFilePath already deleted %r' % self) |
| 292 | logging.warning('TempFilePath already deleted %r', self) |
293 | 293 | else: |
294 | 294 | _tracked_paths[self] -= 1 |
295 | 295 | |