Fix F841 flake8 errors

pyface/action/tests/test_group.py

@@ -74,7 +74,6 @@ def test_append_action(self):
 
     def test_append_callable(self):
         group = Group(self.action_item)
-        action2 = Action(name="Action 2")
         # XXX items doesn't fire a change event.  Should it?
         group.append(self.perform)
         self.assertEqual(len(group.items), 2)
@@ -118,7 +117,6 @@ def test_insert_action(self):
 
     def test_insert_callable(self):
         group = Group(self.action_item)
-        action2 = Action(name="Action 2")
         # XXX items doesn't fire a change event.  Should it?
         group.insert(1, self.perform)
         self.assertEqual(len(group.items), 2)

pyface/tests/test_image_cache.py

@@ -22,18 +22,18 @@ def setUp(self):
         self.image_cache = ImageCache(32, 32)
 
     def test_get_image(self):
-        image = self.image_cache.get_image(IMAGE_PATH)
+        self.image_cache.get_image(IMAGE_PATH)
 
     def test_get_bitmap(self):
-        bitmap = self.image_cache.get_bitmap(IMAGE_PATH)
+        self.image_cache.get_bitmap(IMAGE_PATH)
 
     def test_get_image_twice(self):
-        image1 = self.image_cache.get_image(IMAGE_PATH)
-        image2 = self.image_cache.get_image(IMAGE_PATH)
+        self.image_cache.get_image(IMAGE_PATH)
+        self.image_cache.get_image(IMAGE_PATH)
 
     def test_get_bitmap_twice(self):
-        bitmap1 = self.image_cache.get_bitmap(IMAGE_PATH)
-        bitmap2 = self.image_cache.get_bitmap(IMAGE_PATH)
+        self.image_cache.get_bitmap(IMAGE_PATH)
+        self.image_cache.get_bitmap(IMAGE_PATH)
 
     def test_get_image_different_sizes(self):
         other_image_cache = ImageCache(48, 48)

pyface/tests/test_resource_manager.py

@@ -28,12 +28,12 @@ def setUp(self):
         self.resource_factory = PyfaceResourceFactory()
 
     def test_image_from_file(self):
-        image = self.resource_factory.image_from_file(IMAGE_PATH)
+        self.resource_factory.image_from_file(IMAGE_PATH)
 
     def test_image_from_data(self):
         with open(IMAGE_PATH, "rb") as fp:
             data = fp.read()
-        image = self.resource_factory.image_from_data(data)
+        self.resource_factory.image_from_data(data)
 
     def test_locate_image(self):
         class ASequence(Sequence):

pyface/tests/test_toolkit.py

@@ -24,12 +24,12 @@ def test_missing_import(self):
         # test that we get an undefined object if no toolkit implementation
         cls = pyface.toolkit.toolkit_object("tests:Missing")
         with self.assertRaises(NotImplementedError):
-            obj = cls()
+            cls()
 
     def test_bad_import(self):
         # test that we don't filter unrelated import errors
         with self.assertRaises(ImportError):
-            cls = pyface.toolkit.toolkit_object("tests.bad_import:Missing")
+            pyface.toolkit.toolkit_object("tests.bad_import:Missing")
 
     def test_core_plugins(self):
         # test that we can see appropriate core entrypoints

pyface/tests/test_ui_traits.py

@@ -81,7 +81,7 @@ def test_init_pyface_image(self):
         from pyface.image_resource import ImageResource
 
         image_class = ImageClass(image="about")
-        im = image_class.image.create_image()
+        image_class.image.create_image()
 
         self.assertIsInstance(image_class.image, ImageResource)
         self.assertEqual(image_class.image.name, "about")

pyface/ui/null/action/action_item.py

