Mailman 3 April 2016 - Python-checkins

cpython (2.7): Issue #21746: Remove BaseResult reference from urlparse documentation
by berker.peksag April 30, 2016

April 30, 2016

https://hg.python.org/cpython/rev/6d49a7330c99 changeset: 101191:6d49a7330c99 branch: 2.7 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sat Apr 30 18:36:31 2016 +0300 summary: Issue #21746: Remove BaseResult reference from urlparse documentation BaseResult no longer exists and it has been replaced by namedtuple. Patch by Matthew Gilson. files: Doc/library/urlparse.rst | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst --- a/Doc/library/urlparse.rst +++ b/Doc/library/urlparse.rst @@ -337,22 +337,12 @@ The following classes provide the implementations of the parse results: -.. class:: BaseResult - - Base class for the concrete result classes. This provides most of the attribute - definitions. It does not provide a :meth:`geturl` method. It is derived from - :class:`tuple`, but does not override the :meth:`__init__` or :meth:`__new__` - methods. - - .. class:: ParseResult(scheme, netloc, path, params, query, fragment) - Concrete class for :func:`urlparse` results. The :meth:`__new__` method is - overridden to support checking that the right number of arguments are passed. + Concrete class for :func:`urlparse` results. .. class:: SplitResult(scheme, netloc, path, query, fragment) - Concrete class for :func:`urlsplit` results. The :meth:`__new__` method is - overridden to support checking that the right number of arguments are passed. + Concrete class for :func:`urlsplit` results. -- Repository URL: https://hg.python.org/cpython

1 0

Daily reference leaks (1ceb91974dc4): sum=6
by solipsis＠pitrou.net April 30, 2016

April 30, 2016

results for 1ceb91974dc4 on branch "default" -------------------------------------------- test_collections leaked [-4, 0, 4] memory blocks, sum=0 test_functools leaked [0, 3, 1] memory blocks, sum=4 test_typing leaked [2, 0, 0] references, sum=2 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflog8mRFcT', '--timeout', '7200']

1 0

cpython (merge 3.5 -> default): Issue #26864: Merge no_proxy fixes from 3.5
by martin.panter April 30, 2016

April 30, 2016

https://hg.python.org/cpython/rev/1ceb91974dc4 changeset: 101189:1ceb91974dc4 parent: 101187:59638baee25e parent: 101188:ca882ee68d46 user: Martin Panter <vadmium+py(a)gmail.com> date: Sat Apr 30 01:30:57 2016 +0000 summary: Issue #26864: Merge no_proxy fixes from 3.5 files: Lib/test/test_urllib.py | 13 +++++++++++++ Lib/urllib/request.py | 8 ++++++-- Misc/NEWS | 5 +++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -231,6 +231,19 @@ self.assertTrue(urllib.request.proxy_bypass_environment('anotherdomain.com:8888')) self.assertTrue(urllib.request.proxy_bypass_environment('newdomain.com:1234')) + def test_proxy_bypass_environment_host_match(self): + bypass = urllib.request.proxy_bypass_environment + self.env.set('NO_PROXY', + 'localhost, anotherdomain.com, newdomain.com:1234') + self.assertTrue(bypass('localhost')) + self.assertTrue(bypass('LocalHost')) # MixedCase + self.assertTrue(bypass('LOCALHOST')) # UPPERCASE + self.assertTrue(bypass('newdomain.com:1234')) + self.assertTrue(bypass('anotherdomain.com:8888')) + self.assertTrue(bypass('www.newdomain.com:1234')) + self.assertFalse(bypass('prelocalhost')) + self.assertFalse(bypass('newdomain.com')) # no port + self.assertFalse(bypass('newdomain.com:1235')) # wrong port class ProxyTests_withOrderedEnv(unittest.TestCase): diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -2492,8 +2492,12 @@ # check if the host ends with any of the DNS suffixes no_proxy_list = [proxy.strip() for proxy in no_proxy.split(',')] for name in no_proxy_list: - if name and (hostonly.endswith(name) or host.endswith(name)): - return 1 + if name: + name = re.escape(name) + pattern = r'(.+\.)?%s$' % name + if (re.match(pattern, hostonly, re.I) + or re.match(pattern, host, re.I)): + return 1 # otherwise, don't bypass return 0 diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -256,6 +256,11 @@ Library ------- +- Issue #26864: In urllib.request, change the proxy bypass host checking + against no_proxy to be case-insensitive, and to not match unrelated host + names that happen to have a bypassed hostname as a suffix. Patch by Xiang + Zhang. + - Issue #24902: Print server URL on http.server startup. Initial patch by Felix Kaiser. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #26864: Fix case insensitivity and suffix comparison with no_proxy
by martin.panter April 30, 2016

