Update to pySerial 3.4

readme.md

@@ -79,7 +79,7 @@ For reference, the following dependencies are included in Git submodules:
 * brlapi Python bindings, version 0.5.7 or later, distributed with [BRLTTY for Windows](http://brl.thefreecat.org/brltty/), version 4.2-2
 * ALVA BC6 generic dll, version 3.0.4.1
 * lilli.dll, version 2.1.0.0
-* [pyserial](http://pypi.python.org/pypi/pyserial), version 2.7
+* [pySerial](http://pypi.python.org/pypi/pyserial), version 3.4
 * [Python interface to FTDI driver/chip](http://fluidmotion.dyndns.org/zenphoto/index.php?p=news&title=Python-interface-to-FTDI-driver-chip)
 * [Py2Exe](http://sourceforge.net/projects/py2exe/), version 0.6.9
 * [Nulsoft Install System](http://nsis.sourceforge.net/), version 2.51

source/braille.py

@@ -2119,6 +2119,8 @@ def initialize():
 	global handler
 	config.addConfigDirsToPythonPackagePath(brailleDisplayDrivers)
 	log.info("Using liblouis version %s" % louis.version())
+	import serial
+	log.info("Using pySerial version %s"%serial.VERSION)
 	# #6140: Migrate to new table names as smoothly as possible.
 	oldTableName = config.conf["braille"]["translationTable"]
 	newTableName = brailleTables.RENAMED_TABLES.get(oldTableName)

source/brailleDisplayDrivers/ecoBraille.py

@@ -171,10 +171,10 @@ def __init__(self, port):
 		# Try to open port
 		self._dev = serial.Serial(self._port, baudrate = 19200,  bytesize = serial.EIGHTBITS, parity = serial.PARITY_NONE, stopbits = serial.STOPBITS_ONE)
 		# Use a longer timeout when waiting for initialisation.
-		self._dev.timeout = self._dev.writeTimeout = 2.7
+		self._dev.timeout = self._dev.write_timeout = 2.7
 		self._ecoType  = eco_in_init(self._dev)
 		# Use a shorter timeout hereafter.
-		self._dev.timeout = self._dev.writeTimeout = TIMEOUT
+		self._dev.timeout = self._dev.write_timeout = TIMEOUT
 		# Always send the protocol answer.
 		self._dev.write("\x61\x10\x02\xf1\x57\x57\x57\x10\x03")
 		self._dev.write("\x10\x02\xbc\x00\x00\x00\x00\x00\x10\x03")
@@ -202,7 +202,7 @@ def display(self, cells):
 			pass
 
 	def _handleResponses(self):
-		if self._dev.inWaiting():
+		if self._dev.in_waiting:
 			command = eco_in(self._dev)
 			if command:
 				try:

source/brailleDisplayDrivers/hedoMobilLine.py

@@ -100,7 +100,7 @@ def display(self, cells):
 		self._ser.write(line)
 
 	def handleResponses(self, wait=False):
-		while wait or self._ser.inWaiting():
+		while wait or self._ser.in_waiting:
 			data = self._ser.read(1)
 			if data:
 				# do not handle acknowledge bytes

source/brailleDisplayDrivers/hedoProfiLine.py

@@ -124,7 +124,7 @@ def display(self, cells):
 		self._ser.write(line)
 
 	def handleResponses(self, wait=False):
-		while wait or self._ser.inWaiting():
+		while wait or self._ser.in_waiting:
 			data = self._ser.read(1)
 			if data:
 				# do not handle acknowledge bytes

source/brailleDisplayDrivers/papenmeier_serial.py

@@ -47,9 +47,9 @@ def brl_out(offset, data):
 
 def brl_poll(dev):
 	"""read data from braille display, used by keypress handler"""
-	if dev.inWaiting() < 10: return ""
+	if dev.in_waiting < 10: return ""
 	ret = []
-	ret.append(dev.read(dev.inWaiting()))
+	ret.append(dev.read(dev.in_waiting))
 	if ret[0][0] == chr(STX) and ret[0][9] == chr(ETX):
 		return "".join(ret)
 	return ""

source/brailleDisplayDrivers/seika.py

@@ -100,7 +100,7 @@ def display(self, cells):
 		self._ser.write(line)
 
 	def handleResponses(self):
-		if not self._ser.inWaiting():
+		if not self._ser.in_waiting:
 			return
 		chars = [0,0]
 		key = 0

source/hwIo.py

@@ -175,8 +175,7 @@ def __init__(self, *args, **kwargs):
 		self._origTimeout = self._ser.timeout
 		# We don't want a timeout while we're waiting for data.
 		self._setTimeout(None)
-		self.inWaiting = self._ser.inWaiting
-		super(Serial, self).__init__(self._ser.hComPort, onReceive)
+		super(Serial, self).__init__(self._ser._port_handle, onReceive)
 
 	def read(self, size=1):
 		data = self._ser.read(size)
@@ -205,21 +204,21 @@ def _setTimeout(self, timeout):
 		# #6035: pyserial reconfigures all settings of the port when setting a timeout.
 		# This can cause error 'Cannot configure port, some setting was wrong.'
 		# Therefore, manually set the timeouts using the Win32 API.
-		# Adapted from pyserial 3.1.1.
+		# Adapted from pyserial 3.4.
 		timeouts = COMMTIMEOUTS()
 		if timeout is not None:
 			if timeout == 0:
 				timeouts.ReadIntervalTimeout = win32.MAXDWORD
 			else:
 				timeouts.ReadTotalTimeoutConstant = max(int(timeout * 1000), 1)
-		if timeout != 0 and self._ser._interCharTimeout is not None:
-			timeouts.ReadIntervalTimeout = max(int(self._ser._interCharTimeout * 1000), 1)
-		if self._ser._writeTimeout is not None:
-			if self._ser._writeTimeout == 0:
+		if timeout != 0 and self._ser._inter_byte_timeout is not None:
+			timeouts.ReadIntervalTimeout = max(int(self._ser._inter_byte_timeout * 1000), 1)
+		if self._ser._write_timeout is not None:
+			if self._ser._write_timeout == 0:
 				timeouts.WriteTotalTimeoutConstant = win32.MAXDWORD
 			else:
-				timeouts.WriteTotalTimeoutConstant = max(int(self._ser._writeTimeout * 1000), 1)
-		SetCommTimeouts(self._ser.hComPort, ctypes.byref(timeouts))
+				timeouts.WriteTotalTimeoutConstant = max(int(self._ser._write_timeout * 1000), 1)
+		SetCommTimeouts(self._ser._port_handle, ctypes.byref(timeouts))
 
 class HIDP_CAPS (ctypes.Structure):
 	_fields_ = (