kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Clean up various LGTM-flagged items

Browse Source 
Static analysis showed some unused variables and imports, and running
the code in Python 3.9 revealed a few invalid escapes (previous versions
of Python silently "fixed" these, so the code change here will not
affect the results).
This commit is contained in:
Chris Hennes
2021-02-25 14:02:51 -06:00
committed by wwmayer
parent 283d09dc1a
commit 2599d67c2b
7 changed files with 30 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Tools/fcbt/CreateModule.py
View File

@@ -27,8 +27,7 @@
#* Werner Mayer 2003 *
#***************************************************************************
import os,sys,string
import FCFileTools
import os,sys
import MakeAppTools
import re
@@ -110,7 +109,7 @@ def validateApp(AppName):
clName="class "+AppName+": self=0"
try:
exec(clName)
except:
except Exception:
# Invalid class name
sys.stdout.write("Invalid name: '"+AppName+"'\n")
sys.exit()

5
src/Tools/fcbt/CreatePyModule.py
View File

@@ -27,8 +27,7 @@
#* Werner Mayer 2003 *
#***************************************************************************
import os,sys,string
import FCFileTools
import os,sys
import MakeAppTools
import re
@@ -110,7 +109,7 @@ def validateApp(AppName):
clName="class "+AppName+": self=0"
try:
exec(clName)
except:
except Exception:
# Invalid class name
sys.stdout.write("Invalid name: '"+AppName+"'\n")
sys.exit()

4
src/Tools/fcbt/DistBin.py
View File

@@ -4,7 +4,7 @@
import os,sys
#sys.path.append( "E:\\Develop\\Projekte\\FreeCADWin\\src\\Tools" )
import DistTools, FileTools
from . import DistTools, FileTools
# line separator
ls = os.linesep
@@ -23,7 +23,7 @@ DistDir = "../../DistTemp/"
DistTools.EnsureDir(DistDir)
if (DistTools.EnsureDir(DistDir+DistBin) == 1):
raise "Dist path already there!!"
raise RuntimeError("Dist path already there!!")
#====================================================================
# copy src

13
src/Tools/fcbt/DistSetup.py
View File

@@ -1,17 +1,12 @@
# shell and operating system
import os,sys
import os
#import sys
#sys.path.append( "E:\\Develop\\Projekte\\FreeCADWin\\src\\Tools" )
import DistTools,FileTools
# line separator
ls = os.linesep
# path separator
ps = os.pathsep
# dir separator
ds = os.sep
from . import DistTools,FileTools
DistName = DistTools.BuildDistName()

4
src/Tools/fcbt/DistSrc.py
View File

@@ -4,7 +4,7 @@
import os,sys
#sys.path.append( "E:\\Develop\\Projekte\\FreeCADWin\\src\\Tools" )
import DistTools, FileTools
from . import DistTools, FileTools
# line separator
ls = os.linesep
@@ -23,7 +23,7 @@ DistDir = "../../DistTemp/"
DistTools.EnsureDir(DistDir)
if (DistTools.EnsureDir(DistDir+DistSrc) == 1):
raise "Dist path already there!!"
raise RuntimeError("Dist path already there!!")
#====================================================================
# copy src

63
src/Tools/fcbt/DistTools.py
View File

