[Patch pyserial:30] [PATCH 1/1] serial.Serial() should not raise IOError.

also catch errors when getting struct


git-svn-id: http://svn.code.sf.net/p/pyserial/code/trunk/pyserial@471 f19166aa-fa4f-0410-85c2-fa1106f25c8a

1 files changed, 10 insertions, 10 deletions

diff --git a/serial/serialposix.py b/serial/serialposix.py
index e1abce3..131e31b 100644
--- a/serial/serialposix.py
+++ b/serial/serialposix.py
@@ -45,18 +45,18 @@ if   plat[:5] == 'linux':    # Linux (confirmed)
         import array
         buf = array.array('i', [0] * 64)
 
-        # get serial_struct
-        FCNTL.ioctl(port.fd, TCGETS2, buf)
-        # set custom speed
-        buf[2] &= ~TERMIOS.CBAUD
-        buf[2] |= BOTHER
-        buf[9] = buf[10] = baudrate
-
-        # set serial_struct
         try:
+            # get serial_struct
+            FCNTL.ioctl(port.fd, TCGETS2, buf)
+            # set custom speed
+            buf[2] &= ~TERMIOS.CBAUD
+            buf[2] |= BOTHER
+            buf[9] = buf[10] = baudrate
+
+            # set serial_struct
             res = FCNTL.ioctl(port.fd, TCSETS2, buf)
-        except IOError:
-            raise ValueError('Failed to set custom baud rate: %r' % baudrate)
+        except IOError, e:
+            raise ValueError('Failed to set custom baud rate (%s): %s' % (baudrate, e))
 
     baudrate_constants = {
         0:       0000000,  # hang up