From ab0df09a1cdced78e23f27bfd09959df9ac769ea Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Thu, 27 Feb 2020 07:45:36 +0100
Subject: [PATCH] FEM: more Python import cleaning

---
 src/Mod/Fem/femmesh/gmshtools.py         |  5 +++--
 src/Mod/Fem/femsolver/calculix/solver.py |  7 +++----
 src/Mod/Fem/femsolver/calculix/tasks.py  | 12 ++++++------
 src/Mod/Fem/femsolver/calculix/writer.py |  7 ++++---
 src/Mod/Fem/femsolver/elmer/solver.py    | 12 +++++-------
 src/Mod/Fem/femsolver/elmer/tasks.py     |  8 ++++----
 src/Mod/Fem/femsolver/elmer/writer.py    |  7 ++++---
 src/Mod/Fem/femsolver/equationbase.py    |  1 +
 src/Mod/Fem/femsolver/reportdialog.py    |  3 ++-
 src/Mod/Fem/femsolver/run.py             | 12 +++++++-----
 src/Mod/Fem/femsolver/solverbase.py      |  6 ++++--
 src/Mod/Fem/femsolver/writerbase.py      |  1 +
 src/Mod/Fem/femsolver/z88/solver.py      |  7 +++----
 src/Mod/Fem/femsolver/z88/tasks.py       | 10 +++++-----
 src/Mod/Fem/femsolver/z88/writer.py      |  8 +++++---
 src/Mod/Fem/femtools/ccxtools.py         |  5 ++++-
 16 files changed, 61 insertions(+), 50 deletions(-)

diff --git a/src/Mod/Fem/femmesh/gmshtools.py b/src/Mod/Fem/femmesh/gmshtools.py
index 73c863ef92..8d6b2d3581 100644
--- a/src/Mod/Fem/femmesh/gmshtools.py
+++ b/src/Mod/Fem/femmesh/gmshtools.py
@@ -27,13 +27,14 @@ __url__ = "http://www.freecadweb.org"
 ## \addtogroup FEM
 #  @{
 
-import sys
 import subprocess
+import sys
 
 import FreeCAD
 from FreeCAD import Console
-import Fem
 from FreeCAD import Units
+
+import Fem
 from . import meshtools
 from femtools import femutils
 
diff --git a/src/Mod/Fem/femsolver/calculix/solver.py b/src/Mod/Fem/femsolver/calculix/solver.py
index 35aa09a91b..80ac25a787 100644
--- a/src/Mod/Fem/femsolver/calculix/solver.py
+++ b/src/Mod/Fem/femsolver/calculix/solver.py
@@ -26,16 +26,15 @@ __url__ = "http://www.freecadweb.org"
 ## @package SolverCalculix
 #  \ingroup FEM
 
-import os
 import glob
+import os
 
 import FreeCAD
-from femtools import femutils
 
+from . import tasks
 from .. import run
 from .. import solverbase
-from . import tasks
-
+from femtools import femutils
 
 if FreeCAD.GuiUp:
     import FemGui
diff --git a/src/Mod/Fem/femsolver/calculix/tasks.py b/src/Mod/Fem/femsolver/calculix/tasks.py
index 348c4b021f..f54a73147a 100644
--- a/src/Mod/Fem/femsolver/calculix/tasks.py
+++ b/src/Mod/Fem/femsolver/calculix/tasks.py
@@ -28,18 +28,18 @@ __url__ = "http://www.freecadweb.org"
 #  @{
 
 import os
-import subprocess
 import os.path
+import subprocess
 
 import FreeCAD
-from femtools import femutils
-from femtools import membertools
-import feminout.importCcxFrdResults as importCcxFrdResults
-import feminout.importCcxDatResults as importCcxDatResults
 
+from . import writer
 from .. import run
 from .. import settings
-from . import writer
+from feminout import importCcxDatResults
+from feminout import importCcxFrdResults
+from femtools import femutils
+from femtools import membertools
 
 
 _inputFileName = None
diff --git a/src/Mod/Fem/femsolver/calculix/writer.py b/src/Mod/Fem/femsolver/calculix/writer.py
index e93b06e016..899aaca792 100644
--- a/src/Mod/Fem/femsolver/calculix/writer.py
+++ b/src/Mod/Fem/femsolver/calculix/writer.py
@@ -27,15 +27,16 @@ __url__ = "http://www.freecadweb.org"
 ## \addtogroup FEM
 #  @{
 
+import codecs
 import os
+import six
 import sys
 import time
-import codecs
-import six
 
 import FreeCAD
-from femmesh import meshtools
+
 from .. import writerbase
