diff options
author | cliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a> | 2009-07-30 17:25:09 +0000 |
---|---|---|
committer | cliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a> | 2009-07-30 17:25:09 +0000 |
commit | 5811fb5fa0228b0ebeb287f95c93fdc4b6803c96 (patch) | |
tree | 00755f46976ffe18fc1b26fe7bacb228431d2824 | |
parent | 9ca757d10f6c30eae280dcd7ae5369ff64691097 (diff) | |
download | pyserial-5811fb5fa0228b0ebeb287f95c93fdc4b6803c96.tar.gz |
remove type check and instead convert to bytes (Py 3.1 memoryview is not compatible w/ ctypes)
git-svn-id: http://svn.code.sf.net/p/pyserial/code/trunk/pyserial@261 f19166aa-fa4f-0410-85c2-fa1106f25c8a
-rw-r--r-- | serial/serialwin32.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/serial/serialwin32.py b/serial/serialwin32.py index df58e77..af436bb 100644 --- a/serial/serialwin32.py +++ b/serial/serialwin32.py @@ -240,8 +240,10 @@ class Win32Serial(SerialBase): def write(self, data): """Output the given string over the serial port.""" if not self.hComPort: raise portNotOpenError - if not isinstance(data, (bytes, bytearray)): - raise TypeError('expected %s or bytearray, got %s' % (bytes, type(data))) + #~ if not isinstance(data, (bytes, bytearray)): + #~ raise TypeError('expected %s or bytearray, got %s' % (bytes, type(data))) + # convert data (needed in case of memoryview instance: Py 3.1 io lib), ctypes doesn't like memoryview + data = bytes(data) if data: #~ win32event.ResetEvent(self._overlappedWrite.hEvent) n = win32.DWORD() @@ -253,7 +255,9 @@ class Win32Serial(SerialBase): err = win32.GetOverlappedResult(self.hComPort, self._overlappedWrite, ctypes.byref(n), True) if n.value != len(data): raise writeTimeoutError - return n.value + return n.value + else: + return 0 def flushInput(self): |