Mailman 3 January 2021 - Python-checkins

bpo-42756: Configure LMTP Unix-domain socket to use global default timeout when timeout not provided (GH-23969)
by corona10 Jan. 1, 2021

Jan. 1, 2021

https://github.com/python/cpython/commit/3bf05327c2b25d42b92795d9d280288c22… commit: 3bf05327c2b25d42b92795d9d280288c22a0963d branch: master author: Ross <rrhodes(a)users.noreply.github.com> committer: corona10 <donghee.na92(a)gmail.com> date: 2021-01-02T02:20:25+09:00 summary: bpo-42756: Configure LMTP Unix-domain socket to use global default timeout when timeout not provided (GH-23969) files: A Misc/NEWS.d/next/Library/2020-12-27-21-22-01.bpo-42756.dHMPJ9.rst M Lib/smtplib.py M … [View More]Lib/test/mock_socket.py M Lib/test/test_smtplib.py diff --git a/Lib/smtplib.py b/Lib/smtplib.py index e2dbbbcf2e6d1..e81a9f05d60c4 100755 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -1082,7 +1082,8 @@ def connect(self, host='localhost', port=0, source_address=None): # Handle Unix-domain sockets. try: self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - self.sock.settimeout(self.timeout) + if self.timeout is not socket._GLOBAL_DEFAULT_TIMEOUT: + self.sock.settimeout(self.timeout) self.file = None self.sock.connect(host) except OSError: diff --git a/Lib/test/mock_socket.py b/Lib/test/mock_socket.py index cda4db25cba59..c7abddcf5fafd 100644 --- a/Lib/test/mock_socket.py +++ b/Lib/test/mock_socket.py @@ -107,6 +107,9 @@ def getpeername(self): def close(self): pass + def connect(self, host): + pass + def socket(family=None, type=None, proto=None): return MockSocket(family) @@ -152,8 +155,12 @@ def getaddrinfo(*args, **kw): # Constants +_GLOBAL_DEFAULT_TIMEOUT = socket_module._GLOBAL_DEFAULT_TIMEOUT AF_INET = socket_module.AF_INET AF_INET6 = socket_module.AF_INET6 SOCK_STREAM = socket_module.SOCK_STREAM SOL_SOCKET = None SO_REUSEADDR = None + +if hasattr(socket_module, 'AF_UNIX'): + AF_UNIX = socket_module.AF_UNIX diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py index 91985384ec7ff..1ad45d8c780d1 100644 --- a/Lib/test/test_smtplib.py +++ b/Lib/test/test_smtplib.py @@ -165,6 +165,17 @@ class LMTPGeneralTests(GeneralTests, unittest.TestCase): client = smtplib.LMTP + @unittest.skipUnless(hasattr(socket, 'AF_UNIX'), "test requires Unix domain socket") + def testUnixDomainSocketTimeoutDefault(self): + local_host = '/some/local/lmtp/delivery/program' + mock_socket.reply_with(b"220 Hello world") + try: + client = self.client(local_host, self.port) + finally: + mock_socket.setdefaulttimeout(None) + self.assertIsNone(client.sock.gettimeout()) + client.close() + def testTimeoutZero(self): super().testTimeoutZero() local_host = '/some/local/lmtp/delivery/program' diff --git a/Misc/NEWS.d/next/Library/2020-12-27-21-22-01.bpo-42756.dHMPJ9.rst b/Misc/NEWS.d/next/Library/2020-12-27-21-22-01.bpo-42756.dHMPJ9.rst new file mode 100644 index 0000000000000..93a0bb010df2b --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-12-27-21-22-01.bpo-42756.dHMPJ9.rst @@ -0,0 +1,2 @@ +Configure LMTP Unix-domain socket to use socket global default timeout when +a timeout is not explicitly provided. [View Less]

1 0

Bring Python into the new year. (GH-24036)
by corona10 Jan. 1, 2021

Jan. 1, 2021

