1 files changed, 19 insertions, 21 deletions
diff --git a/grc/gui/Platform.py b/grc/gui/Platform.py
index 500df1cce4..aeade75d78 100644
--- a/grc/gui/Platform.py
+++ b/grc/gui/Platform.py
@@ -17,25 +17,20 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-import os
-import sys
+from __future__ import absolute_import, print_function
 
-from ..core.Platform import Platform as _Platform
+import sys
+import os
 
-from .Config import Config as _Config
-from .Block import Block as _Block
-from .Connection import Connection as _Connection
-from .Element import Element
-from .FlowGraph import FlowGraph as _FlowGraph
-from .Param import Param as _Param
-from .Port import Port as _Port
+from .Config import Config
+from . import canvas
+from ..core.Platform import Platform as CorePlatform
 
 
-class Platform(Element, _Platform):
+class Platform(CorePlatform):
 
     def __init__(self, *args, **kwargs):
-        Element.__init__(self)
-        _Platform.__init__(self, *args, **kwargs)
+        CorePlatform.__init__(self, *args, **kwargs)
 
         # Ensure conf directories
         gui_prefs_file = self.config.gui_prefs_file
@@ -58,14 +53,17 @@ class Platform(Element, _Platform):
                 import shutil
                 shutil.move(old_gui_prefs_file, gui_prefs_file)
             except Exception as e:
-                print >> sys.stderr, e
+                print(e, file=sys.stderr)
 
     ##############################################
-    # Constructors
+    # Factories
     ##############################################
-    FlowGraph = _FlowGraph
-    Connection = _Connection
-    Block = _Block
-    Port = _Port
-    Param = _Param
-    Config = _Config
+    Config = Config
+    FlowGraph = canvas.FlowGraph
+    Connection = canvas.Connection
+    block_classes = {key: canvas.Block.make_cls_with_base(cls)
+                     for key, cls in CorePlatform.block_classes.items()}
+    port_classes = {key: canvas.Port.make_cls_with_base(cls)
+                    for key, cls in CorePlatform.port_classes.items()}
+    param_classes = {key: canvas.Param.make_cls_with_base(cls)
+                     for key, cls in CorePlatform.param_classes.items()}