From 4c643a01681955813a730e340f9f2266ee06c27f Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Sun, 16 Jun 2019 23:20:00 +0200
Subject: [PATCH] FEM: code formating, improve imports, get rid of E402 error

---
 src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py |  3 ++-
 .../_ViewProviderFemConstraintSelfWeight.py            |  3 ++-
 .../femguiobjects/_ViewProviderFemElementFluid1D.py    |  3 ++-
 .../femguiobjects/_ViewProviderFemElementGeometry1D.py |  3 ++-
 .../femguiobjects/_ViewProviderFemElementGeometry2D.py |  3 ++-
 .../femguiobjects/_ViewProviderFemElementRotation1D.py |  3 ++-
 src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py  |  4 +++-
 .../_ViewProviderFemMaterialMechanicalNonlinear.py     |  4 +++-
 .../_ViewProviderFemMaterialReinforced.py              |  4 +++-
 .../femguiobjects/_ViewProviderFemMeshBoundaryLayer.py |  3 ++-
 src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py |  3 ++-
 .../Fem/femguiobjects/_ViewProviderFemMeshRegion.py    |  3 ++-
 .../femguiobjects/_ViewProviderFemResultMechanical.py  |  3 ++-
 src/Mod/Fem/feminout/convert2TetGen.py                 |  3 +--
 src/Mod/Fem/feminout/importFenicsMesh.py               | 10 ++++------
 src/Mod/Fem/femsolver/calculix/tasks.py                |  5 +++--
 src/Mod/Fem/femsolver/z88/tasks.py                     |  5 +++--
 17 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py b/src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py
index 67a96badbc..7aea052974 100644
--- a/src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py
+++ b/src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py
@@ -32,10 +32,11 @@ __url__ = "http://www.freecadweb.org"
 import FreeCAD
 import FreeCADGui
 import FemGui  # needed to display the icons in TreeView
-False if False else FemGui.__name__  # dummy usage of FemGui for flake8, just returns 'FemGui'
 
 from pivy import coin
 
+False if False else FemGui.__name__  # flake8, dummy FemGui usage, returns 'FemGui'
+
 
 class ViewProxy(object):
     """Proxy View Provider for Pythons base constraint."""
diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintSelfWeight.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintSelfWeight.py
index 438e26c755..f8b6855d7d 100644
--- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintSelfWeight.py
+++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintSelfWeight.py
@@ -31,7 +31,8 @@ __url__ = "http://www.freecadweb.org"
 import FreeCAD
 import FreeCADGui
 import FemGui  # needed to display the icons in TreeView
-False if False else FemGui.__name__  # dummy usage of FemGui for flake8, just returns 'FemGui'
+
+False if False else FemGui.__name__  # flake8, dummy FemGui usage, returns 'FemGui'
 
 
 class _ViewProviderFemConstraintSelfWeight:
diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py
index 1fb9a5b010..8a96793e25 100644
--- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py
+++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py
@@ -33,7 +33,6 @@ __url__ = "http://www.freecadweb.org"
 import FreeCAD
 import FreeCADGui
 import FemGui  # needed to display the icons in TreeView
-False if False else FemGui.__name__  # dummy usage of FemGui for flake8, just returns 'FemGui'
 
 # for the panel
 from femobjects import _FemElementFluid1D
@@ -41,6 +40,8 @@ from PySide import QtCore
 from PySide import QtGui
 from . import FemSelectionWidgets
 
+False if False else FemGui.__name__  # flake8, dummy FemGui usage, returns 'FemGui'
+
 
 class _ViewProviderFemElementFluid1D:
     "A View Provider for the FemElementFluid1D object"
diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py
index 04f209df89..a6994fe51a 100644
--- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py
+++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py
@@ -31,13 +31,14 @@ __url__ = "http://www.freecadweb.org"
 import FreeCAD
 import FreeCADGui
 import FemGui  # needed to display the icons in TreeView
-False if False else FemGui.__name__  # dummy usage of FemGui for flake8, just returns 'FemGui'
 
 # for the panel
 from femobjects import _FemElementGeometry1D
 from PySide import QtCore
 from . import FemSelectionWidgets
 
+False if False else FemGui.__name__  # flake8, dummy FemGui usage, returns 'FemGui'
+
 
 class _ViewProviderFemElementGeometry1D:
     "A View Provider for the FemElementGeometry1D object"
diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py
index e71984927f..090aaa2da6 100644
--- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py
+++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py
@@ -31,12 +31,13 @@ __url__ = "http://www.freecadweb.org"
 import FreeCAD
 import FreeCADGui
 import FemGui  # needed to display the icons in TreeView