April 30, 2016

https://hg.python.org/cpython/rev/a1aad42f1195 changeset: 101190:a1aad42f1195 branch: 2.7 parent: 101178:d738f268a013 user: Martin Panter <vadmium+py(a)gmail.com> date: Sat Apr 30 01:03:40 2016 +0000 summary: Issue #26864: Fix case insensitivity and suffix comparison with no_proxy Patch by Xiang Zhang. files: Lib/test/test_urllib.py | 13 +++++++++++++ Lib/urllib.py | 8 ++++++-- Misc/NEWS | 4 ++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -164,6 +164,19 @@ self.assertTrue(urllib.proxy_bypass_environment('anotherdomain.com:8888')) self.assertTrue(urllib.proxy_bypass_environment('newdomain.com:1234')) + def test_proxy_bypass_environment_host_match(self): + bypass = urllib.proxy_bypass_environment + self.env.set('NO_PROXY', + 'localhost, anotherdomain.com, newdomain.com:1234') + self.assertTrue(bypass('localhost')) + self.assertTrue(bypass('LocalHost')) # MixedCase + self.assertTrue(bypass('LOCALHOST')) # UPPERCASE + self.assertTrue(bypass('newdomain.com:1234')) + self.assertTrue(bypass('anotherdomain.com:8888')) + self.assertTrue(bypass('www.newdomain.com:1234')) + self.assertFalse(bypass('prelocalhost')) + self.assertFalse(bypass('newdomain.com')) # no port + self.assertFalse(bypass('newdomain.com:1235')) # wrong port class ProxyTests_withOrderedEnv(unittest.TestCase): diff --git a/Lib/urllib.py b/Lib/urllib.py --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -1423,8 +1423,12 @@ # check if the host ends with any of the DNS suffixes no_proxy_list = [proxy.strip() for proxy in no_proxy.split(',')] for name in no_proxy_list: - if name and (hostonly.endswith(name) or host.endswith(name)): - return 1 + if name: + name = re.escape(name) + pattern = r'(.+\.)?%s$' % name + if (re.match(pattern, hostonly, re.I) + or re.match(pattern, host, re.I)): + return 1 # otherwise, don't bypass return 0 diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -77,6 +77,10 @@ Library ------- +- Issue #26864: In urllib, change the proxy bypass host checking against + no_proxy to be case-insensitive, and to not match unrelated host names that + happen to have a bypassed hostname as a suffix. Patch by Xiang Zhang. + - Issue #26804: urllib will prefer lower_case proxy environment variables over UPPER_CASE or Mixed_Case ones. Patch contributed by Hans-Peter Jansen. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #26864: Fix case insensitivity and suffix comparison with no_proxy
by martin.panter April 30, 2016

April 30, 2016

