summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a>2014-07-31 15:29:34 +0000
committercliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a>2014-07-31 15:29:34 +0000
commit7c213a96a322e96fbb0df705abb64ad6881dcab0 (patch)
tree4d7e0f2a1dd34daecec3e3a1df8aa62462581c75
parent6b7f7bdc8c0691fc09bab8b29a583892e173468b (diff)
downloadpyserial-git-7c213a96a322e96fbb0df705abb64ad6881dcab0.tar.gz
[Bug pyserial:166] RFC2217 connections always fail
-rw-r--r--pyserial/CHANGES.txt6
-rw-r--r--pyserial/serial/rfc2217.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/pyserial/CHANGES.txt b/pyserial/CHANGES.txt
index 6c2d478..da3f6df 100644
--- a/pyserial/CHANGES.txt
+++ b/pyserial/CHANGES.txt
@@ -476,3 +476,9 @@ Bugfixes (win32):
- [Bug pyserial:152] Cannot configure port, some setting was wrong. Can leave
port handle open but port not accessible
+Version 2.8 2014-xx-xx
+---------------------------
+
+Bugfixes:
+
+- [Bug pyserial:166] RFC2217 connections always fail
diff --git a/pyserial/serial/rfc2217.py b/pyserial/serial/rfc2217.py
index 2012ea7..3781ac6 100644
--- a/pyserial/serial/rfc2217.py
+++ b/pyserial/serial/rfc2217.py
@@ -442,7 +442,7 @@ class RFC2217Serial(SerialBase):
timeout_time = time.time() + self._network_timeout
while time.time() < timeout_time:
time.sleep(0.05) # prevent 100% CPU load
- if sum(o.active for o in mandadory_options) == len(mandadory_options):
+ if sum(o.active for o in mandadory_options) == sum(o.state != INACTIVE for o in mandadory_options):
break
else:
raise SerialException("Remote does not seem to support RFC2217 or BINARY mode %r" % mandadory_options)