FEM: Py2, deactivate migration modules
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user