3 files changed, 5 insertions, 11 deletions
diff --git a/grc/gui/canvas/block.py b/grc/gui/canvas/block.py
index 869e6f4f6f..af7f2ba9ad 100644
--- a/grc/gui/canvas/block.py
+++ b/grc/gui/canvas/block.py
@@ -9,7 +9,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
 
 import math
 
-import six
 from gi.repository import Gtk, Pango, PangoCairo
 
 from . import colors
@@ -123,7 +122,7 @@ class Block(CoreBlock, Drawable):
             port_separation = PORT_SEPARATION if not has_busses else ports[0].height + PORT_SPACING
             offset = (self.height - (len(ports) - 1) * port_separation - ports[0].height) / 2
             for port in ports:
-                port.create_shapes()            
+                port.create_shapes()
                 port.coordinate = {
                     0: (+self.width, offset),
                     90: (offset, -port.width),
@@ -153,7 +152,7 @@ class Block(CoreBlock, Drawable):
             )
         )
         title_width, title_height = title_layout.get_size()
- 
+
         force_show_id = Actions.TOGGLE_SHOW_BLOCK_IDS.get_active()
 
         # update the params layout
@@ -186,7 +185,7 @@ class Block(CoreBlock, Drawable):
                 min_height = 2 * PORT_BORDER_SEPARATION + sum(
                     port.height + PORT_SPACING for port in ports if port.dtype == 'bus'
                     ) - PORT_SPACING
-            
+
             else:
                 if ports:
                     min_height -= ports[-1].height
@@ -344,7 +343,7 @@ class Block(CoreBlock, Drawable):
         type_templates = ' '.join(p.dtype for p in self.params.values()) + ' '
         type_templates += ' '.join(p.get_raw('dtype') for p in (self.sinks + self.sources))
         type_param = None
-        for key, param in six.iteritems(self.params):
+        for key, param in self.params.items():
             if not param.is_enum():
                 continue
             # Priority to the type controller
@@ -381,7 +380,7 @@ class Block(CoreBlock, Drawable):
         # Concat the nports string from the private nports settings of all ports
         nports_str = ' '.join(str(port.get_raw('multiplicity')) for port in self.ports())
         # Modify all params whose keys appear in the nports string
-        for key, param in six.iteritems(self.params):
+        for key, param in self.params.items():
             if param.is_enum() or param.key not in nports_str:
                 continue
             # Try to increment the port controller by direction
@@ -394,4 +393,3 @@ class Block(CoreBlock, Drawable):
                 # Should we be logging something here
                 pass
         return changed
-
diff --git a/grc/gui/canvas/drawable.py b/grc/gui/canvas/drawable.py
index 18c3391978..a586a7edc6 100644
--- a/grc/gui/canvas/drawable.py
+++ b/grc/gui/canvas/drawable.py
@@ -8,8 +8,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
 
 from ..Constants import LINE_SELECT_SENSITIVITY
 
-from six.moves import zip
-
 
 class Drawable(object):
     """
diff --git a/grc/gui/canvas/flowgraph.py b/grc/gui/canvas/flowgraph.py
index 6d278df589..0f4b32a942 100644
--- a/grc/gui/canvas/flowgraph.py
+++ b/grc/gui/canvas/flowgraph.py
@@ -13,9 +13,7 @@ import random
 from distutils.spawn import find_executable
 from itertools import count
 
-import six
 from gi.repository import GLib, Gtk
-from six.moves import filter
 
 from . import colors
 from .drawable import Drawable