diff --git a/src/App/FreeCADInit.py b/src/App/FreeCADInit.py index 9ab51ebbd0..6d9a10722c 100644 --- a/src/App/FreeCADInit.py +++ b/src/App/FreeCADInit.py @@ -213,7 +213,7 @@ def InitApplications(): subdirectory = workbench.Name if not workbench.Subdirectory else workbench.Subdirectory subdirectory = subdirectory.replace("/",os.path.sep) subdirectory = os.path.join(Dir, subdirectory) - classname = workbench.Classname + #classname = workbench.Classname sys.path.insert(0,subdirectory) PathExtension.append(subdirectory) RunInitPy(subdirectory) diff --git a/src/Ext/freecad/UiTools.py b/src/Ext/freecad/UiTools.py index aad94ebb04..56a5ba6192 100644 --- a/src/Ext/freecad/UiTools.py +++ b/src/Ext/freecad/UiTools.py @@ -1,7 +1,6 @@ # (c) 2021 Werner Mayer LGPL from PySide2 import QtUiTools -from PySide2 import QtCore import FreeCADGui as Gui diff --git a/src/Gui/FreeCADGuiInit.py b/src/Gui/FreeCADGuiInit.py index 4e03b4fce5..bd52b29cf4 100644 --- a/src/Gui/FreeCADGuiInit.py +++ b/src/Gui/FreeCADGuiInit.py @@ -180,7 +180,6 @@ def InitApplications(): RunInitGuiPy(Dir) Log("All modules with GUIs using InitGui.py are now initialized\n") - extension_modules = [] try: import pkgutil import importlib diff --git a/src/Gui/RemoteDebugger.py b/src/Gui/RemoteDebugger.py index ba745b44c3..28353d96b5 100644 --- a/src/Gui/RemoteDebugger.py +++ b/src/Gui/RemoteDebugger.py @@ -24,7 +24,6 @@ import FreeCAD as App import FreeCADGui as Gui -from PySide import QtCore from PySide import QtGui class RemoteDebugger(): diff --git a/src/Mod/Fem/femtaskpanels/task_constraint_electrostaticpotential.py b/src/Mod/Fem/femtaskpanels/task_constraint_electrostaticpotential.py index 9505e365a0..0ed9435a9e 100644 --- a/src/Mod/Fem/femtaskpanels/task_constraint_electrostaticpotential.py +++ b/src/Mod/Fem/femtaskpanels/task_constraint_electrostaticpotential.py @@ -33,7 +33,6 @@ __url__ = "https://www.freecadweb.org" import FreeCAD import FreeCADGui from FreeCAD import Units -from PySide import QtCore from femguiutils import selection_widgets from femtools import femutils from femtools import membertools diff --git a/src/Mod/Show/DepGraphTools.py b/src/Mod/Show/DepGraphTools.py index 41f4cb2777..df19a0eba3 100644 --- a/src/Mod/Show/DepGraphTools.py +++ b/src/Mod/Show/DepGraphTools.py @@ -21,8 +21,6 @@ # * * # ***************************************************************************/ -import FreeCAD as App - def getAllDependencies(feat): '''getAllDependencies(feat): gets all features feat depends on, directly or indirectly. Returns a list, with deepest dependencies last. feat is not included in the list, except diff --git a/src/Mod/Sketcher/Profiles.py b/src/Mod/Sketcher/Profiles.py index 67193bd622..53ef998a91 100644 --- a/src/Mod/Sketcher/Profiles.py +++ b/src/Mod/Sketcher/Profiles.py @@ -19,14 +19,11 @@ #* * #*************************************************************************** -import FreeCAD, Sketcher +import FreeCAD if FreeCAD.GuiUp: - import FreeCADGui,SketcherGui,os - from PySide import QtCore, QtGui - from PySide.QtCore import Qt - from PySide.QtGui import QApplication, QCursor - from FreeCADGui import PySideUic as uic + import FreeCADGui + from PySide import QtCore #s=os.path.dirname(__file__) #s=os.path.join(s,"ProfileLib") diff --git a/src/Mod/Sketcher/TestSketcherGui.py b/src/Mod/Sketcher/TestSketcherGui.py index 418f6306d4..f701887072 100644 --- a/src/Mod/Sketcher/TestSketcherGui.py +++ b/src/Mod/Sketcher/TestSketcherGui.py @@ -19,7 +19,7 @@ # USA * #************************************************************************** -import FreeCAD, FreeCADGui, os, sys, unittest, Sketcher, SketcherGui +#import FreeCAD, FreeCADGui, os, sys, unittest, Sketcher, SketcherGui #--------------------------------------------------------------------------- diff --git a/src/Mod/Start/StartPage/LoadCustom.py b/src/Mod/Start/StartPage/LoadCustom.py index dbd1aa396e..b6902b56c8 100644 --- a/src/Mod/Start/StartPage/LoadCustom.py +++ b/src/Mod/Start/StartPage/LoadCustom.py @@ -20,7 +20,6 @@ #*************************************************************************** import os -import sys import FreeCAD import FreeCADGui diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py index f5855385ac..df0d4f9fc9 100644 --- a/src/Mod/Start/StartPage/StartPage.py +++ b/src/Mod/Start/StartPage/StartPage.py @@ -106,7 +106,7 @@ def getInfo(filename): import gnomevfs except Exception: # alternative method - import hashlib,urllib.parse + import hashlib fhash = hashlib.md5(bytes(urllib.parse.quote("file://"+path,safe=":/"),"ascii")).hexdigest() thumb = os.path.join(os.path.expanduser("~"),".thumbnails","normal",fhash+".png") else: diff --git a/src/Mod/Start/StartPage/TranslationTexts.py b/src/Mod/Start/StartPage/TranslationTexts.py index ab4fbd3644..4ba47de629 100644 --- a/src/Mod/Start/StartPage/TranslationTexts.py +++ b/src/Mod/Start/StartPage/TranslationTexts.py @@ -19,7 +19,6 @@ #* * #*************************************************************************** -import sys from PySide import QtGui diff --git a/src/Mod/TemplatePyMod/Commands.py b/src/Mod/TemplatePyMod/Commands.py index 4d244cb82b..8b7d70ffbc 100644 --- a/src/Mod/TemplatePyMod/Commands.py +++ b/src/Mod/TemplatePyMod/Commands.py @@ -66,7 +66,7 @@ class TemplatePyMod_Cmd2: self.node=[] self.view.removeEventCallback("SoMouseButtonEvent",self.call) - p=PolygonCreator(d,v,10) + self.polycreator = PolygonCreator(d,v,10) def IsActive(self): if FreeCAD.ActiveDocument is None: diff --git a/src/Mod/TemplatePyMod/FeaturePython.py b/src/Mod/TemplatePyMod/FeaturePython.py index 4f97492637..52648ca4f5 100644 --- a/src/Mod/TemplatePyMod/FeaturePython.py +++ b/src/Mod/TemplatePyMod/FeaturePython.py @@ -597,7 +597,7 @@ class ViewProviderCircleSet: def updateData(self, fp, prop): if prop == "Shape": - edges=p = fp.getPropertyByName("Shape").Edges + edges = fp.getPropertyByName("Shape").Edges pts=[] ver=[] for i in edges: @@ -630,8 +630,8 @@ def makeCircleSet(): doc=FreeCAD.newDocument() a=FreeCAD.ActiveDocument.addObject("App::FeaturePython","Circles") - c=CircleSet(a) - v=ViewProviderCircleSet(a.ViewObject) + CircleSet(a) + ViewProviderCircleSet(a.ViewObject) a.Shape=comp doc.recompute() diff --git a/src/Mod/TemplatePyMod/MengerSponge.py b/src/Mod/TemplatePyMod/MengerSponge.py index 90b5ce8d59..817b639cfd 100644 --- a/src/Mod/TemplatePyMod/MengerSponge.py +++ b/src/Mod/TemplatePyMod/MengerSponge.py @@ -5,8 +5,7 @@ # http://forum.freecadweb.org/viewtopic.php?f=3&t=2307 import threading -import Mesh, MeshGui -from FreeCAD import Base +import Mesh # Create a global mesh and make copies of them # This makes the algorithm faster by ~60%. diff --git a/src/Mod/TemplatePyMod/PythonQt.py b/src/Mod/TemplatePyMod/PythonQt.py index 4b9b3194f5..462f71192b 100644 --- a/src/Mod/TemplatePyMod/PythonQt.py +++ b/src/Mod/TemplatePyMod/PythonQt.py @@ -6,7 +6,7 @@ Examples for customizing the FreeCAD application with PySide facilities. __author__ = "Werner Mayer " from PySide import QtCore,QtGui -import FreeCAD,FreeCADGui, __main__ +import FreeCADGui, __main__ class MainWindow: def __init__(self): diff --git a/src/Mod/TemplatePyMod/TaskPanel.py b/src/Mod/TemplatePyMod/TaskPanel.py index 04cb4c7d0f..ef07e9b249 100644 --- a/src/Mod/TemplatePyMod/TaskPanel.py +++ b/src/Mod/TemplatePyMod/TaskPanel.py @@ -102,6 +102,7 @@ class TaskManyTaskBoxes: widget2 = QtGui.QWidget() widget2.setWindowTitle("My Test Box") text = QtGui.QLabel("testBox",widget2) + text.setObjectName("label") self.form = [widget1,widget2] def createTask(): diff --git a/src/Mod/TemplatePyMod/Texture.py b/src/Mod/TemplatePyMod/Texture.py index c95e1af1db..14e0f7a9c5 100644 --- a/src/Mod/TemplatePyMod/Texture.py +++ b/src/Mod/TemplatePyMod/Texture.py @@ -1,7 +1,6 @@ # (c) 2012 Werner Mayer LGPL import FreeCAD, FreeCADGui -from FreeCAD import Base from pivy import coin class Texture: @@ -50,9 +49,9 @@ class ViewProviderTexture: doc = FreeCADGui.getDocument(doc.Name) graph = doc.ActiveView.getSceneGraph() graph.removeChild(root) - - def claimChildren(self): - return [self.obj.Object.Source] + + def claimChildren(self): + return [self.obj.Object.Source] def __getstate__(self): return None