]> granicus.if.org Git - python/commitdiff
bpo-18035: telnetlib: select.error doesn't have an errno attribute (#5044)
authorSegev Finer <segev208@gmail.com>
Fri, 29 Dec 2017 20:44:04 +0000 (22:44 +0200)
committerGregory P. Smith <greg@krypto.org>
Fri, 29 Dec 2017 20:44:04 +0000 (12:44 -0800)
select.error doesn't have an errno attribute so access the errno by
indexing instead.

Lib/telnetlib.py
Misc/NEWS.d/next/Library/2017-12-29-15-16-56.bpo-18035.c6rdCt.rst [new file with mode: 0644]

index 2eaa8e3709861acfda572b12810b9b4bdd3678f0..d0246c0aea7d8ca10fa9ae06924c41e996c5e7ab 100644 (file)
@@ -317,7 +317,7 @@ class Telnet:
                     ready = poller.poll(None if timeout is None
                                         else 1000 * call_timeout)
                 except select.error as e:
-                    if e.errno == errno.EINTR:
+                    if e[0] == errno.EINTR:
                         if timeout is not None:
                             elapsed = time() - time_start
                             call_timeout = timeout-elapsed
@@ -688,7 +688,7 @@ class Telnet:
                     ready = poller.poll(None if timeout is None
                                         else 1000 * call_timeout)
                 except select.error as e:
-                    if e.errno == errno.EINTR:
+                    if e[0] == errno.EINTR:
                         if timeout is not None:
                             elapsed = time() - time_start
                             call_timeout = timeout-elapsed
diff --git a/Misc/NEWS.d/next/Library/2017-12-29-15-16-56.bpo-18035.c6rdCt.rst b/Misc/NEWS.d/next/Library/2017-12-29-15-16-56.bpo-18035.c6rdCt.rst
new file mode 100644 (file)
index 0000000..7b6e0dc
--- /dev/null
@@ -0,0 +1,2 @@
+``telnetlib``: ``select.error`` doesn't have an ``errno`` attribute. Patch
+by Segev Finer.