sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PEP8 cleanup: ensure lines are shorter than 80 characters

Browse Source 
Caught by PEP8. This is important for Sugar because the XO has a small screen
where long lines would make the code hard to understand (because you need to
constantly scroll horizontally).

Reviewed-by: James Cameron <quozl@laptop.org>
Acked-by: Simon Schampijer<simon@schampijer.de>
CC: Aleksey Lim <alsroot@member.fsf.org>
This commit is contained in:
Sascha Silbe 2010-10-15 18:04:34 +00:00
parent e2231d5620
commit 4d978fda14
6 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sugar/activity/activity.py
View File

@ -569,7 +569,8 @@ class Activity(Window, gtk.Container):
if self._closing: if self._closing:
self._show_keep_failed_dialog() self._show_keep_failed_dialog()
self._closing = False self._closing = False
raise RuntimeError('Error saving activity object to datastore: %s', err) raise RuntimeError('Error saving activity object to datastore: %s',
err)
def _cleanup_jobject(self): def _cleanup_jobject(self):
if self._jobject: if self._jobject:

3
src/sugar/presence/activity.py
View File

@ -135,7 +135,8 @@ class Activity(gobject.GObject):
dbus_interface=CONN_INTERFACE_ACTIVITY_PROPERTIES) dbus_interface=CONN_INTERFACE_ACTIVITY_PROPERTIES)
def __activity_properties_changed_cb(self, room_handle, properties): def __activity_properties_changed_cb(self, room_handle, properties):
_logger.debug('%r: Activity properties changed to %r', self, properties) _logger.debug('%r: Activity properties changed to %r', self,
properties)
self._update_properties(properties) self._update_properties(properties)
def __got_properties_cb(self, properties): def __got_properties_cb(self, properties):

3
src/sugar/presence/buddy.py
View File

@ -182,7 +182,8 @@ class Buddy(BaseBuddy):
CONNECTION_INTERFACE_CONTACTS, CONNECTION_INTERFACE_CONTACTS,
'GetContactAttributes', 'GetContactAttributes',
'auasb', 'auasb',
([self.contact_handle], [CONNECTION_INTERFACE_ALIASING], False), ([self.contact_handle], [CONNECTION_INTERFACE_ALIASING],
False),
reply_handler=self.__got_attributes_cb, reply_handler=self.__got_attributes_cb,
error_handler=self.__error_handler_cb) error_handler=self.__error_handler_cb)

3
src/sugar/presence/connectionmanager.py
View File

@ -77,7 +77,8 @@ class ConnectionManager(object):
Connection(account_path, connection) Connection(account_path, connection)
account = bus.get_object(ACCOUNT_MANAGER_SERVICE, account_path) account = bus.get_object(ACCOUNT_MANAGER_SERVICE, account_path)
if account.Get(ACCOUNT, 'ConnectionStatus') == CONNECTION_STATUS_CONNECTED: status = account.Get(ACCOUNT, 'ConnectionStatus')
if status == CONNECTION_STATUS_CONNECTED:
self._connections_per_account[account_path].connected = True self._connections_per_account[account_path].connected = True
else: else:
self._connections_per_account[account_path].connected = False self._connections_per_account[account_path].connected = False

12
src/sugar/presence/presenceservice.py
View File

@ -72,8 +72,8 @@ class PresenceService(gobject.GObject):
""" """
if self._activity_cache is not None: if self._activity_cache is not None:
if self._activity_cache.props.id != activity_id: if self._activity_cache.props.id != activity_id:
raise RuntimeError('Activities can only access their own shared' raise RuntimeError('Activities can only access their own'
'instance') ' shared instance')
return self._activity_cache return self._activity_cache
else: else:
connection_manager = get_connection_manager() connection_manager = get_connection_manager()
@ -105,8 +105,8 @@ class PresenceService(gobject.GObject):
def get_activity_by_handle(self, connection_path, room_handle): def get_activity_by_handle(self, connection_path, room_handle):
if self._activity_cache is not None: if self._activity_cache is not None:
if self._activity_cache.room_handle != room_handle: if self._activity_cache.room_handle != room_handle:
raise RuntimeError('Activities can only access their own shared' raise RuntimeError('Activities can only access their own'
'instance') ' shared instance')
return self._activity_cache return self._activity_cache
else: else:
connection_manager = get_connection_manager() connection_manager = get_connection_manager()
@ -227,8 +227,8 @@ class PresenceService(gobject.GObject):
returns the bus name and the object path of the Telepathy connection returns the bus name and the object path of the Telepathy connection
""" """
connection_manager = get_connection_manager() manager = get_connection_manager()
account_path, connection = connection_manager.get_preferred_connection() account_path, connection = manager.get_preferred_connection()
if connection is None: if connection is None:
return None return None
else: else:

10
tests/lib/test_mime.py
View File

@ -37,15 +37,17 @@ class TestMime(unittest.TestCase):
# Mozilla's text in c&v # Mozilla's text in c&v
mime_type = mime.choose_most_significant( mime_type = mime.choose_most_significant(
['text/_moz_htmlcontext', 'STRING', 'text/html', 'text/_moz_htmlinfo', ['text/_moz_htmlcontext', 'STRING', 'text/html',
'text/x-moz-url-priv', 'UTF8_STRING', 'COMPOUND_TEXT']) 'text/_moz_htmlinfo', 'text/x-moz-url-priv', 'UTF8_STRING',
'COMPOUND_TEXT'])
self.assertEqual(mime_type, 'text/html') self.assertEqual(mime_type, 'text/html')
# Mozilla gif in dnd # Mozilla gif in dnd
mime_type = mime.choose_most_significant( mime_type = mime.choose_most_significant(
['application/x-moz-file-promise-url', ['application/x-moz-file-promise-url',
'application/x-moz-file-promise-dest-filename', 'text/_moz_htmlinfo', 'application/x-moz-file-promise-dest-filename',
'text/x-moz-url-desc', 'text/_moz_htmlcontext', 'text/x-moz-url-data', 'text/_moz_htmlinfo', 'text/x-moz-url-desc',
'text/_moz_htmlcontext', 'text/x-moz-url-data',
'text/uri-list']) 'text/uri-list'])
self.assertEqual(mime_type, 'text/uri-list') self.assertEqual(mime_type, 'text/uri-list')