+from femmesh import meshtools
 
 
 class FemInputWriterCcx(writerbase.FemInputWriter):
diff --git a/src/Mod/Fem/femsolver/elmer/solver.py b/src/Mod/Fem/femsolver/elmer/solver.py
index b270fceae9..23e20f58f2 100644
--- a/src/Mod/Fem/femsolver/elmer/solver.py
+++ b/src/Mod/Fem/femsolver/elmer/solver.py
@@ -26,17 +26,15 @@ __url__ = "http://www.freecadweb.org"
 ## \addtogroup FEM
 #  @{
 
-from femtools import femutils
-
-from .. import run
-from .. import solverbase
 from . import tasks
-
-from .equations import heat
 from .equations import elasticity
 from .equations import electrostatic
-from .equations import fluxsolver
 from .equations import flow
+from .equations import fluxsolver
+from .equations import heat
+from .. import run
+from .. import solverbase
+from femtools import femutils
 
 
 def create(doc, name="ElmerSolver"):
diff --git a/src/Mod/Fem/femsolver/elmer/tasks.py b/src/Mod/Fem/femsolver/elmer/tasks.py
index 334272d14e..b73f16c4ae 100644
--- a/src/Mod/Fem/femsolver/elmer/tasks.py
+++ b/src/Mod/Fem/femsolver/elmer/tasks.py
@@ -26,17 +26,17 @@ __url__ = "http://www.freecadweb.org"
 ## \addtogroup FEM
 #  @{
 
-import subprocess
 import os.path
+import subprocess
 import sys
 
 import FreeCAD
-from femtools import femutils
-from femtools import membertools
 
+from . import writer
 from .. import run
 from .. import settings
-from . import writer
+from femtools import femutils
+from femtools import membertools
 
 
 class Check(run.Check):
diff --git a/src/Mod/Fem/femsolver/elmer/writer.py b/src/Mod/Fem/femsolver/elmer/writer.py
index 239a8ee052..a8f254273c 100644
--- a/src/Mod/Fem/femsolver/elmer/writer.py
+++ b/src/Mod/Fem/femsolver/elmer/writer.py
@@ -31,15 +31,16 @@ import os.path
 import subprocess
 import tempfile
 
-from FreeCAD import Units
 from FreeCAD import Console
+from FreeCAD import Units
+
 import Fem
+from . import sifio
+from .. import settings
 from femmesh import gmshtools
 from femtools import constants
 from femtools import femutils
 from femtools import membertools
-from .. import settings
-from . import sifio
 
 
 _STARTINFO_NAME = "ELMERSOLVER_STARTINFO"
diff --git a/src/Mod/Fem/femsolver/equationbase.py b/src/Mod/Fem/femsolver/equationbase.py
index 6786422f90..69a5ed788e 100644
--- a/src/Mod/Fem/femsolver/equationbase.py
+++ b/src/Mod/Fem/femsolver/equationbase.py
@@ -27,6 +27,7 @@ __url__ = "http://www.freecadweb.org"
 #  @{
 
 import FreeCAD
+
 if FreeCAD.GuiUp:
     from pivy import coin
 
diff --git a/src/Mod/Fem/femsolver/reportdialog.py b/src/Mod/Fem/femsolver/reportdialog.py
index d9b14059d1..0f571d05bb 100644
--- a/src/Mod/Fem/femsolver/reportdialog.py
+++ b/src/Mod/Fem/femsolver/reportdialog.py
@@ -26,7 +26,8 @@ __url__ = "http://www.freecadweb.org"
 ## \addtogroup FEM
 #  @{
 
-from PySide import QtGui
+if FreeCAD.GuiUp:
+    from PySide import QtGui
 
 
 ERROR_COLOR = "red"
diff --git a/src/Mod/Fem/femsolver/run.py b/src/Mod/Fem/femsolver/run.py
index 51afcfa299..605b8cfec5 100644
--- a/src/Mod/Fem/femsolver/run.py
+++ b/src/Mod/Fem/femsolver/run.py
@@ -35,21 +35,23 @@ __url__ = "http://www.freecadweb.org"
 
 import os
 import os.path
-# import threading  # not used ATM
 import shutil
 import tempfile
+# import threading  # not used ATM
 
 import FreeCAD as App
-from femtools import femutils
-from femtools import membertools
+
 from . import settings
 from . import signal
 from . import task
-from femtools.errors import MustSaveError, DirectoryDoesNotExistError
+from femtools import femutils
+from femtools import membertools
+from femtools.errors import DirectoryDoesNotExistError
+from femtools.errors import MustSaveError
 
 if App.GuiUp:
-    import FreeCADGui
     from PySide import QtGui
