Use proper formatting syntax, fixes #2170
This commit is contained in:
akskumarnot
committed by
Daniel Narvaez
Daniel Narvaez
parent
f43d5f8d24
commit
81b388c554
@@ -138,17 +138,17 @@ class Activity(GObject.GObject):
|
||||
dbus_interface=CONN_INTERFACE_ACTIVITY_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)
|
||||
|
||||
def __got_properties_cb(self, properties):
|
||||
_logger.debug('__got_properties_cb %r', properties)
|
||||
_logger.debug('__got_properties_cb %r' % properties)
|
||||
self._get_properties_call = None
|
||||
self._update_properties(properties)
|
||||
|
||||
def __error_handler_cb(self, error):
|
||||
_logger.debug('__error_handler_cb %r', error)
|
||||
_logger.debug('__error_handler_cb %r' % error)
|
||||
|
||||
def _update_properties(self, new_props):
|
||||
val = new_props.get('name', self._name)
|
||||
@@ -188,7 +188,7 @@ class Activity(GObject.GObject):
|
||||
|
||||
if self._get_properties_call is not None:
|
||||
_logger.debug('%r: Blocking on GetProperties() because someone '
|
||||
'wants property %s', self, pspec.name)
|
||||
'wants property %s' % (self, pspec.name))
|
||||
self._get_properties_call.block()
|
||||
|
||||
if pspec.name == 'id':
|
||||
@@ -218,12 +218,12 @@ class Activity(GObject.GObject):
|
||||
elif pspec.name == 'private':
|
||||
self._private = val
|
||||
else:
|
||||
raise ValueError('Unknown property %r', pspec.name)
|
||||
raise ValueError('Unknown property %r' % pspec.name)
|
||||
|
||||
self._publish_properties()
|
||||
|
||||
def set_private(self, val, reply_handler, error_handler):
|
||||
_logger.debug('set_private %r', val)
|
||||
_logger.debug('set_private %r' % val)
|
||||
self._activity.SetProperties({'private': bool(val)},
|
||||
reply_handler=reply_handler,
|
||||
error_handler=error_handler)
|
||||
@@ -271,7 +271,7 @@ class Activity(GObject.GObject):
|
||||
raise NotImplementedError()
|
||||
|
||||
def __joined_cb(self, join_command, error):
|
||||
_logger.debug('%r: Join finished %r', self, error)
|
||||
_logger.debug('%r: Join finished %r' % (self, error))
|
||||
if error is not None:
|
||||
self.emit('joined', error is None, str(error))
|
||||
self.telepathy_text_chan = join_command.text_channel
|
||||
@@ -295,8 +295,8 @@ class Activity(GObject.GObject):
|
||||
channel.connect_to_signal('Closed', self.__text_channel_closed_cb)
|
||||
|
||||
def __get_all_members_cb(self, members, local_pending, remote_pending):
|
||||
_logger.debug('__get_all_members_cb %r %r', members,
|
||||
self._text_channel_group_flags)
|
||||
_logger.debug('__get_all_members_cb %r %r' % (members,
|
||||
self._text_channel_group_flags))
|
||||
if self._channel_self_handle in members:
|
||||
members.remove(self._channel_self_handle)
|
||||
|
||||
@@ -324,7 +324,7 @@ class Activity(GObject.GObject):
|
||||
get_handle_owners_cb(input_handles)
|
||||
|
||||
def _add_initial_buddies(self, contact_ids):
|
||||
_logger.debug('__add_initial_buddies %r', contact_ids)
|
||||
_logger.debug('__add_initial_buddies %r' % contact_ids)
|
||||
for contact_id in contact_ids:
|
||||
self._buddies[contact_id] = self._get_buddy(contact_id)
|
||||
self._joined_buddies[contact_id] = self._get_buddy(contact_id)
|
||||
@@ -335,7 +335,7 @@ class Activity(GObject.GObject):
|
||||
def __text_channel_members_changed_cb(self, message, added, removed,
|
||||
local_pending, remote_pending,
|
||||
actor, reason):
|
||||
_logger.debug('__text_channel_members_changed_cb %r',
|
||||
_logger.debug('__text_channel_members_changed_cb %r' %
|
||||
[added, message, added, removed, local_pending,
|
||||
remote_pending, actor, reason])
|
||||
if self._channel_self_handle in added:
|
||||
@@ -382,7 +382,7 @@ class Activity(GObject.GObject):
|
||||
self.emit('joined', True, None)
|
||||
return
|
||||
|
||||
_logger.debug('%r: joining', self)
|
||||
_logger.debug('%r: joining' % self)
|
||||
|
||||
self._join_command = _JoinCommand(self.telepathy_conn,
|
||||
self.room_handle)
|
||||
@@ -402,7 +402,7 @@ class Activity(GObject.GObject):
|
||||
|
||||
def __shared_cb(self, share_activity_cb, share_activity_error_cb,
|
||||
share_command, error):
|
||||
_logger.debug('%r: Share finished %r', self, error)
|
||||
_logger.debug('%r: Share finished %r' % (self, error))
|
||||
if error is None:
|
||||
self._joined = True
|
||||
self.room_handle = share_command.room_handle
|
||||
@@ -438,7 +438,7 @@ class Activity(GObject.GObject):
|
||||
dbus_interface=CONN_INTERFACE_ACTIVITY_PROPERTIES)
|
||||
|
||||
def __share_error_cb(self, share_activity_error_cb, error):
|
||||
logging.debug('%r: Share failed because: %s', self, error)
|
||||
logging.debug('%r: Share failed because: %s' % (self, error))
|
||||
share_activity_error_cb(self, error)
|
||||
|
||||
# GetChannels() wrapper
|
||||
@@ -459,8 +459,8 @@ class Activity(GObject.GObject):
|
||||
channels = [self.telepathy_text_chan.object_path,
|
||||
self.telepathy_tubes_chan.object_path]
|
||||
|
||||
_logger.debug('%r: bus name is %s, connection is %s, channels are %r',
|
||||
self, bus_name, connection_path, channels)
|
||||
_logger.debug('%r: bus name is %s, connection is %s, channels are %r' %
|
||||
(self, bus_name, connection_path, channels))
|
||||
return bus_name, connection_path, channels
|
||||
|
||||
# Leaving
|
||||
@@ -470,7 +470,7 @@ class Activity(GObject.GObject):
|
||||
|
||||
def leave(self):
|
||||
"""Leave this shared activity"""
|
||||
_logger.debug('%r: leaving', self)
|
||||
_logger.debug('%r: leaving' % self)
|
||||
self.telepathy_text_chan.Close()
|
||||
|
||||
|
||||
@@ -511,7 +511,7 @@ class _ShareCommand(_BaseCommand):
|
||||
dbus_interface=CONNECTION)
|
||||
|
||||
def __got_handles_cb(self, handles):
|
||||
logging.debug('__got_handles_cb %r', handles)
|
||||
logging.debug('__got_handles_cb %r' % handles)
|
||||
self.room_handle = handles[0]
|
||||
|
||||
self._join_command = _JoinCommand(self._connection, self.room_handle)
|
||||
@@ -519,7 +519,7 @@ class _ShareCommand(_BaseCommand):
|
||||
self._join_command.run()
|
||||
|
||||
def __joined_cb(self, join_command, error):
|
||||
_logger.debug('%r: Join finished %r', self, error)
|
||||
_logger.debug('%r: Join finished %r' % (self, error))
|
||||
if error is not None:
|
||||
self._finished = True
|
||||
self.emit('finished', error)
|
||||
@@ -597,12 +597,12 @@ class _JoinCommand(_BaseCommand):
|
||||
self.emit('finished', error)
|
||||
|
||||
def __tubes_channel_ready_cb(self, channel):
|
||||
_logger.debug('%r: Tubes channel %r is ready', self, channel)
|
||||
_logger.debug('%r: Tubes channel %r is ready' % (self, channel))
|
||||
self.tubes_channel = channel
|
||||
self._tubes_ready()
|
||||
|
||||
def __text_channel_ready_cb(self, channel):
|
||||
_logger.debug('%r: Text channel %r is ready', self, channel)
|
||||
_logger.debug('%r: Text channel %r is ready' % (self, channel))
|
||||
self.text_channel = channel
|
||||
self._tubes_ready()
|
||||
|
||||
@@ -611,13 +611,13 @@ class _JoinCommand(_BaseCommand):
|
||||
self.tubes_channel is None:
|
||||
return
|
||||
|
||||
_logger.debug('%r: finished setting up tubes', self)
|
||||
_logger.debug('%r: finished setting up tubes' % self)
|
||||
|
||||
self._add_self_to_channel()
|
||||
|
||||
def __text_channel_group_flags_changed_cb(self, added, removed):
|
||||
_logger.debug('__text_channel_group_flags_changed_cb %r %r', added,
|
||||
removed)
|
||||
_logger.debug('__text_channel_group_flags_changed_cb %r %r' % (added,
|
||||
removed))
|
||||
self.text_channel_group_flags |= added
|
||||
self.text_channel_group_flags &= ~removed
|
||||
|
||||
@@ -629,8 +629,8 @@ class _JoinCommand(_BaseCommand):
|
||||
|
||||
def got_all_members(members, local_pending, remote_pending):
|
||||
_logger.debug('got_all_members members %r local_pending %r '
|
||||
'remote_pending %r', members, local_pending,
|
||||
remote_pending)
|
||||
'remote_pending %r' % (members, local_pending,
|
||||
remote_pending))
|
||||
|
||||
if self.text_channel_group_flags & \
|
||||
CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES:
|
||||
@@ -639,7 +639,7 @@ class _JoinCommand(_BaseCommand):
|
||||
self_handle = self._global_self_handle
|
||||
|
||||
if self_handle in local_pending:
|
||||
_logger.debug('%r: We are in local pending - entering', self)
|
||||
_logger.debug('%r: We are in local pending - entering' % self)
|
||||
group.AddMembers([self_handle], '',
|
||||
reply_handler=lambda: None,
|
||||
error_handler=lambda e: self._join_failed_cb(
|
||||
@@ -675,8 +675,8 @@ class _JoinCommand(_BaseCommand):
|
||||
actor, reason):
|
||||
_logger.debug('__text_channel_members_changed_cb added %r removed %r '
|
||||
'local_pending %r remote_pending %r channel_self_handle '
|
||||
'%r', added, removed, local_pending, remote_pending,
|
||||
self.channel_self_handle)
|
||||
'%r' % (added, removed, local_pending, remote_pending,
|
||||
self.channel_self_handle))
|
||||
|
||||
if self.text_channel_group_flags & \
|
||||
CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES:
|
||||
|
||||
@@ -81,7 +81,7 @@ class PresenceService(GObject.GObject):
|
||||
for account_path, connection in connections_per_account.items():
|
||||
if not connection.connected:
|
||||
continue
|
||||
logging.debug('Calling GetActivity on %s', account_path)
|
||||
logging.debug('Calling GetActivity on %s' % account_path)
|
||||
try:
|
||||
room_handle = connection.connection.GetActivity(
|
||||
activity_id,
|
||||
@@ -90,7 +90,7 @@ class PresenceService(GObject.GObject):
|
||||
name = 'org.freedesktop.Telepathy.Error.NotAvailable'
|
||||
if e.get_dbus_name() == name:
|
||||
logging.debug("There's no shared activity with the id "
|
||||
"%s", activity_id)
|
||||
"%s" % activity_id)
|
||||
else:
|
||||
raise
|
||||
else:
|
||||
@@ -162,8 +162,8 @@ class PresenceService(GObject.GObject):
|
||||
dbus_interface=CONNECTION)
|
||||
return self.get_buddy(account_path, contact_ids[0])
|
||||
|
||||
raise ValueError('Unknown buddy in connection %s with handle %d',
|
||||
tp_conn_path, handle)
|
||||
raise ValueError('Unknown buddy in connection %s with handle %d' %
|
||||
(tp_conn_path, handle))
|
||||
|
||||
def get_owner(self):
|
||||
"""Retrieves the laptop Buddy object."""
|
||||
@@ -198,7 +198,7 @@ class PresenceService(GObject.GObject):
|
||||
properties['private'] = private
|
||||
|
||||
if self._activity_cache is not None:
|
||||
raise ValueError('Activity %s is already tracked',
|
||||
raise ValueError('Activity %s is already tracked' %
|
||||
activity.get_id())
|
||||
|
||||
connection_manager = get_connection_manager()
|
||||
|
||||
Reference in New Issue
Block a user