changeset 21a5444ae76e in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=21a5444ae76e description: itervalues / iterkeys doesn't exist anymore
diffstat:
src/command_system/framework.py | 2 +- src/command_system/implementation/standard.py | 6 +++--- src/common/configpaths.py | 2 +- src/common/jingle_session.py | 6 +++--- src/filetransfers_window.py | 2 +- src/network_manager_listener.py | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-)
diffs (125 lines):
diff -r 3c1a1ae44036 -r 21a5444ae76e src/command_system/framework.py --- a/src/command_system/framework.py Sat Jan 05 00:03:36 2013 +0100 +++ b/src/command_system/framework.py Sat Jan 05 09:52:09 2013 +0100 @@ -143,7 +143,7 @@ def list_commands(self): commands = list_commands(self.COMMAND_HOST) commands = dict(commands) - return sorted(set(commands.itervalues())) + return sorted(commands.values())
class Command(object):
diff -r 3c1a1ae44036 -r 21a5444ae76e src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Sat Jan 05 00:03:36 2013 +0100 +++ b/src/command_system/implementation/standard.py Sat Jan 05 09:52:09 2013 +0100 @@ -135,7 +135,7 @@ def status(self, status, message): if status not in ('online', 'away', 'chat', 'xa', 'dnd'): raise CommandError("Invalid status given") - for connection in gajim.connections.itervalues(): + for connection in gajim.connections.values(): if not gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue @@ -149,7 +149,7 @@ if not message: message = _("Away")
- for connection in gajim.connections.itervalues(): + for connection in gajim.connections.values(): if not gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue @@ -163,7 +163,7 @@ if not message: message = _("Available")
- for connection in gajim.connections.itervalues(): + for connection in gajim.connections.values(): if not gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue diff -r 3c1a1ae44036 -r 21a5444ae76e src/common/configpaths.py --- a/src/common/configpaths.py Sat Jan 05 00:03:36 2013 +0100 +++ b/src/common/configpaths.py Sat Jan 05 09:52:09 2013 +0100 @@ -131,7 +131,7 @@ return default
def items(self): - for key in self.paths.iterkeys(): + for key in self.paths.keys(): yield (key, self[key])
def init(self, root=None): diff -r 3c1a1ae44036 -r 21a5444ae76e src/common/jingle_session.py --- a/src/common/jingle_session.py Sat Jan 05 00:03:36 2013 +0100 +++ b/src/common/jingle_session.py Sat Jan 05 09:52:09 2013 +0100 @@ -270,8 +270,8 @@ """ Return True when all codecs and candidates are ready (for all contents) """ - return (any((content.is_ready() for content in self.contents.itervalues())) - and self.accepted) + return (any((content.is_ready() for content in self.contents.values())) + and self.accepted)
def accept_session(self): """ @@ -589,7 +589,7 @@ """ Broadcast the stanza to all content handlers """ - for content in self.contents.itervalues(): + for content in self.contents.values(): content.on_stanza(stanza, None, error, action)
def __parse_contents(self, jingle): diff -r 3c1a1ae44036 -r 21a5444ae76e src/filetransfers_window.py --- a/src/filetransfers_window.py Sat Jan 05 00:03:36 2013 +0100 +++ b/src/filetransfers_window.py Sat Jan 05 09:52:09 2013 +0100 @@ -327,7 +327,7 @@ dialog.set_default_response(Gtk.ResponseType.OK)
desc_hbox = Gtk.HBox(False, 5) - desc_hbox.pack_start(Gtk.Label(_('Description: ', True, True, 0)), False, False, 0) + desc_hbox.pack_start(Gtk.Label(_('Description: ')), False, False, 0) desc_hbox.pack_start(win, True, True, 0)
dialog.vbox.pack_start(desc_hbox, False, False, 0) diff -r 3c1a1ae44036 -r 21a5444ae76e src/network_manager_listener.py --- a/src/network_manager_listener.py Sat Jan 05 00:03:36 2013 +0100 +++ b/src/network_manager_listener.py Sat Jan 05 09:52:09 2013 +0100 @@ -29,7 +29,7 @@ """ For Network Manager 0.6 """ - for connection in gajim.connections.itervalues(): + for connection in gajim.connections.values(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.time_to_reconnect: connection._reconnect() @@ -38,7 +38,7 @@ """ For Network Manager 0.6 """ - for connection in gajim.connections.itervalues(): + for connection in gajim.connections.values(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.connected > 1: connection._disconnectedReconnCB() @@ -49,12 +49,12 @@ """ nm_state = props.Get("org.freedesktop.NetworkManager", "State") if nm_state == 3 or nm_state == 70: - for connection in gajim.connections.itervalues(): + for connection in gajim.connections.values(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.time_to_reconnect: connection._reconnect() else: - for connection in gajim.connections.itervalues(): + for connection in gajim.connections.values(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.connected > 1: connection._disconnectedReconnCB()