-False if False else FemGui.__name__  # dummy usage of FemGui for flake8, just returns 'FemGui'
 
 # for the panel
 from PySide import QtCore
 from . import FemSelectionWidgets
 
+False if False else FemGui.__name__  # flake8, dummy FemGui usage, returns 'FemGui'
+
 
 class _ViewProviderFemElementGeometry2D:
     "A View Provider for the FemElementGeometry2D object"
diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py
index 8fb0320fbd..6dd9715c59 100644
--- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py
+++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py
@@ -31,12 +31,13 @@ __url__ = "http://www.freecadweb.org"
 import FreeCAD
 import FreeCADGui
 import FemGui  # needed to display the icons in TreeView
-False if False else FemGui.__name__  # dummy usage of FemGui for flake8, just returns 'FemGui'
 
 # for the panel
 from PySide import QtCore
 from . import FemSelectionWidgets
 
+False if False else FemGui.__name__  # flake8, dummy FemGui usage, returns 'FemGui'
+
 
 class _ViewProviderFemElementRotation1D:
     "A View Provider for the FemElementRotation1D object"
diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py
index a21e5105ce..cf05d7fdd9 100644
--- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py
+++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py
@@ -31,7 +31,6 @@ __url__ = "http://www.freecadweb.org"
 import FreeCAD
 import FreeCADGui
 import FemGui  # needed to display the icons in TreeView
-False if False else FemGui.__name__  # dummy usage of FemGui for flake8, just returns 'FemGui'
 
 # for the panel
 from FreeCAD import Units
@@ -39,6 +38,9 @@ from . import FemSelectionWidgets
 from PySide import QtCore
 from PySide import QtGui
 import sys
+
+False if False else FemGui.__name__  # flake8, dummy FemGui usage, returns 'FemGui'
+
 if sys.version_info.major >= 3:
     unicode = str
 
diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterialMechanicalNonlinear.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterialMechanicalNonlinear.py
index 1dcc3179e9..62e8fc7933 100644
--- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterialMechanicalNonlinear.py
+++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterialMechanicalNonlinear.py
@@ -31,10 +31,12 @@ __url__ = "http://www.freecadweb.org"
 import FreeCAD
 import FreeCADGui
 import FemGui  # needed to display the icons in TreeView
-False if False else FemGui.__name__  # dummy usage of FemGui for flake8, just returns 'FemGui'
 
 from pivy import coin
 
+False if False else FemGui.__name__  # flake8, dummy FemGui usage, returns 'FemGui'
+
+
 
 class _ViewProviderFemMaterialMechanicalNonlinear:
     "A View Provider for the FemMaterialMechanicalNonlinear object"
diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterialReinforced.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterialReinforced.py
index c3b40fd86d..76596d0680 100644
--- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterialReinforced.py
+++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterialReinforced.py
@@ -30,7 +30,6 @@ __url__ = "http://www.freecadweb.org"
 import FreeCAD
 import FreeCADGui
 import FemGui  # needed to display the icons in TreeView
-False if False else FemGui.__name__  # flake8, dummy FemGui usage, returns 'FemGui'
 
 
 # task panel
@@ -38,6 +37,9 @@ False if False else FemGui.__name__  # flake8, dummy FemGui usage, returns 'FemG
 from PySide import QtCore
 from PySide import QtGui
 import sys
+
+False if False else FemGui.__name__  # flake8, dummy FemGui usage, returns 'FemGui'
+
 if sys.version_info.major >= 3:
     unicode = str
 
diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py
index 5153b139d3..ec1b2d3d5a 100644
--- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py
+++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py
@@ -31,12 +31,13 @@ __url__ = "http://www.freecadweb.org"
 import FreeCAD
 import FreeCADGui
 import FemGui  # needed to display the icons in TreeView
-False if False else FemGui.__name__  # dummy usage of FemGui for flake8, just returns 'FemGui'
 
 # for the panel
 from PySide import QtCore
 from . import FemSelectionWidgets
 
+False if False else FemGui.__name__  # flake8, dummy FemGui usage, returns 'FemGui'
+
 
 class _ViewProviderFemMeshBoundaryLayer:
     "A View Provider for the FemMeshBoundaryLayer object"
diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py
index d1065c9b1e..1df60fbe10 100644
--- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py
+++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py
@@ -31,12 +31,13 @@ __url__ = "http://www.freecadweb.org"
 import FreeCAD
 import FreeCADGui
 import FemGui  # needed to display the icons in TreeView
-False if False else FemGui.__name__  # dummy usage of FemGui for flake8, just returns 'FemGui'
 
 # for the panel
 from PySide import QtCore
 from . import FemSelectionWidgets
 
+False if False else FemGui.__name__  # flake8, dummy FemGui usage, returns 'FemGui'
+
 
 class _ViewProviderFemMeshGroup:
     "A View Provider for the FemMeshGroup object"
diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py
index 6a8dc38fd5..ea54cc8865 100644
--- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py
+++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py
@@ -31,12 +31,13 @@ __url__ = "http://www.freecadweb.org"
 import FreeCAD
 import FreeCADGui
 import FemGui  # needed to display the icons in TreeView
-False if False else FemGui.__name__  # dummy usage of FemGui for flake8, just returns 'FemGui'
 
 # for the panel
 from PySide import QtCore
 from . import FemSelectionWidgets
 
+False if False else FemGui.__name__  # flake8, dummy FemGui usage, returns 'FemGui'
+
 
 class _ViewProviderFemMeshRegion:
     "A View Provider for the FemMeshRegion object"
diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py
index f108e29dc8..e516de9e06 100644
--- a/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py
+++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py
@@ -31,7 +31,6 @@ __url__ = "http://www.freecadweb.org"
 import FreeCAD
 import FreeCADGui
 import FemGui  # needed to display the icons in TreeView
-False if False else FemGui.__name__  # dummy usage of FemGui for flake8, just returns 'FemGui'
 
 # for the panel
 import FemGui
@@ -42,6 +41,8 @@ from PySide.QtCore import Qt
 from PySide.QtGui import QApplication
 import numpy as np
 
+False if False else FemGui.__name__  # flake8, dummy FemGui usage, returns 'FemGui'
+
 
 class _ViewProviderFemResultMechanical:
     "A View Provider for the FemResultObject Python derived FemResult class"
diff --git a/src/Mod/Fem/feminout/convert2TetGen.py b/src/Mod/Fem/feminout/convert2TetGen.py
index 81e4044860..13aca5a2d8 100644
--- a/src/Mod/Fem/feminout/convert2TetGen.py
+++ b/src/Mod/Fem/feminout/convert2TetGen.py
@@ -26,12 +26,11 @@
 
 # Make mesh of pn junction in TetGen format
 import FreeCAD
+import Mesh
 App = FreeCAD  # shortcut
 if FreeCAD.GuiUp:
     import FreeCADGui
     Gui = FreeCADGui  # shortcut
-# import Part
-import Mesh
 
 ## \addtogroup FEM
 #  @{
diff --git a/src/Mod/Fem/feminout/importFenicsMesh.py b/src/Mod/Fem/feminout/importFenicsMesh.py
index 2db3c2103c..356cfe7961 100644
--- a/src/Mod/Fem/feminout/importFenicsMesh.py
+++ b/src/Mod/Fem/feminout/importFenicsMesh.py
@@ -31,17 +31,15 @@ __url__ = "http://www.freecadweb.org"
 import os
 
 import FreeCAD
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    from PySide import QtGui, QtCore
-
-
 from . import importToolsFem
 from . import readFenicsXML
 from . import writeFenicsXML
 from . import writeFenicsXDMF
 
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtGui, QtCore
+
 
 # Template copied from importZ88Mesh.py. Thanks Bernd!
 # ********* generic FreeCAD import and export methods *********
diff --git a/src/Mod/Fem/femsolver/calculix/tasks.py b/src/Mod/Fem/femsolver/calculix/tasks.py
index d51c26d961..5d1d02c305 100644
--- a/src/Mod/Fem/femsolver/calculix/tasks.py
+++ b/src/Mod/Fem/femsolver/calculix/tasks.py
@@ -32,8 +32,6 @@ import subprocess
 import os.path
 
 import FreeCAD
-if FreeCAD.GuiUp:
-    from PySide import QtGui
 import femtools.femutils as femutils
 import feminout.importCcxFrdResults as importCcxFrdResults
 import feminout.importCcxDatResults as importCcxDatResults
@@ -42,6 +40,9 @@ from .. import run
 from .. import settings
 from . import writer
 
+if FreeCAD.GuiUp:
+    from PySide import QtGui
+
 
 _inputFileName = None
 
diff --git a/src/Mod/Fem/femsolver/z88/tasks.py b/src/Mod/Fem/femsolver/z88/tasks.py
index 45c50f9d36..e067861016 100644
--- a/src/Mod/Fem/femsolver/z88/tasks.py
+++ b/src/Mod/Fem/femsolver/z88/tasks.py
@@ -31,8 +31,6 @@ import subprocess
 import os.path
 
 import FreeCAD
-if FreeCAD.GuiUp:
-    from PySide import QtGui
 import femtools.femutils as femutils
 import feminout.importZ88O2Results as importZ88O2Results
 
@@ -40,6 +38,9 @@ from .. import run
 from .. import settings
 from . import writer
 
+if FreeCAD.GuiUp:
+    from PySide import QtGui
+
 
 class Check(run.Check):