diff --git a/src/Mod/Path/InitGui.py b/src/Mod/Path/InitGui.py index 27458ac767..d1175e592a 100644 --- a/src/Mod/Path/InitGui.py +++ b/src/Mod/Path/InitGui.py @@ -95,9 +95,13 @@ class PathWorkbench (Workbench): prepcmdlist.append("Path_Shape") extracmdlist.extend(["Path_Area", "Path_Area_Workplane"]) - threedopcmdlist.append("Path_Surface") - threedcmdgroup = ['Path_3dTools'] - FreeCADGui.addCommand('Path_3dTools', PathCommandGroup(threedopcmdlist, QtCore.QT_TRANSLATE_NOOP("Path",'3D Operations'))) + try: + import ocl # pylint: disable=unused-variable + threedopcmdlist.append("Path_Surface") + threedcmdgroup = ['Path_3dTools'] + FreeCADGui.addCommand('Path_3dTools', PathCommandGroup(threedopcmdlist, QtCore.QT_TRANSLATE_NOOP("Path",'3D Operations'))) + except ImportError: + FreeCAD.Console.PrintError("OpenCamLib is not working!\n") else: threedcmdgroup = threedopcmdlist diff --git a/src/Mod/Path/PathScripts/PathPreferences.py b/src/Mod/Path/PathScripts/PathPreferences.py index 145d765a83..b2c0de8d43 100644 --- a/src/Mod/Path/PathScripts/PathPreferences.py +++ b/src/Mod/Path/PathScripts/PathPreferences.py @@ -118,10 +118,10 @@ def defaultJobTemplate(): return template return '' -def setJobDefaults(filePath, jobTemplate, geometryTolerance, curveAccuracy): - PathLog.track("(%s='%s', %s, %s, %s)" % (DefaultFilePath, filePath, jobTemplate, geometryTolerance, curveAccuracy)) +def setJobDefaults(fileName, jobTemplate, geometryTolerance, curveAccuracy): + PathLog.track("(%s='%s', %s, %s, %s)" % (DefaultFilePath, fileName, jobTemplate, geometryTolerance, curveAccuracy)) pref = preferences() - pref.SetString(DefaultFilePath, filePath) + pref.SetString(DefaultFilePath, fileName) pref.SetString(DefaultJobTemplate, jobTemplate) pref.SetFloat(GeometryTolerance, geometryTolerance) pref.SetFloat(LibAreaCurveAccuracy, curveAccuracy) @@ -131,7 +131,7 @@ def postProcessorBlacklist(): blacklist = pref.GetString(PostProcessorBlacklist, "") if not blacklist: return [] - return eval(blacklist) + return eval(blacklist) # pylint: disable=eval-used def setPostProcessorDefaults(processor, args, blacklist): pref = preferences() @@ -140,9 +140,9 @@ def setPostProcessorDefaults(processor, args, blacklist): pref.SetString(PostProcessorBlacklist, "%s" % (blacklist)) -def setOutputFileDefaults(file, policy): +def setOutputFileDefaults(fileName, policy): pref = preferences() - pref.SetString(PostProcessorOutputFile, file) + pref.SetString(PostProcessorOutputFile, fileName) pref.SetString(PostProcessorOutputPolicy, policy) def defaultOutputFile(): @@ -164,9 +164,4 @@ def setDefaultTaskPanelLayout(style): preferences().SetInt(DefaultTaskPanelLayout, style) def experimentalFeaturesEnabled(): - try: - import ocl - return preferences().GetBool(EnableExperimentalFeatures, False) - except ImportError: - FreeCAD.Console.PrintError("OpenCamLib is not working!\n") - return False + return preferences().GetBool(EnableExperimentalFeatures, False) diff --git a/src/Mod/Path/PathScripts/PathPreferencesPathDressup.py b/src/Mod/Path/PathScripts/PathPreferencesPathDressup.py index 9e7858b0a7..a8b52a777b 100644 --- a/src/Mod/Path/PathScripts/PathPreferencesPathDressup.py +++ b/src/Mod/Path/PathScripts/PathPreferencesPathDressup.py @@ -22,9 +22,6 @@ # * * # *************************************************************************** -import FreeCAD -import PathScripts.PathPreferences as PathPreferences - from PySide import QtCore, QtGui # Qt translation handling @@ -38,6 +35,7 @@ def RegisterDressup(dressup): class DressupPreferencesPage: def __init__(self, parent=None): + # pylint: disable=unused-argument self.form = QtGui.QToolBox() self.form.setWindowTitle(translate("Path_PreferencesPathDressup", 'Dressups')) pages = [] diff --git a/src/Mod/Path/PathScripts/PathPreferencesPathJob.py b/src/Mod/Path/PathScripts/PathPreferencesPathJob.py index b5b1f24d7f..1c5efdf1bf 100644 --- a/src/Mod/Path/PathScripts/PathPreferencesPathJob.py +++ b/src/Mod/Path/PathScripts/PathPreferencesPathJob.py @@ -39,6 +39,7 @@ PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule()) class JobPreferencesPage: def __init__(self, parent=None): + # pylint: disable=unused-argument import FreeCADGui self.form = FreeCADGui.PySideUic.loadUi(":preferences/PathJob.ui") self.form.toolBox.setCurrentIndex(0) # Take that qt designer!