https://hg.python.org/cpython/rev/ca882ee68d46 changeset: 101188:ca882ee68d46 branch: 3.5 parent: 101185:110dfb244b27 user: Martin Panter <vadmium+py(a)gmail.com> date: Sat Apr 30 01:03:40 2016 +0000 summary: Issue #26864: Fix case insensitivity and suffix comparison with no_proxy Patch by Xiang Zhang. files: Lib/test/test_urllib.py | 13 +++++++++++++ Lib/urllib/request.py | 8 ++++++-- Misc/NEWS | 5 +++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -231,6 +231,19 @@ self.assertTrue(urllib.request.proxy_bypass_environment('anotherdomain.com:8888')) self.assertTrue(urllib.request.proxy_bypass_environment('newdomain.com:1234')) + def test_proxy_bypass_environment_host_match(self): + bypass = urllib.request.proxy_bypass_environment + self.env.set('NO_PROXY', + 'localhost, anotherdomain.com, newdomain.com:1234') + self.assertTrue(bypass('localhost')) + self.assertTrue(bypass('LocalHost')) # MixedCase + self.assertTrue(bypass('LOCALHOST')) # UPPERCASE + self.assertTrue(bypass('newdomain.com:1234')) + self.assertTrue(bypass('anotherdomain.com:8888')) + self.assertTrue(bypass('www.newdomain.com:1234')) + self.assertFalse(bypass('prelocalhost')) + self.assertFalse(bypass('newdomain.com')) # no port + self.assertFalse(bypass('newdomain.com:1235')) # wrong port class ProxyTests_withOrderedEnv(unittest.TestCase): diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -2432,8 +2432,12 @@ # check if the host ends with any of the DNS suffixes no_proxy_list = [proxy.strip() for proxy in no_proxy.split(',')] for name in no_proxy_list: - if name and (hostonly.endswith(name) or host.endswith(name)): - return 1 + if name: + name = re.escape(name) + pattern = r'(.+\.)?%s$' % name + if (re.match(pattern, hostonly, re.I) + or re.match(pattern, host, re.I)): + return 1 # otherwise, don't bypass return 0 diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -107,6 +107,11 @@ Library ------- +- Issue #26864: In urllib.request, change the proxy bypass host checking + against no_proxy to be case-insensitive, and to not match unrelated host + names that happen to have a bypassed hostname as a suffix. Patch by Xiang + Zhang. + - Issue #26634: recursive_repr() now sets __qualname__ of wrapper. Patch by Xiang Zhang. -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #13436: Add a test to make sure that ast.ImportFrom(level=None) works
by berker.peksag April 29, 2016

April 29, 2016

https://hg.python.org/cpython/rev/59638baee25e changeset: 101187:59638baee25e user: Berker Peksag <berker.peksag(a)gmail.com> date: Fri Apr 29 19:50:02 2016 +0300 summary: Issue #13436: Add a test to make sure that ast.ImportFrom(level=None) works files: Lib/test/test_ast.py | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py --- a/Lib/test/test_ast.py +++ b/Lib/test/test_ast.py @@ -548,6 +548,17 @@ compile(mod, 'test', 'exec') self.assertIn("invalid integer value: None", str(cm.exception)) + def test_level_as_none(self): + body = [ast.ImportFrom(module='time', + names=[ast.alias(name='sleep')], + level=None, + lineno=0, col_offset=0)] + mod = ast.Module(body) + code = compile(mod, 'test', 'exec') + ns = {} + exec(code, ns) + self.assertIn('sleep', ns) + class ASTValidatorTests(unittest.TestCase): -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Issue #25551: Test condition behavior instead of its internals
by berker.peksag April 29, 2016

April 29, 2016

https://hg.python.org/cpython/rev/9694185cdd9f changeset: 101186:9694185cdd9f parent: 101184:39397748a5b0 parent: 101185:110dfb244b27 user: Berker Peksag <berker.peksag(a)gmail.com> date: Fri Apr 29 17:25:51 2016 +0300 summary: Issue #25551: Test condition behavior instead of its internals test_reset_internal_locks was looking at Event's _cond._lock. This makes it harder to change internals of the Condition object and makes the test fragile. The test was added by Nir Soffer in 6108d30dde21. Patch by Nir Soffer. files: Lib/test/lock_tests.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Lib/test/lock_tests.py b/Lib/test/lock_tests.py --- a/Lib/test/lock_tests.py +++ b/Lib/test/lock_tests.py @@ -407,12 +407,13 @@ self.assertEqual(results, [True] * N) def test_reset_internal_locks(self): + # ensure that condition is still using a Lock after reset evt = self.eventtype() - old_lock = evt._cond._lock + with evt._cond: + self.assertFalse(evt._cond.acquire(False)) evt._reset_internal_locks() - new_lock = evt._cond._lock - self.assertIsNot(new_lock, old_lock) - self.assertIs(type(new_lock), type(old_lock)) + with evt._cond: + self.assertFalse(evt._cond.acquire(False)) class ConditionTests(BaseTestCase): -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #25551: Test condition behavior instead of its internals
by berker.peksag April 29, 2016

