diff options
| author | cliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a> | 2008-06-19 00:21:55 +0000 |
|---|---|---|
| committer | cliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a> | 2008-06-19 00:21:55 +0000 |
| commit | 0567392d974de2e4437ae50b579f5f1e9d93e316 (patch) | |
| tree | 2c77f65307f0369951c66f738b29c9b113b31314 | |
| parent | 9b6f80f104b41c9d8f2c9e25acf4d76a4f1fbb9c (diff) | |
| download | pyserial-0567392d974de2e4437ae50b579f5f1e9d93e316.tar.gz | |
fix bug 1938118
git-svn-id: http://svn.code.sf.net/p/pyserial/code/trunk@170 f19166aa-fa4f-0410-85c2-fa1106f25c8a
| -rw-r--r-- | pyserial/CHANGES.txt | 1 | ||||
| -rw-r--r-- | pyserial/serial/serialutil.py | 2 | ||||
| -rw-r--r-- | pyserial/serial/serialwin32.py | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/pyserial/CHANGES.txt b/pyserial/CHANGES.txt index 7daa819..0cdf246 100644 --- a/pyserial/CHANGES.txt +++ b/pyserial/CHANGES.txt @@ -270,3 +270,4 @@ Bugfixes (posix): Bugfixes (win32): - [Bug 1520357] Handle leak +- [Bug 1938118] process hang forever under XP diff --git a/pyserial/serial/serialutil.py b/pyserial/serial/serialutil.py index 63dd518..7ab62ed 100644 --- a/pyserial/serial/serialutil.py +++ b/pyserial/serial/serialutil.py @@ -145,7 +145,7 @@ class SerialBase(FileLike): self._parity = None #correct value is assigned below trough properties self._stopbits = None #correct value is assigned below trough properties self._timeout = None #correct value is assigned below trough properties - self._writeTimeout = None #correct value is assigned below trough properties + self._writeTimeout = None #correct value is assigned below trough properties self._xonxoff = None #correct value is assigned below trough properties self._rtscts = None #correct value is assigned below trough properties self._dsrdtr = None #correct value is assigned below trough properties diff --git a/pyserial/serial/serialwin32.py b/pyserial/serial/serialwin32.py index 508a95f..eb3e3e4 100644 --- a/pyserial/serial/serialwin32.py +++ b/pyserial/serial/serialwin32.py @@ -11,7 +11,7 @@ import win32event # We use events and the WaitFor[Single|Multiple]Objects functi import win32con # constants. from serialutil import * -VERSION = "$Revision: 1.38 $".split()[1] #extract CVS version +VERSION = "$Revision: 1.39 $".split()[1] #extract CVS version #from winbase.h. these should realy be in win32con MS_CTS_ON = 16 @@ -42,7 +42,7 @@ class Serial(SerialBase): 0, # exclusive access None, # no security win32con.OPEN_EXISTING, - win32con.FILE_ATTRIBUTE_NORMAL | win32con.FILE_FLAG_OVERLAPPED, + win32con.FILE_FLAG_OVERLAPPED, None) except Exception, msg: self.hComPort = None #'cause __del__ is called anyway |