diff options
| author | Chris Liechti <cliechti@gmx.net> | 2015-09-18 21:25:28 +0200 |
|---|---|---|
| committer | Chris Liechti <cliechti@gmx.net> | 2015-09-18 21:25:28 +0200 |
| commit | dc2beecbb12d0cb77371058756f8c751e2a9585d (patch) | |
| tree | fbceffa92adf8687e421d71632a07a49956dd3ac | |
| parent | 6ed12e01f0bfaa53ea96ee5b9ec06a3414ed56e2 (diff) | |
| download | pyserial-git-dc2beecbb12d0cb77371058756f8c751e2a9585d.tar.gz | |
small fixes
| -rw-r--r-- | serial/serialposix.py | 2 | ||||
| -rw-r--r-- | serial/urlhandler/protocol_loop.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/serial/serialposix.py b/serial/serialposix.py index 9064c6a..f8b14d1 100644 --- a/serial/serialposix.py +++ b/serial/serialposix.py @@ -310,7 +310,7 @@ class Serial(SerialBase, PlatformSpecific): self.is_open = True if not self._dsrdtr: self._update_dtr_state() - if not self.rtscts: + if not self._rtscts: self._update_rts_state() self.reset_input_buffer() diff --git a/serial/urlhandler/protocol_loop.py b/serial/urlhandler/protocol_loop.py index 801ba79..d07081a 100644 --- a/serial/urlhandler/protocol_loop.py +++ b/serial/urlhandler/protocol_loop.py @@ -77,7 +77,10 @@ class Serial(SerialBase): def close(self): self.is_open = False - self.queue.put(None) + try: + self.queue.put_nowait(None) + except queue.Full: + pass super(Serial, self).close() def _reconfigure_port(self): |