FEM: more Python import cleaning

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
 

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

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

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):

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"):

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):

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"

src/Mod/Fem/femsolver/equationbase.py

@@ -27,6 +27,7 @@ __url__ = "http://www.freecadweb.org"
 #  @{
 
 import FreeCAD
+
 if FreeCAD.GuiUp:
     from pivy import coin
 

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"

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

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
 

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
 

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

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):

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):

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