@@ -1,7 +1,7 @@
# shell and operating system
import os, sys, re, FileTools
import os
verbose = 0
dcount = fcount = 0
maxfileload = 100000
@@ -9,13 +9,6 @@ blksize = 1024 * 8
def BuildDistName():
# line separator
ls = os.linesep
# path separator
ps = os.pathsep
# dir separator
ds = os.sep
# Building dist name
# reading the last Version information
[FCVersionMajor,FCVersionMinor,FCVersionBuild,FCVersionDisDa] = open("../Version.h",'r').readlines()
@@ -23,13 +16,6 @@ def BuildDistName():
return DistName
def BuildSetupName():
# line separator
ls = os.linesep
# path separator
ps = os.pathsep
# dir separator
ds = os.sep
# Building dist name
# reading the last Version information
[FCVersionMajor,FCVersionMinor,FCVersionBuild,FCVersionDisDa] = open("../Version.h",'r').readlines()
@@ -38,39 +24,18 @@ def BuildSetupName():
return DistName
def GetVersion():
# line separator
ls = os.linesep
# path separator
ps = os.pathsep
# dir separator
ds = os.sep
# Building dist name
# reading the last Version information
[FCVersionMajor,FCVersionMinor,FCVersionBuild,FCVersionDisDa] = open("../Version.h",'r').readlines()
return FCVersionMajor[23:-1] + '.' +FCVersionMinor[23:-1]
def GetBuildNbr():
# line separator
ls = os.linesep
# path separator
ps = os.pathsep
# dir separator
ds = os.sep
# Building dist name
# reading the last Version information
[FCVersionMajor,FCVersionMinor,FCVersionBuild,FCVersionDisDa] = open("../Version.h",'r').readlines()
return FCVersionBuild[23:-1]
def GetBuildDate():
# line separator
ls = os.linesep
# path separator
ps = os.pathsep
# dir separator
ds = os.sep
# Building dist name
# reading the last Version information
[FCVersionMajor,FCVersionMinor,FCVersionBuild,FCVersionDisDa] = open("../Version.h",'r').readlines()
@@ -127,12 +92,12 @@ BinFilter = ["^Plugin\\.*$",
"^.*\\.lib$",
"^.*\\.exp$",
"^.*\\.bsc$",
"^.*\\CADD.exe$",
"^.*\\CADAppD.dll$",
"^.*\\CmdD.exe$",
"^.*\\BaseD.dll$",
"^.*\\CADDCmdPy.dll$",
"^.*\\GuiD.dll$",
"^.*CADD.exe$",
"^.*CADAppD.dll$",
"^.*CmdD.exe$",
"^.*BaseD.dll$",
"^.*CADDCmdPy.dll$",
"^.*GuiD.dll$",
"^.*\\.bsc$",
"^.*\\.FCScript\\..*$",
"^.*\\.FCParam$",
@@ -147,11 +112,11 @@ LibFilter = ["^Plugin\\.*$",
"^.*\\.exe$",
"^.*\\.exp$",
"^.*\\.bsc$",
"^.*\\CADD.lib$",
"^.*\\CADAppD.lib$",
"^.*\\CmdD.lib$",
"^.*\\BaseD.lib$",
"^.*\\GuiD.lib$",
"^.*CADD.lib$",
"^.*CADAppD.lib$",
"^.*CmdD.lib$",
"^.*BaseD.lib$",
"^.*GuiD.lib$",
"^.*\\.FCScript\\..*$",
"^.*\\.FCParam$"]
@@ -169,7 +134,7 @@ ModFilter = ["^.*\\.o$",
"^CVS$",
"^Attic$",
"^.*\\.opt$",
"^.*\\_d\.pyd$",
"^.*_d\.pyd$",
"^.*\\.opt$",
"^.*\\.ilg$",
"^.*\\.ps$",
@@ -190,7 +155,7 @@ ModFilter = ["^.*\\.o$",
"^.*\\.exp$",
"^.*\\.lib$",
"^.*\\.ui$",
"^.*\\Makefile$",
"^.*Makefile$",
"^.*\\.plg$",]
DocFilter = ["^.*\\.o$",

10
src/Tools/fcbt/FileTools.py
View File

@@ -1,5 +1,3 @@
# shell and operating system
import os, sys, re
verbose = 0
@@ -43,7 +41,7 @@ def cpall(dirFrom, dirTo):
if verbose > 1: print('copying', pathFrom, 'to', pathTo)
cpfile(pathFrom, pathTo)
fcount = fcount+1
except:
except Exception:
print('Error copying', pathFrom, 'to', pathTo, '--skipped')
print(sys.exc_type, sys.exc_value)
else:
@@ -52,7 +50,7 @@ def cpall(dirFrom, dirTo):
os.mkdir(pathTo) # make new subdir
cpall(pathFrom, pathTo) # recur into subdirs
dcount = dcount+1
except:
except Exception:
print('Error creating', pathTo, '--skipped')
print(sys.exc_type, sys.exc_value)
@@ -82,7 +80,7 @@ def cpallWithFilter(dirFrom, dirTo,MatchList):
if verbose > 1: print('copying', pathFrom, 'to', pathTo)
cpfile(pathFrom, pathTo)
fcount = fcount+1
except:
except Exception:
print('Error copying', pathFrom, 'to', pathTo, '--skipped')
print(sys.exc_type, sys.exc_value)
else:
@@ -91,7 +89,7 @@ def cpallWithFilter(dirFrom, dirTo,MatchList):
os.mkdir(pathTo) # make new subdir
cpallWithFilter(pathFrom, pathTo,MatchList) # recur into subdirs
dcount = dcount+1
except:
except Exception:
print('Error creating', pathTo, '--skipped')
print(sys.exc_type, sys.exc_value)