diff options
Diffstat (limited to 'olpcgames/mesh.py')
| -rw-r--r--[-rwxr-xr-x] | olpcgames/mesh.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/olpcgames/mesh.py b/olpcgames/mesh.py index 1ad4c43..9f5ff67 100755..100644 --- a/olpcgames/mesh.py +++ b/olpcgames/mesh.py @@ -151,11 +151,11 @@ DBUS_SERVICE = None ### NEW PYGAME EVENTS ### -CONNECT = olpcgames.CONNECT -PARTICIPANT_ADD = olpcgames.PARTICIPANT_ADD +CONNECT = olpcgames.CONNECT +PARTICIPANT_ADD = olpcgames.PARTICIPANT_ADD PARTICIPANT_REMOVE = olpcgames.PARTICIPANT_REMOVE -MESSAGE_UNI = olpcgames.MESSAGE_UNI -MESSAGE_MULTI = olpcgames.MESSAGE_MULTI +MESSAGE_UNI = olpcgames.MESSAGE_UNI +MESSAGE_MULTI = olpcgames.MESSAGE_MULTI # Private objects for useful purposes! @@ -198,10 +198,10 @@ def activity_shared(activity): log.debug('This is my activity: making a tube...') channel = tubes_chan[telepathy.CHANNEL_TYPE_TUBES] if hasattr( channel, 'OfferDBusTube' ): - id = channel.OfferDBusTube( + channel.OfferDBusTube( DBUS_SERVICE, {}) else: - id = channel.OfferTube( + channel.OfferTube( telepathy.TUBE_TYPE_DBUS, DBUS_SERVICE, {}) global connect_callback @@ -422,7 +422,7 @@ def _get_presence_service( ): name, path = pservice.get_preferred_connection() log.debug( ' Name = %s Path = %s', name, path ) except (TypeError,ValueError), err: - log.warn('Working in offline mode, cannot retrieve buddy information for %s: %s', handle, err ) + log.warn('Working in offline mode, cannot retrieve buddy information. %s', err) raise OfflineError( """Unable to retrieve buddy information, currently offline""" ) else: return pservice @@ -539,7 +539,7 @@ def get_participants(): log.debug( 'get_participants' ) try: return instance().ordered_bus_names[:] - except IndexError, err: + except IndexError: return [] # no participants yet, as we don't yet have a connection def dbus_get_object(handle, path, warning=True): |