@@ -92,15 +92,7 @@ def __init__(
         # If the action has an image then convert it to a bitmap (as required
         # by the toolbar).
         if action.image is not None:
-            image = action.image.create_image()
-            path = action.image.absolute_path
-            bmp = image_cache.get_bitmap(path)
-
-        else:
-            from pyface.api import ImageResource
-
-            image = ImageResource("foo")
-            bmp = image.create_bitmap()
+            action.image.create_image()
 
         self.control_id = 1
         self.control = None

pyface/ui/qt4/about_dialog.py

@@ -126,7 +126,6 @@ def _create_contents(self, parent):
 
     def _create_html(self):
         # Load the image to be displayed in the about box.
-        image = self.image.create_image()
         path = self.image.absolute_path
 
         # The additional strings.

pyface/ui/qt4/action/action_item.py

@@ -512,7 +512,6 @@ def __init__(self, tool_palette, image_cache, item, show_labels):
         # And they never contain shortcuts.
         label = label.replace("&", "")
 
-        image = action.image.create_image()
         path = action.image.absolute_path
         bmp = image_cache.get_bitmap(path)
 
@@ -574,8 +573,6 @@ def _on_tool(self, event):
         action = self.item.action
         action_event = ActionEvent()
 
-        is_checkable = action.style == "radio" or action.style == "check"
-
         # Perform the action!
         action.checked = self.tool_palette.get_tool_state(self.tool_id) == 1
         action.perform(action_event)

pyface/ui/qt4/clipboard.py

@@ -49,7 +49,7 @@ def _get_object_data(self):
         mime_data = cb.mimeData()
         if mime_data.hasFormat(PYTHON_TYPE):
             serialized_data = BytesIO(mime_data.data(PYTHON_TYPE).data())
-            klass = load(serialized_data)
+            _ = load(serialized_data)
             obj = load(serialized_data)
         return obj
 

pyface/ui/qt4/code_editor/code_widget.py

@@ -517,11 +517,9 @@ def _show_selected_blocks(self, selected_blocks):
     def _get_selected_blocks(self):
         cursor = self.textCursor()
         if cursor.position() > cursor.anchor():
-            move_op = QtGui.QTextCursor.PreviousBlock
             start_pos = cursor.anchor()
             end_pos = cursor.position()
         else:
-            move_op = QtGui.QTextCursor.NextBlock
             start_pos = cursor.position()
             end_pos = cursor.anchor()
 

pyface/ui/qt4/console/call_tip_widget.py

@@ -162,7 +162,6 @@ def show_tip(self, tip):
         """
         # Attempt to find the cursor position at which to show the call tip.
         text_edit = self._text_edit
-        document = text_edit.document()
         cursor = text_edit.textCursor()
         search_pos = cursor.position() - 1
         self._start_position, _ = self._find_parenthesis(

pyface/ui/qt4/python_shell.py

@@ -284,7 +284,7 @@ def _execute(self, source, hidden):
         # Run the source code in the interpeter
         self._hidden = hidden
         try:
-            more = self.interpreter.runsource(source)
+            self.interpreter.runsource(source)
         finally:
             self._hidden = False
 
@@ -499,7 +499,6 @@ def _document_contents_change(self, position, removed, added):
         # Calculate where the cursor should be *after* the change:
         position += added
 
-        document = self._control.document()
         if position == self._get_cursor().position():
             self._call_tip()
 

pyface/ui/qt4/tasks/advanced_editor_area_pane.py

@@ -55,7 +55,7 @@ def create(self, parent):
         """ Create and set the toolkit-specific control that represents the
             pane.
         """
-        self.control = control = EditorAreaWidget(self, parent)
+        self.control = EditorAreaWidget(self, parent)
         self._filter = EditorAreaDropFilter(self)
         self.control.installEventFilter(self._filter)
 
@@ -582,7 +582,7 @@ def _focus_changed(self, old, new):
             for editor in self.editor_area.editors:
                 control = editor.control
                 if control is not None and control.isAncestorOf(new):
-                    self.editor_area.active_editor = focused = editor
+                    self.editor_area.active_editor = editor
                     break
             else:
                 if not self.editor_area.editors:

pyface/ui/qt4/tasks/tests/test_split_editor_area_pane.py

@@ -172,11 +172,8 @@ def test_collapse_nonempty(self):
         the tabs of the  collapsing tabwidgets.
         """
         # setup root
-        root, left, right = self._setUp_collapse()
-        btn0 = left.tabwidget().widget(0)
-        btn1 = left.tabwidget().widget(1)
+        root, _, right = self._setUp_collapse()
         btn2 = right.tabwidget().widget(0)
-        btn3 = right.tabwidget().widget(1)
 
         # perform collapse on rightchild
         root.rightchild.collapse()

pyface/ui/qt4/util/tests/test_image_helpers.py

@@ -58,7 +58,7 @@ def test_qimage_to_array_bad(self):
         qimage.fill(QColor(0x44, 0x88, 0xcc))
 
         with self.assertRaises(ValueError):
-            array = QImage_to_array(qimage)
+            QImage_to_array(qimage)
 
     @unittest.skipIf(
         qt_api == 'pyside2' and sys.platform == 'linux',

pyface/ui/wx/action/action_item.py

@@ -491,8 +491,6 @@ def _on_tool(self, event):
         action = self.item.action
         action_event = ActionEvent()
 
-        is_checkable = action.style == "radio" or action.style == "check"
-
         # Perform the action!
         if self.controller is not None:
             # fixme: There is a difference here between having a controller
@@ -566,7 +564,6 @@ def __init__(self, tool_palette, image_cache, item, show_labels):
         # And they never contain shortcuts.
         label = label.replace("&", "")
 
-        image = action.image.create_image()
         path = action.image.absolute_path
         bmp = image_cache.get_bitmap(path)
 
@@ -633,8 +630,6 @@ def _on_tool(self, event):
         action = self.item.action
         action_event = ActionEvent()
 
-        is_checkable = action.style == "radio" or action.style == "check"
-
         # Perform the action!
         action.checked = self.tool_palette.get_tool_state(self.tool_id) == 1
         action.perform(action_event)

pyface/ui/wx/action/tool_bar_manager.py

@@ -312,8 +312,6 @@ def InsertToolInOrder(self, tool_id):
         orig_pos, tool = self.tool_map[tool_id]
         pos = -1
         for pos in range(self.GetToolsCount()):
-            existing_tool = self.GetToolByPos(pos)
-            existing_id = existing_tool.GetId()
             existing_orig_pos, _ = self.tool_map[tool_id]
             if existing_orig_pos > orig_pos:
                 break

pyface/ui/wx/action/tool_palette_manager.py

@@ -77,15 +77,15 @@ def create_tool_palette(self, parent, controller=None):
     def _add_tools(self, tool_palette, groups):
         """ Adds tools for all items in a list of groups. """
 
-        previous_non_empty_group = None
+        # previous_non_empty_group = None
         for group in self.groups:
             if len(group.items) > 0:
                 # Is a separator required?
                 ## FIXME : Does the palette need the notion of a separator?
-                ##                 if previous_non_empty_group is not None and group.separator:
-                ##                     tool_bar.AddSeparator()
+                ## if previous_non_empty_group is not None and group.separator:
+                ##     tool_bar.AddSeparator()
                 ##
-                ##                 previous_non_empty_group = group
+                ## previous_non_empty_group = group
 
                 # Create a tool bar tool for each item in the group.
                 for item in group.items:

pyface/ui/wx/grid/grid.py

@@ -1055,7 +1055,6 @@ def _on_key_down(self, evt):
         #
         # Don't change the behavior if the <Control> key is pressed as this
         # has meaning to the edit control.
-        key_code = evt.GetKeyCode()
 
         evt.Skip()
 

pyface/ui/wx/grid/grid_model.py

@@ -293,7 +293,7 @@ def set_value(self, row, col, value):
                     value = float(value)
                 except ValueError:
                     value = value
-        rows_appended = self._set_value(row, col, value)
+        self._set_value(row, col, value)
 
         self.fire_content_changed()
 

pyface/ui/wx/grid/tests/test_simple_grid_model.py

@@ -56,9 +56,6 @@ def test_get_value(self):
 
     def test_is_cell_empty(self):
 
-        rows = self.model.get_row_count()
-        columns = self.model.get_column_count()
-
         self.assertEqual(
             self.model.is_cell_empty(0, 0),
             True,

pyface/ui/wx/grid/trait_grid_model.py

@@ -640,7 +640,7 @@ def __get_column_name(self, col):
 
     def __get_column_typename(self, col):
 
-        name = column = self.__get_column(col)
+        column = self.__get_column(col)
         typename = None
         if isinstance(column, TraitGridColumn):
             typename = column.typename

pyface/ui/wx/ipython_widget.py

@@ -185,7 +185,7 @@ def is_complete(self, string):
                     clean_string, "<string>", "exec"
                 )
                 self.release_output()
-            except Exception as e:
+            except Exception:
                 # XXX: Hack: return True so that the
                 # code gets executed and the error captured.
                 is_complete = True

pyface/ui/wx/tasks/editor_area_pane.py

@@ -176,7 +176,4 @@ def _update_active_editor(self, evt):
     @observe("hide_tab_bar")
     def _update_tab_bar(self, event):
         if self.control is not None:
-            visible = (
-                self.control.GetPageCount() > 1 if self.hide_tab_bar else True
-            )
             pass  # Can't actually hide the tab bar on wx.aui

pyface/ui/wx/tree/tree.py

@@ -882,7 +882,6 @@ def _on_nodes_removed(self, event):
         """ Called when nodes have been removed. """
         node_event = event.new
         parent = node_event.node
-        children = node_event.children
 
         # Has the node actually appeared in the tree yet?
         pid = self._get_wxid(parent)

pyface/ui/wx/viewer/table_viewer.py

@@ -66,9 +66,6 @@ def __init__(self, parent, image_size=(16, 16), **traits):
         # Create the toolkit-specific control.
         self.control = table = _Table(parent, image_size, self)
 
-        # Get our actual id.
-        wxid = table.GetId()
-
         # Table events.
         table.Bind(wx.EVT_LIST_ITEM_SELECTED, self._on_item_selected)
         table.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self._on_item_activated)

pyface/ui/wx/viewer/tree_viewer.py

@@ -94,9 +94,6 @@ def __init__(self, parent, image_size=(16, 16), **traits):
         # Create the toolkit-specific control.
         self.control = tree = wx.TreeCtrl(parent, -1, style=self._get_style())
 
-        # Get our actual Id.
-        wxid = tree.GetId()
-
         # Wire up the wx tree events.
         tree.Bind(wx.EVT_CHAR, self._on_char)
         tree.Bind(wx.EVT_LEFT_DOWN, self._on_left_down)

pyface/viewer/default_tree_content_provider.py

@@ -50,30 +50,20 @@ def insert_before(self, parent, before, child):
 
         index, child = parent.insert_before(before, child)
 
-        # Trait notification.
-        # self.items_inserted(parent, [index], [child])
-
         return (index, child)
 
     def insert(self, parent, index, child):
         """ Inserts 'child' into the 'parent' item at 'index'. """
 
         parent.insert(index, child)
 
-        # Trait notification.
-        # self.items_inserted(parent, [index], [child])
-
         return child
 
     def remove(self, parent, child):
         """ Removes 'child' from the 'parent' item. """
 
-        index = parent.children.index(child)
         parent.remove(child)
 
-        # Trait notification.
-        # self.items_removed(parent, [index], [child])
-
         return child
 
     # ------------------------------------------------------------------------

pyface/wx/aui.py

@@ -46,7 +46,6 @@ def CalculateDockSizerLimits(self, dock):
         docks, panes = aui.CopyDocksAndPanes2(self._docks, self._panes)
 
         sash_size = self._art.GetMetric(aui.AUI_DOCKART_SASH_SIZE)
-        caption_size = self._art.GetMetric(aui.AUI_DOCKART_CAPTION_SIZE)
         opposite_size = self.GetOppositeDockTotalSize(
             docks, dock.dock_direction
         )