--- pyserial-2.5/serial/rfc2217.py.orig	2009-12-25 16:01:06.000000000 +0000
+++ pyserial-2.5/serial/rfc2217.py	2010-10-01 10:35:34.159102385 +0100
@@ -1,4 +1,3 @@
-#! python
 #
 # Python Serial Port Extension for Win32, Linux, BSD, Jython
 # see __init__.py
@@ -202,14 +201,24 @@
     PARITY_MARK: 4,
     PARITY_SPACE: 5,
 }
-RFC2217_REVERSE_PARITY_MAP = dict((v,k) for k,v in RFC2217_PARITY_MAP.items())
+RFC2217_REVERSE_PARITY_MAP = {
+    1: PARITY_NONE,
+    2: PARITY_ODD,
+    3: PARITY_EVEN,
+    4: PARITY_MARK,
+    5: PARITY_SPACE,
+}
 
 RFC2217_STOPBIT_MAP = {
     STOPBITS_ONE: 1,
     STOPBITS_ONE_POINT_FIVE: 3,
     STOPBITS_TWO: 2,
 }
-RFC2217_REVERSE_STOPBIT_MAP = dict((v,k) for k,v in RFC2217_STOPBIT_MAP.items())
+RFC2217_REVERSE_STOPBIT_MAP = {
+    1: STOPBITS_ONE,
+    2: STOPBITS_TWO,
+    3: STOPBITS_ONE_POINT_FIVE,
+}
 
 # Telnet filter states
 M_NORMAL = 0
@@ -427,7 +436,10 @@
         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):
+            total = 0
+            for o in mandadory_options:
+                total += o.active
+            if total == len(mandadory_options):
                 break
         else:
             raise SerialException("Remote does not seem to support RFC2217 or BINARY mode %r" % mandadory_options)
@@ -472,7 +484,10 @@
         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 items) == len(items):
+            total = 0
+            for o in items:
+                total += o.active
+            if total == len(items):
                 break
         else:
             raise SerialException("Remote does not accept parameter change (RFC2217): %r" % items)