April 29, 2016

https://hg.python.org/cpython/rev/110dfb244b27 changeset: 101185:110dfb244b27 branch: 3.5 parent: 101181:6cd8cd14f648 user: Berker Peksag <berker.peksag(a)gmail.com> date: Fri Apr 29 17:25:29 2016 +0300 summary: Issue #25551: Test condition behavior instead of its internals test_reset_internal_locks was looking at Event's _cond._lock. This makes it harder to change internals of the Condition object and makes the test fragile. The test was added by Nir Soffer in 6108d30dde21. Patch by Nir Soffer. files: Lib/test/lock_tests.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Lib/test/lock_tests.py b/Lib/test/lock_tests.py --- a/Lib/test/lock_tests.py +++ b/Lib/test/lock_tests.py @@ -395,12 +395,13 @@ self.assertEqual(results, [True] * N) def test_reset_internal_locks(self): + # ensure that condition is still using a Lock after reset evt = self.eventtype() - old_lock = evt._cond._lock + with evt._cond: + self.assertFalse(evt._cond.acquire(False)) evt._reset_internal_locks() - new_lock = evt._cond._lock - self.assertIsNot(new_lock, old_lock) - self.assertIs(type(new_lock), type(old_lock)) + with evt._cond: + self.assertFalse(evt._cond.acquire(False)) class ConditionTests(BaseTestCase): -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Fix typos. Reported by andportnoy on GitHub.
by berker.peksag April 29, 2016

April 29, 2016

https://hg.python.org/cpython/rev/39397748a5b0 changeset: 101184:39397748a5b0 user: Berker Peksag <berker.peksag(a)gmail.com> date: Fri Apr 29 16:54:10 2016 +0300 summary: Fix typos. Reported by andportnoy on GitHub. files: Modules/_randommodule.c | 2 +- Objects/typeobject.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c --- a/Modules/_randommodule.c +++ b/Modules/_randommodule.c @@ -136,7 +136,7 @@ * optimize the division away at compile-time. 67108864 is 2**26. In * effect, a contains 27 random bits shifted left 26, and b fills in the * lower 26 bits of the 53-bit numerator. - * The orginal code credited Isaku Wada for this algorithm, 2002/01/09. + * The original code credited Isaku Wada for this algorithm, 2002/01/09. */ static PyObject * random_random(RandomObject *self) diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -3944,7 +3944,7 @@ } /* If we found some slot attributes, pack them in a tuple along - the orginal attribute dictionary. */ + the original attribute dictionary. */ if (PyDict_Size(slots) > 0) { PyObject *state2; -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #24902: Print server URL on http.server startup
by berker.peksag April 29, 2016

April 29, 2016

https://hg.python.org/cpython/rev/3be61137280a changeset: 101183:3be61137280a user: Berker Peksag <berker.peksag(a)gmail.com> date: Fri Apr 29 16:48:11 2016 +0300 summary: Issue #24902: Print server URL on http.server startup Initial patch by Felix Kaiser. files: Lib/http/server.py | 3 ++- Misc/NEWS | 3 +++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Lib/http/server.py b/Lib/http/server.py --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -1177,7 +1177,8 @@ HandlerClass.protocol_version = protocol with ServerClass(server_address, HandlerClass) as httpd: sa = httpd.socket.getsockname() - print("Serving HTTP on", sa[0], "port", sa[1], "...") + serve_message = "Serving HTTP on {host} port {port} (http://{host}:{port}/) ..." + print(serve_message.format(host=sa[0], port=sa[1])) try: httpd.serve_forever() except KeyboardInterrupt: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -256,6 +256,9 @@ Library ------- +- Issue #24902: Print server URL on http.server startup. Initial patch by + Felix Kaiser. + - Issue #25788: fileinput.hook_encoded() now supports an "errors" argument for passing to open. Original patch by Joseph Hackman. -- Repository URL: https://hg.python.org/cpython

1 0