From: Segev Finer <segev208@gmail.com>
Date: Fri, 29 Dec 2017 20:44:04 +0000 (+0200)
Subject: bpo-18035: telnetlib: select.error doesn't have an errno attribute (#5044)
X-Git-Tag: v2.7.15rc1~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ceaed0dce81fd881bbaf2dbdbe827d9681887da;p=thirdparty%2FPython%2Fcpython.git

bpo-18035: telnetlib: select.error doesn't have an errno attribute (#5044)

select.error doesn't have an errno attribute so access the errno by
indexing instead.
---

diff --git a/Lib/telnetlib.py b/Lib/telnetlib.py
index 2eaa8e370986..d0246c0aea7d 100644
--- a/Lib/telnetlib.py
+++ b/Lib/telnetlib.py
@@ -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
index 000000000000..7b6e0dc6b282
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-12-29-15-16-56.bpo-18035.c6rdCt.rst
@@ -0,0 +1,2 @@
+``telnetlib``: ``select.error`` doesn't have an ``errno`` attribute. Patch
+by Segev Finer.