https://github.com/python/cpython/commit/de6f20a6de48d63066b2cf5b317f50629f… commit: de6f20a6de48d63066b2cf5b317f50629f01d74a branch: master author: Dong-hee Na <donghee.na(a)python.org> committer: corona10 <donghee.na92(a)gmail.com> date: 2021-01-02T00:37:23+09:00 summary: Bring Python into the new year. (GH-24036) files: M Doc/copyright.rst M Doc/license.rst M LICENSE M Mac/IDLE/IDLE.app/Contents/Info.plist M Mac/PythonLauncher/Info.plist.in M Mac/Resources/app/Info.plist.in M … [View More]PC/python_ver_rc.h M Python/getcopyright.c M README.rst diff --git a/Doc/copyright.rst b/Doc/copyright.rst index 1b90d9f172c99..4191c0bb63a2c 100644 --- a/Doc/copyright.rst +++ b/Doc/copyright.rst @@ -4,7 +4,7 @@ Copyright Python and this documentation is: -Copyright © 2001-2020 Python Software Foundation. All rights reserved. +Copyright © 2001-2021 Python Software Foundation. All rights reserved. Copyright © 2000 BeOpen.com. All rights reserved. diff --git a/Doc/license.rst b/Doc/license.rst index 4030825bbd28e..f487d98b2b43a 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -100,7 +100,7 @@ PSF LICENSE AGREEMENT FOR PYTHON |release| analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python |release| alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of - copyright, i.e., "Copyright © 2001-2020 Python Software Foundation; All Rights + copyright, i.e., "Copyright © 2001-2021 Python Software Foundation; All Rights Reserved" are retained in Python |release| alone or in any derivative version prepared by Licensee. diff --git a/LICENSE b/LICENSE index f42f8adbed845..473861da1be7c 100644 --- a/LICENSE +++ b/LICENSE @@ -84,7 +84,7 @@ analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Python Software Foundation; +2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee. diff --git a/Mac/IDLE/IDLE.app/Contents/Info.plist b/Mac/IDLE/IDLE.app/Contents/Info.plist index dcc48abdd2a39..f6b5cfe8d5451 100644 --- a/Mac/IDLE/IDLE.app/Contents/Info.plist +++ b/Mac/IDLE/IDLE.app/Contents/Info.plist @@ -36,7 +36,7 @@ <key>CFBundleExecutable</key> <string>IDLE</string> <key>CFBundleGetInfoString</key> - <string>%version%, © 2001-2020 Python Software Foundation</string> + <string>%version%, © 2001-2021 Python Software Foundation</string> <key>CFBundleIconFile</key> <string>IDLE.icns</string> <key>CFBundleIdentifier</key> diff --git a/Mac/PythonLauncher/Info.plist.in b/Mac/PythonLauncher/Info.plist.in index 21a051535fb92..3d8bc3e4154ee 100644 --- a/Mac/PythonLauncher/Info.plist.in +++ b/Mac/PythonLauncher/Info.plist.in @@ -40,7 +40,7 @@ <key>CFBundleExecutable</key> <string>Python Launcher</string> <key>CFBundleGetInfoString</key> - <string>%VERSION%, © 2001-2020 Python Software Foundation</string> + <string>%VERSION%, © 2001-2021 Python Software Foundation</string> <key>CFBundleIconFile</key> <string>PythonLauncher.icns</string> <key>CFBundleIdentifier</key> diff --git a/Mac/Resources/app/Info.plist.in b/Mac/Resources/app/Info.plist.in index 1d624984a8520..2c801332332b3 100644 --- a/Mac/Resources/app/Info.plist.in +++ b/Mac/Resources/app/Info.plist.in @@ -37,7 +37,7 @@ <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleLongVersionString</key> - <string>%version%, (c) 2001-2020 Python Software Foundation.</string> + <string>%version%, (c) 2001-2021 Python Software Foundation.</string> <key>CFBundleName</key> <string>Python</string> <key>CFBundlePackageType</key> diff --git a/PC/python_ver_rc.h b/PC/python_ver_rc.h index 060aecdc675cb..90fc6ba1a1460 100644 --- a/PC/python_ver_rc.h +++ b/PC/python_ver_rc.h @@ -5,7 +5,7 @@ #include "winver.h" #define PYTHON_COMPANY "Python Software Foundation" -#define PYTHON_COPYRIGHT "Copyright \xA9 2001-2016 Python Software Foundation. Copyright \xA9 2000 BeOpen.com. Copyright \xA9 1995-2001 CNRI. Copyright \xA9 1991-1995 SMC." +#define PYTHON_COPYRIGHT "Copyright \xA9 2001-2021 Python Software Foundation. Copyright \xA9 2000 BeOpen.com. Copyright \xA9 1995-2001 CNRI. Copyright \xA9 1991-1995 SMC." #define MS_WINDOWS #include "modsupport.h" diff --git a/Python/getcopyright.c b/Python/getcopyright.c index 299ccc08c44f8..7fdeb314d5261 100644 --- a/Python/getcopyright.c +++ b/Python/getcopyright.c @@ -4,7 +4,7 @@ static const char cprt[] = "\ -Copyright (c) 2001-2020 Python Software Foundation.\n\ +Copyright (c) 2001-2021 Python Software Foundation.\n\ All Rights Reserved.\n\ \n\ Copyright (c) 2000 BeOpen.com.\n\ diff --git a/README.rst b/README.rst index 51d60d5da6209..c09ed1afbfb4c 100644 --- a/README.rst +++ b/README.rst @@ -22,7 +22,7 @@ This is Python version 3.10.0 alpha 3 :target: https://python.zulipchat.com -Copyright (c) 2001-2020 Python Software Foundation. All rights reserved. +Copyright (c) 2001-2021 Python Software Foundation. All rights reserved. See the end of this file for further copyright and license information. @@ -250,7 +250,7 @@ See :pep:`619` for Python 3.10 release details. Copyright and License Information --------------------------------- -Copyright (c) 2001-2020 Python Software Foundation. All rights reserved. +Copyright (c) 2001-2021 Python Software Foundation. All rights reserved. Copyright (c) 2000 BeOpen.com. All rights reserved. [View Less]

