diff options
author | cliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a> | 2009-07-25 00:42:57 +0000 |
---|---|---|
committer | cliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a> | 2009-07-25 00:42:57 +0000 |
commit | 91d247d3f2a859053089d3ed2e3e138291128a5f (patch) | |
tree | eae4929b4b66191370cfb4eea421956a7c346ca8 | |
parent | 8b478c186e77daebd8525876e0519b66b98110ec (diff) | |
download | pyserial-git-91d247d3f2a859053089d3ed2e3e138291128a5f.tar.gz |
changes required for 2to3 support respectively Python 3.x compatibility of the resulting code
-rw-r--r-- | pyserial/serial/serialcli.py | 4 | ||||
-rw-r--r-- | pyserial/serial/serialutil.py | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/pyserial/serial/serialcli.py b/pyserial/serial/serialcli.py index e609540..6961bf6 100644 --- a/pyserial/serial/serialcli.py +++ b/pyserial/serial/serialcli.py @@ -87,7 +87,7 @@ class Serial(SerialBase): raise ValueError("Unsupported number of data bits: %r" % self._bytesize) if self._parity == PARITY_NONE: - self._port_handle.Parity = System.IO.Ports.Parity.None + self._port_handle.Parity = getattr(System.IO.Ports.Parity, 'None') # reserved keyword in Py3k elif self._parity == PARITY_EVEN: self._port_handle.Parity = System.IO.Ports.Parity.Even elif self._parity == PARITY_ODD: @@ -115,7 +115,7 @@ class Serial(SerialBase): elif self._xonxoff: self._port_handle.Handshake = System.IO.Ports.Handshake.XOnXOff else: - self._port_handle.Handshake = System.IO.Ports.Handshake.None + self._port_handle.Handshake = getattr(System.IO.Ports.Handshake, 'None') # reserved keyword in Py3k #~ def __del__(self): #~ self.close() diff --git a/pyserial/serial/serialutil.py b/pyserial/serial/serialutil.py index 9097d04..71bafbf 100644 --- a/pyserial/serial/serialutil.py +++ b/pyserial/serial/serialutil.py @@ -20,12 +20,6 @@ PARITY_NAMES = { XON = chr(17) XOFF = chr(19) -# Python < 2.2.3 compatibility -try: - True -except: - True = 1 - False = not True class SerialException(Exception): """Base class for serial port related exceptions.""" |