itervalues / iterkeys doesn't exist anymore

src/command_system/framework.py

@@ -143,7 +143,7 @@ class CommandProcessor(object):
     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):
 

src/command_system/implementation/standard.py

@@ -135,7 +135,7 @@ class StandardCommonCommands(CommandContainer):
     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 @@ class StandardCommonCommands(CommandContainer):
         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 @@ class StandardCommonCommands(CommandContainer):
         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

src/common/configpaths.py

@@ -131,7 +131,7 @@ class ConfigPaths:
             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):

src/common/jingle_session.py

@@ -270,8 +270,8 @@ class JingleSession(object):
         """
         Return True when all codecs and candidates are ready (for all contents)
         """
-        return (any((content.is_ready() for content in self.contents.itervalues()))
+        return (any((content.is_ready() for content in self.contents.values()))
-                and self.accepted)
+            and self.accepted)
 
     def accept_session(self):
         """
@@ -589,7 +589,7 @@ class JingleSession(object):
         """
         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):

src/filetransfers_window.py

@@ -327,7 +327,7 @@ class FileTransfersWindow:
         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)

src/network_manager_listener.py

@@ -29,7 +29,7 @@ def device_now_active(self, *args):
     """
     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 @@ def device_no_longer_active(self, *args):
     """
     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 @@ def state_changed(state):
     """
     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()