From: daid303 <daid303@gmail.com>
Date: Mon, 10 Dec 2012 09:09:55 +0000 (+0100)
Subject: Fix encoding bug when using locals with none-ascii chars in it.
X-Git-Tag: 13.03~164
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=98ef38eb46fd59b1ed721a798b364201e58ad0e1;p=cura.git

Fix encoding bug when using locals with none-ascii chars in it.
---

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index d2f4d3d5..0b63e90b 100644
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -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':
diff --git a/Cura/util/sliceRun.py b/Cura/util/sliceRun.py
index e749e48b..7ec7fa1c 100644
--- a/Cura/util/sliceRun.py
+++ b/Cura/util/sliceRun.py
@@ -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))
diff --git a/scripts/linux/cura.sh b/scripts/linux/cura.sh
index 53c16d0d..05f00075 100755
--- a/scripts/linux/cura.sh
+++ b/scripts/linux/cura.sh
@@ -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 $@