From 0e1530be592fffc935a371a6f574ca415864736a Mon Sep 17 00:00:00 2001 From: luzpaz Date: Wed, 19 Apr 2023 03:48:57 -0400 Subject: [PATCH] Draft: linting bad indentations, superflous markup (#9313) --- src/Mod/Draft/draftfunctions/upgrade.py | 4 ++-- src/Mod/Draft/draftgeoutils/general.py | 2 +- src/Mod/Draft/draftguitools/gui_groups.py | 4 ++-- src/Mod/Draft/draftguitools/gui_points.py | 4 ++-- src/Mod/Draft/draftguitools/gui_trackers.py | 6 ++++-- src/Mod/Draft/draftmake/make_sketch.py | 2 +- src/Mod/Draft/draftobjects/bezcurve.py | 14 +++++++------- src/Mod/Draft/draftobjects/shape2dview.py | 7 +++++-- src/Mod/Draft/draftobjects/shapestring.py | 2 +- src/Mod/Draft/importAirfoilDAT.py | 6 +++++- 10 files changed, 30 insertions(+), 21 deletions(-) diff --git a/src/Mod/Draft/draftfunctions/upgrade.py b/src/Mod/Draft/draftfunctions/upgrade.py index b5ec680a9f..fcf6e66e7a 100644 --- a/src/Mod/Draft/draftfunctions/upgrade.py +++ b/src/Mod/Draft/draftfunctions/upgrade.py @@ -273,8 +273,8 @@ def upgrade(objects, delete=False, force=None): if not checked: coplanarity = DraftGeomUtils.is_coplanar(faces, 1e-3) if not coplanarity: - _err(translate("draft","Faces must be coplanar to be refined")) - return None + _err(translate("draft","Faces must be coplanar to be refined")) + return None # fuse faces fuse_face = faces.pop(0) diff --git a/src/Mod/Draft/draftgeoutils/general.py b/src/Mod/Draft/draftgeoutils/general.py index ab9b2e58a8..bb60df56cc 100644 --- a/src/Mod/Draft/draftgeoutils/general.py +++ b/src/Mod/Draft/draftgeoutils/general.py @@ -149,7 +149,7 @@ def isAligned(edge, axis="x"): The axis can be 'x', 'y' or 'z'. """ def is_same(a, b): - return round(a, precision()) == round(b, precision()) + return round(a, precision()) == round(b, precision()) if axis == "x": if isinstance(edge, Part.Edge): diff --git a/src/Mod/Draft/draftguitools/gui_groups.py b/src/Mod/Draft/draftguitools/gui_groups.py index 318dfc94af..99968bbce6 100644 --- a/src/Mod/Draft/draftguitools/gui_groups.py +++ b/src/Mod/Draft/draftguitools/gui_groups.py @@ -122,8 +122,8 @@ class AddToGroup(gui_base.GuiCommandNeedsSelection): #if new group is selected then launch AddNamedGroup if labelname == self.addNewGroupStr: - add=AddNamedGroup() - add.Activated() + add=AddNamedGroup() + add.Activated() else: #else add selection to the selected group if labelname in self.labels : diff --git a/src/Mod/Draft/draftguitools/gui_points.py b/src/Mod/Draft/draftguitools/gui_points.py index 90a076062c..44d65f56b7 100644 --- a/src/Mod/Draft/draftguitools/gui_points.py +++ b/src/Mod/Draft/draftguitools/gui_points.py @@ -161,9 +161,9 @@ class Point(gui_base_original.Creator): """ super(Point, self).finish() if self.callbackClick: - self.view.removeEventCallbackPivy(coin.SoMouseButtonEvent.getClassTypeId(), self.callbackClick) + self.view.removeEventCallbackPivy(coin.SoMouseButtonEvent.getClassTypeId(), self.callbackClick) if self.callbackMove: - self.view.removeEventCallbackPivy(coin.SoLocation2Event.getClassTypeId(), self.callbackMove) + self.view.removeEventCallbackPivy(coin.SoLocation2Event.getClassTypeId(), self.callbackMove) if cont or (cont is None and self.ui and self.ui.continueMode): self.Activated() diff --git a/src/Mod/Draft/draftguitools/gui_trackers.py b/src/Mod/Draft/draftguitools/gui_trackers.py index 8f250417e4..be223cb2a6 100644 --- a/src/Mod/Draft/draftguitools/gui_trackers.py +++ b/src/Mod/Draft/draftguitools/gui_trackers.py @@ -58,7 +58,8 @@ class Tracker: def __init__(self, dotted=False, scolor=None, swidth=None, children=[], ontop=False, name=None): global Part, DraftGeomUtils - import Part, DraftGeomUtils + import Part + import DraftGeomUtils self.ontop = ontop self.color = coin.SoBaseColor() self.color.rgb = scolor or FreeCADGui.draftToolBar.getDefaultColor("line") @@ -1266,7 +1267,8 @@ class boxTracker(Tracker): def update(self, line=None, normal=None): """Update the tracker.""" - import WorkingPlane, DraftGeomUtils + import WorkingPlane + import DraftGeomUtils if not normal: normal = FreeCAD.DraftWorkingPlane.axis if line: diff --git a/src/Mod/Draft/draftmake/make_sketch.py b/src/Mod/Draft/draftmake/make_sketch.py index 44f3e0a675..2a01dd3868 100644 --- a/src/Mod/Draft/draftmake/make_sketch.py +++ b/src/Mod/Draft/draftmake/make_sketch.py @@ -182,7 +182,7 @@ def make_sketch(objects_list, autoconstraints=False, addTo=None, if DraftGeomUtils.geomType(edge) == "BezierCurve": return(edge.Curve.toBSpline(edge.FirstParameter,edge.LastParameter).toShape()) else: - return(edge) + return edge axis = App.Vector(0, 0, 1).cross(normal) diff --git a/src/Mod/Draft/draftobjects/bezcurve.py b/src/Mod/Draft/draftobjects/bezcurve.py index a4502da150..cf8b28115f 100644 --- a/src/Mod/Draft/draftobjects/bezcurve.py +++ b/src/Mod/Draft/draftobjects/bezcurve.py @@ -134,15 +134,15 @@ class BezCurve(DraftObject): import Part plm = fp.Placement if fp.Points: - startpoint=fp.Points[0] + startpoint = fp.Points[0] edges = [] for segpoles in self._segpoleslst(fp): -# if len(segpoles) == fp.Degree # would skip additional poles - c = Part.BezierCurve() #last segment may have lower degree - c.increase(len(segpoles)) - c.setPoles([startpoint]+segpoles) - edges.append(Part.Edge(c)) - startpoint = segpoles[-1] +# if len(segpoles) == fp.Degree # would skip additional poles + c = Part.BezierCurve() #last segment may have lower degree + c.increase(len(segpoles)) + c.setPoles([startpoint]+segpoles) + edges.append(Part.Edge(c)) + startpoint = segpoles[-1] w = Part.Wire(edges) if fp.Closed and w.isClosed(): try: diff --git a/src/Mod/Draft/draftobjects/shape2dview.py b/src/Mod/Draft/draftobjects/shape2dview.py index 57137dc1ec..1559745d4f 100644 --- a/src/Mod/Draft/draftobjects/shape2dview.py +++ b/src/Mod/Draft/draftobjects/shape2dview.py @@ -145,7 +145,9 @@ class Shape2DView(DraftObject): def getProjected(self,obj,shape,direction): "returns projected edges from a shape and a direction" - import Part, TechDraw, DraftGeomUtils + import Part + import TechDraw + import DraftGeomUtils edges = [] _groups = TechDraw.projectEx(shape, direction) for g in _groups[0:5]: @@ -200,7 +202,8 @@ class Shape2DView(DraftObject): self.props_changed_clear() return - import Part, DraftGeomUtils + import Part + import DraftGeomUtils pl = obj.Placement if obj.Base: if utils.get_type(obj.Base) in ["BuildingPart","SectionPlane"]: diff --git a/src/Mod/Draft/draftobjects/shapestring.py b/src/Mod/Draft/draftobjects/shapestring.py index 1ede777253..6925af1fcb 100644 --- a/src/Mod/Draft/draftobjects/shapestring.py +++ b/src/Mod/Draft/draftobjects/shapestring.py @@ -167,7 +167,7 @@ class ShapeString(DraftObject): ''' remove cuts, fuse overlapping contours, retain islands ''' import Part if len(facelist) == 1: - return(facelist[0]) + return facelist[0] sortedfaces = sorted(facelist,key=(lambda shape: shape.Area),reverse=True) diff --git a/src/Mod/Draft/importAirfoilDAT.py b/src/Mod/Draft/importAirfoilDAT.py index 0cbfe58546..72ebebb9da 100644 --- a/src/Mod/Draft/importAirfoilDAT.py +++ b/src/Mod/Draft/importAirfoilDAT.py @@ -38,7 +38,11 @@ __title__ = "FreeCAD Draft Workbench - Airfoil data importer" __author__ = "Heiko Jakob " __url__ = "https://www.freecadweb.org" -import re, FreeCAD, Draft, Part, os +import re +import os +import FreeCAD +import Draft +import Part from FreeCAD import Vector from FreeCAD import Console as FCC