+    import FreeCADGui
 
 
 CHECK = 0
diff --git a/src/Mod/Fem/femsolver/solverbase.py b/src/Mod/Fem/femsolver/solverbase.py
index 85b0a3eb85..10404663cb 100644
--- a/src/Mod/Fem/femsolver/solverbase.py
+++ b/src/Mod/Fem/femsolver/solverbase.py
@@ -26,13 +26,15 @@ __url__ = "http://www.freecadweb.org"
 ## \addtogroup FEM
 #  @{
 
-from PySide import QtGui
 
 import FreeCAD as App
-from femtools.errors import MustSaveError, DirectoryDoesNotExistError
+
 from . import run
+from femtools.errors import MustSaveError
+from femtools.errors import DirectoryDoesNotExistError
 
 if App.GuiUp:
+    from PySide import QtGui
     import FreeCADGui as Gui
     from femguiobjects import _TaskPanelFemSolverControl
 
diff --git a/src/Mod/Fem/femsolver/writerbase.py b/src/Mod/Fem/femsolver/writerbase.py
index 79cbba0ae7..1d4ea012d3 100644
--- a/src/Mod/Fem/femsolver/writerbase.py
+++ b/src/Mod/Fem/femsolver/writerbase.py
@@ -29,6 +29,7 @@ __url__ = "http://www.freecadweb.org"
 import os
 
 import FreeCAD
+
 from femmesh import meshtools
 from femtools.femutils import type_of_obj
 
diff --git a/src/Mod/Fem/femsolver/z88/solver.py b/src/Mod/Fem/femsolver/z88/solver.py
index f0c7e9872a..89e9ca0d05 100644
--- a/src/Mod/Fem/femsolver/z88/solver.py
+++ b/src/Mod/Fem/femsolver/z88/solver.py
@@ -26,16 +26,15 @@ __url__ = "http://www.freecadweb.org"
 ## @package SolverZ88
 #  \ingroup FEM
 
-import os
 import glob
+import os
 
 import FreeCAD
-from femtools import femutils
 
+from . import tasks
 from .. import run
 from .. import solverbase
-from . import tasks
-
+from femtools import femutils
 
 if FreeCAD.GuiUp:
     import FemGui
diff --git a/src/Mod/Fem/femsolver/z88/tasks.py b/src/Mod/Fem/femsolver/z88/tasks.py
index 413bda7283..ea0ac47fb4 100644
--- a/src/Mod/Fem/femsolver/z88/tasks.py
+++ b/src/Mod/Fem/femsolver/z88/tasks.py
@@ -27,17 +27,17 @@ __url__ = "http://www.freecadweb.org"
 #  @{
 
 import os
-import subprocess
 import os.path
+import subprocess
 
 import FreeCAD
-from femtools import femutils
-from femtools import membertools
-import feminout.importZ88O2Results as importZ88O2Results
 
+from . import writer
 from .. import run
 from .. import settings
-from . import writer
+from feminout import importZ88O2Results
+from femtools import femutils
+from femtools import membertools
 
 
 class Check(run.Check):
diff --git a/src/Mod/Fem/femsolver/z88/writer.py b/src/Mod/Fem/femsolver/z88/writer.py
index ecb8195273..8eb792343c 100644
--- a/src/Mod/Fem/femsolver/z88/writer.py
+++ b/src/Mod/Fem/femsolver/z88/writer.py
@@ -26,11 +26,13 @@ __url__ = "http://www.freecadweb.org"
 ## \addtogroup FEM
 #  @{
 
-import FreeCAD
 import time
-import femmesh.meshtools as FemMeshTools
-import feminout.importZ88Mesh as importZ88Mesh
+
+import FreeCAD
+
 from .. import writerbase as FemInputWriter
+from feminout import importZ88Mesh
+from femmesh import meshtools as FemMeshTools
 
 
 class FemInputWriterZ88(FemInputWriter.FemInputWriter):
diff --git a/src/Mod/Fem/femtools/ccxtools.py b/src/Mod/Fem/femtools/ccxtools.py
index 871f0824bd..a6f2f39b2c 100644
--- a/src/Mod/Fem/femtools/ccxtools.py
+++ b/src/Mod/Fem/femtools/ccxtools.py
@@ -31,10 +31,13 @@ __url__ = "http://www.freecadweb.org"
 import os
 import sys
 import subprocess
+
 import FreeCAD
+
 from femtools import femutils
 from femtools import membertools
-from PySide import QtCore
+
+from PySide import QtCore  # there might be a special reason this is not guarded ?!?
 if FreeCAD.GuiUp:
     from PySide import QtGui
     import FemGui