diff --git a/src/command_system/implementation/execute.py b/src/command_system/implementation/execute.py
index 767e761a5..0e8718be4 100644
--- a/src/command_system/implementation/execute.py
+++ b/src/command_system/implementation/execute.py
@@ -68,7 +68,7 @@ class Execute(CommandContainer):
 
     @classmethod
     def poller(cls, processor, popen):
-        for x in list(range(cls.POLL_COUNT)):
+        for _ in range(cls.POLL_COUNT):
             yield cls.brush(processor, popen)
         cls.overdue(processor, popen)
         yield False
diff --git a/src/common/socks5.py b/src/common/socks5.py
index 60b3584fe..a823023b2 100644
--- a/src/common/socks5.py
+++ b/src/common/socks5.py
@@ -825,7 +825,7 @@ class Socks5(object):
         auth_mechanisms = []
         try:
             num_auth = struct.unpack('!xB', buff[:2])[0]
-            for i in list(range(num_auth)):
+            for i in range(num_auth):
                 mechanism, = struct.unpack('!B', buff[1 + i])
                 auth_mechanisms.append(mechanism)
         except Exception:
diff --git a/src/dataforms_widget.py b/src/dataforms_widget.py
index 3f087381a..913200f65 100644
--- a/src/dataforms_widget.py
+++ b/src/dataforms_widget.py
@@ -279,7 +279,7 @@ class DataFormWidget(Gtk.Alignment, object):
         selection = self.records_treeview.get_selection()
         model, rowrefs = selection.get_selected_rows()
         # rowref is a list of paths
-        for i in list(range(len(rowrefs))):
+        for i in range(len(rowrefs)):
             rowrefs[i] = Gtk.TreeRowReference.new(model, rowrefs[i])
         # rowref is a list of row references; need to convert because we will
         # modify the model, paths would change
diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index 1f4515756..1ab87acc9 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -362,7 +362,7 @@ class HashDigest:
 
     def __str__(self):
         prettydigest = ''
-        for i in list(range(0, len(self.digest), 2)):
+        for i in range(0, len(self.digest), 2):
             prettydigest += self.digest[i:i + 2] + ':'
         return prettydigest[:-1]
 
diff --git a/src/message_window.py b/src/message_window.py
index fa1b0b4bd..209c9e624 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -120,7 +120,7 @@ class MessageWindow(object):
                 '<Control>b', '<Control>F4',
                 '<Control>w', '<Control>Page_Up', '<Control>Page_Down', '<Alt>Right',
                 '<Alt>Left', '<Alt>d', '<Alt>c', '<Alt>m', '<Alt>t', 'Escape'] + \
-                ['<Alt>'+str(i) for i in list(range(10))]
+                ['<Alt>'+str(i) for i in range(10)]
         accel_group = Gtk.AccelGroup()
         for key in keys:
             keyval, mod = Gtk.accelerator_parse(key)
@@ -877,7 +877,7 @@ class MessageWindow(object):
         to_right = False
         horiz = self.notebook.get_tab_pos() == Gtk.PositionType.TOP or \
                 self.notebook.get_tab_pos() == Gtk.PositionType.BOTTOM
-        for i in list(range(self.notebook.get_n_pages())):
+        for i in range(self.notebook.get_n_pages()):
             page = self.notebook.get_nth_page(i)
             tab = self.notebook.get_tab_label(page)
             tab_alloc = tab.get_allocation()
@@ -903,7 +903,7 @@ class MessageWindow(object):
         Find the page num of the tab label
         """
         page_num = -1
-        for i in list(range(self.notebook.get_n_pages())):
+        for i in range(self.notebook.get_n_pages()):
             page = self.notebook.get_nth_page(i)
             tab = self.notebook.get_tab_label(page)
             if tab == tab_label:
diff --git a/src/plugins/gui.py b/src/plugins/gui.py
index c2db69f59..f544c9242 100644
--- a/src/plugins/gui.py
+++ b/src/plugins/gui.py
@@ -270,9 +270,9 @@ class PluginsWindow(object):
                     return
                 model = self.installed_plugins_model
 
-                for row in list(range(len(model))):
-                    if plugin == model[row][PLUGIN]:
-                        model.remove(model.get_iter((row, PLUGIN)))
+                for i, row in enumerate(model):
+                    if plugin == row[PLUGIN]:
+                        model.remove(model.get_iter((i, PLUGIN)))
                         break
 
                 iter_ = model.append([plugin, plugin.name, False,
diff --git a/src/roster_window.py b/src/roster_window.py
index a967235d6..0039acfe3 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -3081,7 +3081,7 @@ class RosterWindow:
                 'attached_gpg_keys').split()
         keys = {}
         keyID = _('None')
-        for i in list(range(int(len(attached_keys)/2))):
+        for i in range(len(attached_keys) // 2):
             keys[attached_keys[2*i]] = attached_keys[2*i+1]
             if attached_keys[2*i] == contact.jid:
                 keyID = attached_keys[2*i+1]