From 1a9247cc4ba3eff59c33cee76997d1367e576dc4 Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Wed, 3 Jun 2020 23:49:09 +0200
Subject: [PATCH] FEM: migrate gui, move to gui utils

---
 src/Mod/Fem/CMakeLists.txt                           | 2 +-
 src/Mod/Fem/InitGui.py                               | 2 +-
 src/Mod/Fem/{femtools => femguiutils}/migrate_gui.py | 0
 src/Mod/Fem/femtest/app/test_common.py               | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename src/Mod/Fem/{femtools => femguiutils}/migrate_gui.py (100%)

diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index affdcb5eea..a49c44f1a7 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -272,7 +272,6 @@ SET(FemTools_SRCS
     femtools/geomtools.py
     femtools/membertools.py
     femtools/migrate_app.py
-    femtools/migrate_gui.py
     femtools/tokrules.py
 )
 
@@ -374,6 +373,7 @@ SET(FemGuiTests_SRCS
 
 SET(FemGuiUtils_SRCS
     femguiutils/__init__.py
+    femguiutils/migrate_gui.py
     femguiutils/selection_widgets.py
 )
 
diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py
index 00447215d0..120a8d9741 100644
--- a/src/Mod/Fem/InitGui.py
+++ b/src/Mod/Fem/InitGui.py
@@ -47,7 +47,7 @@ import FreeCADGui
 from FreeCADGui import Workbench
 
 # needed imports
-from femtools.migrate_gui import FemMigrateGui
+from femguiutils.migrate_gui import FemMigrateGui
 
 
 if sys.version_info.major >= 3:
diff --git a/src/Mod/Fem/femtools/migrate_gui.py b/src/Mod/Fem/femguiutils/migrate_gui.py
similarity index 100%
rename from src/Mod/Fem/femtools/migrate_gui.py
rename to src/Mod/Fem/femguiutils/migrate_gui.py
diff --git a/src/Mod/Fem/femtest/app/test_common.py b/src/Mod/Fem/femtest/app/test_common.py
index e05135dad5..72a68ad9d6 100644
--- a/src/Mod/Fem/femtest/app/test_common.py
+++ b/src/Mod/Fem/femtest/app/test_common.py
@@ -125,7 +125,7 @@ class TestFemCommon(unittest.TestCase):
             # migrate modules do not import on Python 2
             if (
                 mod == "femtools.migrate_app"
-                or mod == "femtools.migrate_gui"
+                or mod == "femguiutils.migrate_gui"
             ) and sys.version_info.major < 3:
                 continue