diff options
| -rw-r--r-- | Lib/imaplib.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_imaplib.py | 14 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2018-08-02-21-28-38.bpo-18540.AryoYY.rst | 3 |
3 files changed, 22 insertions, 1 deletions
diff --git a/Lib/imaplib.py b/Lib/imaplib.py index 700b19b..b9a01d6 100644 --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -282,7 +282,11 @@ class IMAP4: def _create_socket(self): - return socket.create_connection((self.host, self.port)) + # Default value of IMAP4.host is '', but socket.getaddrinfo() + # (which is used by socket.create_connection()) expects None + # as a default value for host. + host = None if not self.host else self.host + return socket.create_connection((host, self.port)) def open(self, host = '', port = IMAP4_PORT): """Setup connection to remote server on "host:port" diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py index 93ba61a..0593a37 100644 --- a/Lib/test/test_imaplib.py +++ b/Lib/test/test_imaplib.py @@ -5,6 +5,7 @@ from test import support threading = support.import_module('threading') from contextlib import contextmanager +import errno import imaplib import os.path import socketserver @@ -73,6 +74,19 @@ class TestImaplib(unittest.TestCase): for t in self.timevalues(): imaplib.Time2Internaldate(t) + def test_imap4_host_default_value(self): + expected_errnos = [ + # This is the exception that should be raised. + errno.ECONNREFUSED, + ] + if hasattr(errno, 'EADDRNOTAVAIL'): + # socket.create_connection() fails randomly with + # EADDRNOTAVAIL on Travis CI. + expected_errnos.append(errno.EADDRNOTAVAIL) + with self.assertRaises(OSError) as cm: + imaplib.IMAP4() + self.assertIn(cm.exception.errno, expected_errnos) + if ssl: class SecureTCPServer(socketserver.TCPServer): diff --git a/Misc/NEWS.d/next/Library/2018-08-02-21-28-38.bpo-18540.AryoYY.rst b/Misc/NEWS.d/next/Library/2018-08-02-21-28-38.bpo-18540.AryoYY.rst new file mode 100644 index 0000000..3ffd9f6 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-08-02-21-28-38.bpo-18540.AryoYY.rst @@ -0,0 +1,3 @@ +The :class:`imaplib.IMAP4` and :class:`imaplib.IMAP4_SSL` classes now +resolve to the local host IP correctly when the default value of *host* +parameter (``''``) is used. |