From: daid303 <daid303@gmail.com>
Date: Thu, 13 Dec 2012 09:56:26 +0000 (+0100)
Subject: Fixed #234
X-Git-Tag: 13.03~155
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3495de027c9015c628a56057aadec2ea187cd4c8;p=cura.git

Fixed #234
---

diff --git a/Cura/avr_isp/stk500v2.py b/Cura/avr_isp/stk500v2.py
index 7365d2cd..99d8e2ea 100644
--- a/Cura/avr_isp/stk500v2.py
+++ b/Cura/avr_isp/stk500v2.py
@@ -16,7 +16,7 @@ class Stk500v2(ispBase.IspBase):
 		if self.serial != None:
 			self.close()
 		try:
-			self.serial = Serial(port, speed, timeout=1, writeTimeout=10000)
+			self.serial = Serial(str(port), speed, timeout=1, writeTimeout=10000)
 		except SerialException as e:
 			raise ispBase.IspError("Failed to open serial port")
 		except:
diff --git a/Cura/util/machineCom.py b/Cura/util/machineCom.py
index 2a826144..4e72610f 100644
--- a/Cura/util/machineCom.py
+++ b/Cura/util/machineCom.py
@@ -286,9 +286,9 @@ class MachineCom(object):
 			try:
 				self._log("Connecting to: %s" % (self._port))
 				if self._baudrate == 0:
-					self._serial = serial.Serial(self._port, 115200, timeout=0.1, writeTimeout=10000)
+					self._serial = serial.Serial(str(self._port), 115200, timeout=0.1, writeTimeout=10000)
 				else:
-					self._serial = serial.Serial(self._port, self._baudrate, timeout=2, writeTimeout=10000)
+					self._serial = serial.Serial(str(self._port), self._baudrate, timeout=2, writeTimeout=10000)
 			except:
 				self._log("Unexpected error while connecting to serial port: %s %s" % (self._port, getExceptionString()))
 		if self._serial == None: