suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OpenSCAD: close csg file and allow unlink to fail

Browse Source
This commit is contained in:
Sebastian Hoogen 2013-07-12 11:59:43 +02:00
parent 8589894691
commit 1ea6fb9c54
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/OpenSCAD/OpenSCADCommands.py
View File

@ -224,7 +224,11 @@ class AddSCADTask:
else: else:
import importCSG import importCSG
importCSG.insert(tmpfilename,doc.Name) importCSG.insert(tmpfilename,doc.Name)
os.unlink(tmpfilename) try:
os.unlink(tmpfilename)
except OSError:
pass
except OpenSCADUtils.OpenSCADError, e: except OpenSCADUtils.OpenSCADError, e:
FreeCAD.Console.PrintError(e.value) FreeCAD.Console.PrintError(e.value)

8
src/Mod/OpenSCAD/importCSG.py
View File

@ -139,8 +139,10 @@ def processcsg(filename):
# Swap statements to enable Parser debugging # Swap statements to enable Parser debugging
#result = parser.parse(f.read(),debug=1) #result = parser.parse(f.read(),debug=1)
result = parser.parse(f.read()) result = parser.parse(f.read())
if printverbose: print 'End Parser' f.close()
if printverbose: print result if printverbose:
print 'End Parser'
print result
FreeCAD.Console.PrintMessage('End processing CSG file\n') FreeCAD.Console.PrintMessage('End processing CSG file\n')
doc.recompute() doc.recompute()
@ -158,7 +160,7 @@ def p_block_list_(p):
p[0] = p[1] + p[2] p[0] = p[1] + p[2]
else : else :
p[0] = p[1] p[0] = p[1]
if printverbose: print "End Block List" if printverbose: print "End Block List"
def p_render_action(p): def p_render_action(p):
'render_action : render LPAREN keywordargument_list RPAREN OBRACE block_list EBRACE' 'render_action : render LPAREN keywordargument_list RPAREN OBRACE block_list EBRACE'