Fix for Python 2

This commit is contained in:
Chris Palmer 2019-08-18 15:21:01 +01:00
parent b7654f0384
commit 854adab665
2 changed files with 9 additions and 3 deletions

View File

@ -24,8 +24,8 @@ from __future__ import print_function
import subprocess, sys
def run(*args, silent = False):
cmd = ["openscad"] + list(args)
def _run(args, silent):
cmd = ["openscad"] + args
if not silent:
for arg in cmd:
print(arg, end=" ")
@ -37,3 +37,9 @@ def run(*args, silent = False):
print(line[:-1])
if rc:
sys.exit(rc)
def run(*args):
_run(list(args), False)
def run_silent(*args):
_run(list(args), True);

View File

@ -67,7 +67,7 @@ def plateup(target, part_type):
log_name = 'openscad.log'
else:
log_name = 'openscad.echo'
openscad.run("-D$bom=1", "-o", log_name, src_file, silent = True)
openscad.run_silent("-D$bom=1", "-o", log_name, src_file)
#
# Add the files on the BOM to the used list
#