From 202ed20d4e307288bbef7b7e7321b8155459be31 Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Fri, 22 May 2020 07:43:18 +0200
Subject: [PATCH] FEM: Py2, deactivate migration modules

---
 src/Mod/Fem/Init.py                    | 5 +++--
 src/Mod/Fem/InitGui.py                 | 5 +++--
 src/Mod/Fem/femtest/app/test_common.py | 8 ++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Mod/Fem/Init.py b/src/Mod/Fem/Init.py
index 7362199c93..5f55ea4817 100644
--- a/src/Mod/Fem/Init.py
+++ b/src/Mod/Fem/Init.py
@@ -47,8 +47,9 @@ import FreeCAD
 from femtools.migrate_app import FemMigrateApp
 
 
-# migrate old FEM App objects
-sys.meta_path.append(FemMigrateApp())
+if sys.version_info.major >= 3:
+    # migrate old FEM App objects
+    sys.meta_path.append(FemMigrateApp())
 
 
 # add FEM unit tests
diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py
index 51dd1f9aa0..58ec23fa91 100644
--- a/src/Mod/Fem/InitGui.py
+++ b/src/Mod/Fem/InitGui.py
@@ -47,8 +47,9 @@ from FreeCADGui import Workbench
 from femtools.migrate_gui import FemMigrateGui
 
 
-# migrate old FEM Gui objects
-sys.meta_path.append(FemMigrateGui())
+if sys.version_info.major >= 3:
+    # migrate old FEM Gui objects
+    sys.meta_path.append(FemMigrateGui())
 
 
 class FemWorkbench(Workbench):
diff --git a/src/Mod/Fem/femtest/app/test_common.py b/src/Mod/Fem/femtest/app/test_common.py
index 4566a3daea..46d4695543 100644
--- a/src/Mod/Fem/femtest/app/test_common.py
+++ b/src/Mod/Fem/femtest/app/test_common.py
@@ -25,6 +25,7 @@ __title__ = "Common FEM unit tests"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+import sys
 import unittest
 
 import FreeCAD
@@ -108,6 +109,13 @@ class TestFemCommon(unittest.TestCase):
         # import all collected modules
         # fcc_print(pymodules)
         for mod in pymodules:
+            # migrate modules do not import on Python 2
+            if (
+                mod == "femtools.migrate_app"
+                or mod == "femtools.migrate_gui"
+            ) and sys.version_info.major < 3:
+                continue
+
             fcc_print("Try importing {0} ...".format(mod))
             try:
                 im = __import__("{0}".format(mod))