Fix encoding bug when using locals with none-ascii chars in it.
parent
7376c44b85
commit
98ef38eb46
|
@ -429,11 +429,11 @@ def replaceTagMatch(m):
|
|||
pre = m.group(1)
|
||||
tag = m.group(2)
|
||||
if tag == 'time':
|
||||
return pre + time.strftime('%H:%M:%S')
|
||||
return pre + time.strftime('%H:%M:%S').encode('utf-8', 'replace')
|
||||
if tag == 'date':
|
||||
return pre + time.strftime('%d %b %Y')
|
||||
return pre + time.strftime('%d %b %Y').encode('utf-8', 'replace')
|
||||
if tag == 'day':
|
||||
return pre + time.strftime('%a')
|
||||
return pre + time.strftime('%a').encode('utf-8', 'replace')
|
||||
if tag == 'print_time':
|
||||
return pre + '#P_TIME#'
|
||||
if tag == 'filament_amount':
|
||||
|
|
|
@ -168,11 +168,11 @@ def getSliceCommand(filename):
|
|||
pypyExe = sys.executable
|
||||
|
||||
#In case we have a frozen exe, then argv[0] points to the executable, but we want to give pypy a real script file.
|
||||
if hasattr(sys, 'frozen'):
|
||||
mainScriptFile = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../..", "cura_sf.zip"))
|
||||
else:
|
||||
mainScriptFile = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", os.path.split(sys.argv[0])[1]))
|
||||
cmd = [pypyExe, mainScriptFile, '-p', profile.getGlobalProfileString(), '-s']
|
||||
#if hasattr(sys, 'frozen'):
|
||||
# mainScriptFile = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../..", "cura_sf.zip"))
|
||||
#else:
|
||||
# mainScriptFile = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", os.path.split(sys.argv[0])[1]))
|
||||
cmd = [pypyExe, '-m', 'Cura.cura', '-p', profile.getGlobalProfileString(), '-s']
|
||||
if platform.system() == "Windows":
|
||||
try:
|
||||
cmd.append(str(filename))
|
||||
|
|
|
@ -20,5 +20,5 @@ if [ $? != 0 ]; then
|
|||
fi
|
||||
|
||||
SCRIPT_DIR=`dirname $0`
|
||||
python ${SCRIPT_DIR}/Cura/cura.py $@
|
||||
|
||||
cd $SCRIPT_DIR
|
||||
python -m Cura.cura $@
|
||||
|
|
Loading…
Reference in New Issue