summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt4
-rw-r--r--README.txt2
-rw-r--r--serial/serialutil.py4
3 files changed, 7 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index dfe95be..8a8e224 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -442,6 +442,10 @@ Version 2.7 2012-nn-nn
- Posix: rename flowControl to setXON to match name on Win32, add
flowControlOut function
+Bugfixes:
+
+- [Bug 3540332] SerialException not returned
+
Bugfixes (posix):
- [Patch 3462364] Fix: NameError: global name 'base' is not defined
diff --git a/README.txt b/README.txt
index d6317e1..cf19511 100644
--- a/README.txt
+++ b/README.txt
@@ -14,7 +14,7 @@ automatically selects the appropriate backend.
- SVN repository: http://sourceforge.net/svn/?group_id=46487
- Download Page: http://sourceforge.net/project/showfiles.php?group_id=46487
-BSD license, (C) 2001-2011 Chris Liechti <cliechti@gmx.net>
+BSD license, (C) 2001-2012 Chris Liechti <cliechti@gmx.net>
Documentation
diff --git a/serial/serialutil.py b/serial/serialutil.py
index c372280..a8f0716 100644
--- a/serial/serialutil.py
+++ b/serial/serialutil.py
@@ -84,8 +84,8 @@ class SerialTimeoutException(SerialException):
"""Write timeouts give an exception"""
-writeTimeoutError = SerialTimeoutException("Write timeout")
-portNotOpenError = ValueError('Attempting to use a port that is not open')
+writeTimeoutError = SerialTimeoutException('Write timeout')
+portNotOpenError = SerialException('Attempting to use a port that is not open')
class FileLike(object):