1 0

bpo-42794: Update test_nntplib to use offical group name for testing (GH-24037)
by miss-islington Jan. 1, 2021

Jan. 1, 2021

https://github.com/python/cpython/commit/b20d5e5ce95248e0fa77c5d7bf8f6f5b12… commit: b20d5e5ce95248e0fa77c5d7bf8f6f5b1231fa53 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-01-01T06:42:43-08:00 summary: bpo-42794: Update test_nntplib to use offical group name for testing (GH-24037) (cherry picked from commit … [View More]

1 0

bpo-42794: Update test_nntplib to use offical group name for testing (GH-24037)
by miss-islington Jan. 1, 2021

Jan. 1, 2021

https://github.com/python/cpython/commit/381f3e4bfd4b1c440f7cb3025972fe0acd… commit: 381f3e4bfd4b1c440f7cb3025972fe0acd0406fc branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-01-01T06:40:18-08:00 summary: bpo-42794: Update test_nntplib to use offical group name for testing (GH-24037) (cherry picked from commit … [View More]

1 0

bpo-42794: Update test_nntplib to use offical group name for testing (GH-24037)
by corona10 Jan. 1, 2021

Jan. 1, 2021

https://github.com/python/cpython/commit/ec3165320e81ac87edcb85c86c452528dd… commit: ec3165320e81ac87edcb85c86c452528ddbaec1c branch: master author: Dong-hee Na <donghee.na(a)python.org> committer: corona10 <donghee.na92(a)gmail.com> date: 2021-01-01T23:20:33+09:00 summary: bpo-42794: Update test_nntplib to use offical group name for testing (GH-24037) files: A Misc/NEWS.d/next/Tests/2021-01-01-08-52-36.bpo-42794.-7-XGz.rst M Lib/test/test_nntplib.py diff --git a/Lib/test/… [View More]

1 0

bpo-42781: Document the mechanics of cached_property from a user viewpoint (GH-24031) (#24035)
by rhettinger Jan. 1, 2021

Jan. 1, 2021

https://github.com/python/cpython/commit/8333d421c0d7b90de3ff92002af9fd2c5d… commit: 8333d421c0d7b90de3ff92002af9fd2c5d5f373c branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: rhettinger <rhettinger(a)users.noreply.github.com> date: 2020-12-31T17:36:14-08:00 summary: bpo-42781: Document the mechanics of cached_property from a user viewpoint (GH-24031) (#24035) files: M Doc/library/functools.rst diff --git a/Doc/library/… [View More]

1 0

bpo-42781: Document the mechanics of cached_property from a user viewpoint (GH-24031)
by rhettinger Jan. 1, 2021

Jan. 1, 2021

https://github.com/python/cpython/commit/c8a7b8fa1b5f9a6d3052db792018dc27c5… commit: c8a7b8fa1b5f9a6d3052db792018dc27c5a3a794 branch: master author: Raymond Hettinger <rhettinger(a)users.noreply.github.com> committer: rhettinger <rhettinger(a)users.noreply.github.com> date: 2020-12-31T17:05:58-08:00 summary: bpo-42781: Document the mechanics of cached_property from a user viewpoint (GH-24031) files: M Doc/library/functools.rst diff --git a/Doc/library/functools.rst b/Doc/library/… [View More]

1 0