Mailman 3 September 2017 - Python-checkins

Daily reference leaks (4243df51fe43): sum=-4
by solipsis＠pitrou.net Sept. 30, 2017

Sept. 30, 2017

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

1 0

bpo-31581: Reduce the number of imports for functools (GH-3757)
by INADA Naoki Sept. 30, 2017

Sept. 30, 2017

https://github.com/python/cpython/commit/9811e80fd0ed9d74c76a66f1dd4e4b8afa… commit: 9811e80fd0ed9d74c76a66f1dd4e4b8afa9e8f53 branch: master author: INADA Naoki <methane(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2017-09-30T16:13:02+09:00 summary: bpo-31581: Reduce the number of imports for functools (GH-3757) files: M Lib/functools.py M Lib/test/test_functools.py diff --git a/Lib/functools.py b/Lib/functools.py index 25075de5b40..a51dddf8785 … [View More]100644 --- a/Lib/functools.py +++ b/Lib/functools.py @@ -19,8 +19,7 @@ pass from abc import get_cache_token from collections import namedtuple -from types import MappingProxyType -from weakref import WeakKeyDictionary +# import types, weakref # Deferred to single_dispatch() from reprlib import recursive_repr from _thread import RLock @@ -753,10 +752,14 @@ def singledispatch(func): function acts as the default implementation, and additional implementations can be registered using the register() attribute of the generic function. - """ + # There are many programs that use functools without singledispatch, so we + # trade-off making singledispatch marginally slower for the benefit of + # making start-up of such applications slightly faster. + import types, weakref + registry = {} - dispatch_cache = WeakKeyDictionary() + dispatch_cache = weakref.WeakKeyDictionary() cache_token = None def dispatch(cls): @@ -803,7 +806,7 @@ def wrapper(*args, **kw): registry[object] = func wrapper.register = register wrapper.dispatch = dispatch - wrapper.registry = MappingProxyType(registry) + wrapper.registry = types.MappingProxyType(registry) wrapper._clear_cache = dispatch_cache.clear update_wrapper(wrapper, func) return wrapper diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py index f7a11666133..68e94e7ae17 100644 --- a/Lib/test/test_functools.py +++ b/Lib/test/test_functools.py @@ -2019,6 +2019,8 @@ def _(arg): def test_cache_invalidation(self): from collections import UserDict + import weakref + class TracingDict(UserDict): def __init__(self, *args, **kwargs): super(TracingDict, self).__init__(*args, **kwargs) @@ -2033,90 +2035,89 @@ def __setitem__(self, key, value): self.data[key] = value def clear(self): self.data.clear() - _orig_wkd = functools.WeakKeyDictionary + td = TracingDict() - functools.WeakKeyDictionary = lambda: td - c = collections.abc - @functools.singledispatch - def g(arg): - return "base" - d = {} - l = [] - self.assertEqual(len(td), 0) - self.assertEqual(g(d), "base") - self.assertEqual(len(td), 1) - self.assertEqual(td.get_ops, []) - self.assertEqual(td.set_ops, [dict]) - self.assertEqual(td.data[dict], g.registry[object]) - self.assertEqual(g(l), "base") - self.assertEqual(len(td), 2) - self.assertEqual(td.get_ops, []) - self.assertEqual(td.set_ops, [dict, list]) - self.assertEqual(td.data[dict], g.registry[object]) - self.assertEqual(td.data[list], g.registry[object]) - self.assertEqual(td.data[dict], td.data[list]) - self.assertEqual(g(l), "base") - self.assertEqual(g(d), "base") - self.assertEqual(td.get_ops, [list, dict]) - self.assertEqual(td.set_ops, [dict, list]) - g.register(list, lambda arg: "list") - self.assertEqual(td.get_ops, [list, dict]) - self.assertEqual(len(td), 0) - self.assertEqual(g(d), "base") - self.assertEqual(len(td), 1) - self.assertEqual(td.get_ops, [list, dict]) - self.assertEqual(td.set_ops, [dict, list, dict]) - self.assertEqual(td.data[dict], - functools._find_impl(dict, g.registry)) - self.assertEqual(g(l), "list") - self.assertEqual(len(td), 2) - self.assertEqual(td.get_ops, [list, dict]) - self.assertEqual(td.set_ops, [dict, list, dict, list]) - self.assertEqual(td.data[list], - functools._find_impl(list, g.registry)) - class X: - pass - c.MutableMapping.register(X) # Will not invalidate the cache, - # not using ABCs yet. - self.assertEqual(g(d), "base") - self.assertEqual(g(l), "list") - self.assertEqual(td.get_ops, [list, dict, dict, list]) - self.assertEqual(td.set_ops, [dict, list, dict, list]) - g.register(c.Sized, lambda arg: "sized") - self.assertEqual(len(td), 0) - self.assertEqual(g(d), "sized") - self.assertEqual(len(td), 1) - self.assertEqual(td.get_ops, [list, dict, dict, list]) - self.assertEqual(td.set_ops, [dict, list, dict, list, dict]) - self.assertEqual(g(l), "list") - self.assertEqual(len(td), 2) - self.assertEqual(td.get_ops, [list, dict, dict, list]) - self.assertEqual(td.set_ops, [dict, list, dict, list, dict, list]) - self.assertEqual(g(l), "list") - self.assertEqual(g(d), "sized") - self.assertEqual(td.get_ops, [list, dict, dict, list, list, dict]) - self.assertEqual(td.set_ops, [dict, list, dict, list, dict, list]) - g.dispatch(list) - g.dispatch(dict) - self.assertEqual(td.get_ops, [list, dict, dict, list, list, dict, - list, dict]) - self.assertEqual(td.set_ops, [dict, list, dict, list, dict, list]) - c.MutableSet.register(X) # Will invalidate the cache. - self.assertEqual(len(td), 2) # Stale cache. - self.assertEqual(g(l), "list") - self.assertEqual(len(td), 1) - g.register(c.MutableMapping, lambda arg: "mutablemapping") - self.assertEqual(len(td), 0) - self.assertEqual(g(d), "mutablemapping") - self.assertEqual(len(td), 1) - self.assertEqual(g(l), "list") - self.assertEqual(len(td), 2) - g.register(dict, lambda arg: "dict") - self.assertEqual(g(d), "dict") - self.assertEqual(g(l), "list") - g._clear_cache() - self.assertEqual(len(td), 0) - functools.WeakKeyDictionary = _orig_wkd + with support.swap_attr(weakref, "WeakKeyDictionary", lambda: td): + c = collections.abc + @functools.singledispatch + def g(arg): + return "base" + d = {} + l = [] + self.assertEqual(len(td), 0) + self.assertEqual(g(d), "base") + self.assertEqual(len(td), 1) + self.assertEqual(td.get_ops, []) + self.assertEqual(td.set_ops, [dict]) + self.assertEqual(td.data[dict], g.registry[object]) + self.assertEqual(g(l), "base") + self.assertEqual(len(td), 2) + self.assertEqual(td.get_ops, []) + self.assertEqual(td.set_ops, [dict, list]) + self.assertEqual(td.data[dict], g.registry[object]) + self.assertEqual(td.data[list], g.registry[object]) + self.assertEqual(td.data[dict], td.data[list]) + self.assertEqual(g(l), "base") + self.assertEqual(g(d), "base") + self.assertEqual(td.get_ops, [list, dict]) + self.assertEqual(td.set_ops, [dict, list]) + g.register(list, lambda arg: "list") + self.assertEqual(td.get_ops, [list, dict]) + self.assertEqual(len(td), 0) + self.assertEqual(g(d), "base") + self.assertEqual(len(td), 1) + self.assertEqual(td.get_ops, [list, dict]) + self.assertEqual(td.set_ops, [dict, list, dict]) + self.assertEqual(td.data[dict], + functools._find_impl(dict, g.registry)) + self.assertEqual(g(l), "list") + self.assertEqual(len(td), 2) + self.assertEqual(td.get_ops, [list, dict]) + self.assertEqual(td.set_ops, [dict, list, dict, list]) + self.assertEqual(td.data[list], + functools._find_impl(list, g.registry)) + class X: + pass + c.MutableMapping.register(X) # Will not invalidate the cache, + # not using ABCs yet. + self.assertEqual(g(d), "base") + self.assertEqual(g(l), "list") + self.assertEqual(td.get_ops, [list, dict, dict, list]) + self.assertEqual(td.set_ops, [dict, list, dict, list]) + g.register(c.Sized, lambda arg: "sized") + self.assertEqual(len(td), 0) + self.assertEqual(g(d), "sized") + self.assertEqual(len(td), 1) + self.assertEqual(td.get_ops, [list, dict, dict, list]) + self.assertEqual(td.set_ops, [dict, list, dict, list, dict]) + self.assertEqual(g(l), "list") + self.assertEqual(len(td), 2) + self.assertEqual(td.get_ops, [list, dict, dict, list]) + self.assertEqual(td.set_ops, [dict, list, dict, list, dict, list]) + self.assertEqual(g(l), "list") + self.assertEqual(g(d), "sized") + self.assertEqual(td.get_ops, [list, dict, dict, list, list, dict]) + self.assertEqual(td.set_ops, [dict, list, dict, list, dict, list]) + g.dispatch(list) + g.dispatch(dict) + self.assertEqual(td.get_ops, [list, dict, dict, list, list, dict, + list, dict]) + self.assertEqual(td.set_ops, [dict, list, dict, list, dict, list]) + c.MutableSet.register(X) # Will invalidate the cache. + self.assertEqual(len(td), 2) # Stale cache. + self.assertEqual(g(l), "list") + self.assertEqual(len(td), 1) + g.register(c.MutableMapping, lambda arg: "mutablemapping") + self.assertEqual(len(td), 0) + self.assertEqual(g(d), "mutablemapping") + self.assertEqual(len(td), 1) + self.assertEqual(g(l), "list") + self.assertEqual(len(td), 2) + g.register(dict, lambda arg: "dict") + self.assertEqual(g(d), "dict") + self.assertEqual(g(l), "list") + g._clear_cache() + self.assertEqual(len(td), 0) if __name__ == '__main__': [View Less]

1 0

bpo-30806 netrc.__repr__() is broken for writing to file (GH-2491)
by INADA Naoki Sept. 30, 2017

Sept. 30, 2017

https://github.com/python/cpython/commit/b24cd055ecb3eea9a15405a6ca72dafc73… commit: b24cd055ecb3eea9a15405a6ca72dafc739e6531 branch: master author: James Sexton <TwistedLadder(a)gmail.com> committer: INADA Naoki <methane(a)users.noreply.github.com> date: 2017-09-30T16:10:31+09:00 summary: bpo-30806 netrc.__repr__() is broken for writing to file (GH-2491) netrc file format doesn't support quotes and escapes. See https://linux.die.net/man/5/netrc files: A Misc/NEWS.d/next/… [View More]Library/2017-09-29.bpo-30806.lP5GrH.rst M Lib/netrc.py M Lib/test/test_netrc.py diff --git a/Lib/netrc.py b/Lib/netrc.py index aa8eea3c4dd..baf8f1d99d9 100644 --- a/Lib/netrc.py +++ b/Lib/netrc.py @@ -127,15 +127,15 @@ def __repr__(self): rep = "" for host in self.hosts.keys(): attrs = self.hosts[host] - rep = rep + "machine "+ host + "\n\tlogin " + repr(attrs[0]) + "\n" + rep += f"machine {host}\n\tlogin {attrs[0]}\n" if attrs[1]: - rep = rep + "account " + repr(attrs[1]) - rep = rep + "\tpassword " + repr(attrs[2]) + "\n" + rep += f"\taccount {attrs[1]}\n" + rep += f"\tpassword {attrs[2]}\n" for macro in self.macros.keys(): - rep = rep + "macdef " + macro + "\n" + rep += f"macdef {macro}\n" for line in self.macros[macro]: - rep = rep + line - rep = rep + "\n" + rep += line + rep += "\n" return rep if __name__ == '__main__': diff --git a/Lib/test/test_netrc.py b/Lib/test/test_netrc.py index 60a3ec9565b..ca6f27d03c3 100644 --- a/Lib/test/test_netrc.py +++ b/Lib/test/test_netrc.py @@ -1,7 +1,6 @@ -import netrc, os, unittest, sys, textwrap +import netrc, os, unittest, sys, tempfile, textwrap from test import support -temp_filename = support.TESTFN class NetrcTestCase(unittest.TestCase): @@ -10,7 +9,8 @@ def make_nrc(self, test_data): mode = 'w' if sys.platform != 'cygwin': mode += 't' - with open(temp_filename, mode) as fp: + temp_fd, temp_filename = tempfile.mkstemp() + with os.fdopen(temp_fd, mode=mode) as fp: fp.write(test_data) self.addCleanup(os.unlink, temp_filename) return netrc.netrc(temp_filename) @@ -24,6 +24,9 @@ def test_default(self): ('log1', 'acct1', 'pass1')) self.assertEqual(nrc.hosts['default'], ('log2', None, 'pass2')) + nrc2 = self.make_nrc(nrc.__repr__()) + self.assertEqual(nrc.hosts, nrc2.hosts) + def test_macros(self): nrc = self.make_nrc("""\ macdef macro1 diff --git a/Misc/NEWS.d/next/Library/2017-09-29.bpo-30806.lP5GrH.rst b/Misc/NEWS.d/next/Library/2017-09-29.bpo-30806.lP5GrH.rst new file mode 100644 index 00000000000..afad1b2fb26 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-09-29.bpo-30806.lP5GrH.rst @@ -0,0 +1 @@ +Fix the string representation of a netrc object. [View Less]

1 0

[65 flat] Results for Python (master branch) 2017-09-29
by lp_benchmark_robot＠intel.com Sept. 30, 2017

Sept. 30, 2017

Results for project python/master, build date: 2017-09-29 03:03:08-07:00. - commit: 288d1da - previous commit: d780b2d - revision date: 2017-09-28 22:44:27-07:00 - environment: Broadwell-EP - cpu: Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz 2x22 cores, stepping 1, LLC 55 MB - mem: 128 GB - os: Ubuntu 16.04.2 LTS - kernel: 4.4.0-62-generic x86_64 GNU/Linux Baseline results were generated using release v3.6.0, with hash 5c4568a from 2016-12-22 23:38:47+… [View More]00:00. +-----+------------------------+--------+------------+------------+------------+ | | |relative|change since|change since|current rev | | | benchmark|std_dev*| last run | baseline |run with PGO| +-----+------------------------+--------+------------+------------+------------+ | :-| | 2to3| 1.107% | +0.004% | +3.856% | +7.750% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method| 0.275% | +0.077% | +17.649% | +17.627% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_slots| 0.596% | -0.082% | +18.911% | +16.658% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_unknown| 0.449% | +0.189% | +17.522% | +16.792% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_simple| 2.208% | +0.575% | +3.553% | +11.332% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chameleon| 1.169% | +0.392% | +11.861% | +9.241% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chaos| 1.347% | +0.008% | +7.883% | +10.263% | +-----+------------------------+--------+------------+------------+------------+ | :-| | crypto_pyaes| 0.355% | -0.028% | +2.586% | +7.724% | +-----+------------------------+--------+------------+------------+------------+ | :-| | deltablue| 3.954% | -0.253% | +5.756% | +19.459% | +-----+------------------------+--------+------------+------------+------------+ | :-| | django_template| 2.014% | -0.149% | +10.818% | +13.791% | +-----+------------------------+--------+------------+------------+------------+ | :-| | dulwich_log| 1.380% | +0.062% | +4.858% | +6.268% | +-----+------------------------+--------+------------+------------+------------+ | :-| | fannkuch| 0.430% | -0.093% | +7.338% | +4.351% | +-----+------------------------+--------+------------+------------+------------+ | :-| | float| 0.951% | -0.036% | +4.257% | +5.954% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_text| 1.420% | -0.127% | +7.562% | +12.317% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_xml| 1.255% | +0.367% | +7.481% | +10.265% | +-----+------------------------+--------+------------+------------+------------+ | :-| | go| 0.839% | +0.424% | +7.902% | +9.780% | +-----+------------------------+--------+------------+------------+------------+ | :-| | hexiom| 0.977% | +0.039% | +9.505% | +11.278% | +-----+------------------------+--------+------------+------------+------------+ | :-| | html5lib| 3.079% | -0.239% | +8.466% | +7.645% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_dumps| 1.339% | +0.390% | +5.374% | +8.240% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_loads| 3.328% | -0.062% | +1.808% | +9.679% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_format| 1.438% | -1.293% | +8.798% | +12.821% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_silent| 2.812% | -0.554% | +46.484% | +12.556% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_simple| 1.664% | -1.758% | +8.725% | +15.199% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mako| 0.334% | -0.016% | +19.134% | +10.754% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mdp| 3.274% | -0.561% | +7.330% | +10.359% | +-----+------------------------+--------+------------+------------+------------+ | :-| | meteor_contest| 1.982% | -0.215% | +3.655% | +6.273% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nbody| 0.497% | +0.272% | -0.632% | +2.832% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nqueens| 1.230% | +0.386% | +1.616% | +8.335% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pathlib| 1.536% | -0.875% | +6.657% | +9.528% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle| 1.300% | -0.267% | +1.866% | +19.528% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_dict| 0.161% | -0.022% | +3.706% | +17.166% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_list| 0.613% | -0.068% | +6.608% | +16.531% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_pure_python| 4.967% | -0.285% | +12.047% | +10.161% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pidigits| 0.302% | -0.036% | +0.448% | +9.196% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup| 0.128% | -0.113% | +10.079% | +4.750% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup_no_site| 0.091% | -0.117% | +1.429% | +4.745% | +-----+------------------------+--------+------------+------------+------------+ | :-| | raytrace| 1.312% | +0.018% | +10.448% | +12.666% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_compile| 4.719% | +0.612% | -9.673% | +8.943% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_dna| 1.035% | -0.222% | -2.250% | +12.842% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_effbot| 1.972% | +1.187% | -4.171% | +8.036% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_v8| 2.498% | -0.727% | +7.306% | +8.714% | +-----+------------------------+--------+------------+------------+------------+ | :-| | richards| 2.097% | -0.369% | +7.369% | +16.845% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_fft| 0.476% | -0.034% | +2.223% | +1.572% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_lu| 1.505% | -0.185% | +26.911% | +7.308% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_monte_carlo| 2.593% | -0.674% | +4.812% | +5.702% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sor| 0.962% | -0.190% | +15.406% | +7.774% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sparse_mat_mult| 2.229% | -0.141% | +4.225% | -1.438% | +-----+------------------------+--------+------------+------------+------------+ | :-| | spectral_norm| 0.391% | +0.141% | +6.494% | +0.383% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_declarative| 1.009% | +0.302% | +6.536% | +6.704% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_imperative| 2.981% | +0.486% | +6.068% | +5.717% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlite_synth| 3.693% | -0.402% | +20.585% | +6.929% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_expand| 2.507% | +0.051% | +11.480% | +8.795% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_integrate| 1.551% | +0.126% | +10.522% | +6.376% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_str| 4.066% | -0.075% | +11.687% | +8.816% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_sum| 5.540% | +0.366% | +11.262% | +8.591% | +-----+------------------------+--------+------------+------------+------------+ | :-| | telco| 4.552% | -1.141% | +22.940% | +10.521% | +-----+------------------------+--------+------------+------------+------------+ | :-| | tornado_http| 1.066% | -0.030% | +6.553% | +6.115% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpack_sequence| 0.975% | +1.774% | +2.222% | -1.120% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle| 9.442% | -2.653% | +6.645% | +21.660% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_list| 1.298% | +0.126% | -1.862% | +20.989% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_pure_python| 2.402% | +0.493% | +8.056% | +6.916% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_generate| 0.886% | +0.499% | +7.003% | +7.399% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_iterparse| 2.766% | -0.430% | +1.120% | +7.117% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_parse| 4.732% | -1.182% | -11.153% | +14.180% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_process| 1.184% | +0.414% | +6.936% | +8.387% | +-----+------------------------+--------+------------+------------+------------+ * Relative Standard Deviation (Standard Deviation/Average) If this is not displayed properly please visit our results page here: http://languagesperformance.intel.com/65-flat-results-for-python-master-bra… Our lab does a nightly source pull and build of the Python project and measures performance changes against the previous stable version and the previous nightly measurement. This is provided as a service to the community so that quality issues with current hardware can be identified quickly. Intel technologies' features and benefits depend on system configuration and may require enabled hardware, software or service activation. Performance varies depending on system configuration. [View Less]

1 0

bpo-31574: importlib dtrace (#3749)
by Łukasz Langa Sept. 29, 2017

Sept. 29, 2017

https://github.com/python/cpython/commit/3d2b407da048b14ba6e5eb6079722a785d… commit: 3d2b407da048b14ba6e5eb6079722a785d210590 branch: master author: Christian Heimes <christian(a)python.org> committer: Łukasz Langa <lukasz(a)langa.pl> date: 2017-09-29T15:53:19-07:00 summary: bpo-31574: importlib dtrace (#3749) Importlib was instrumented with two dtrace probes to profile import timing. Signed-off-by: Christian Heimes <christian(a)python.org> files: A Misc/NEWS.d/next/Core … [View More]and Builtins/2017-09-25-12-35-48.bpo-31574.5yX5r5.rst M Doc/howto/instrumentation.rst M Include/pydtrace.d M Include/pydtrace.h M Python/import.c diff --git a/Doc/howto/instrumentation.rst b/Doc/howto/instrumentation.rst index 7fca9aac7b3..2ac939c5307 100644 --- a/Doc/howto/instrumentation.rst +++ b/Doc/howto/instrumentation.rst @@ -312,6 +312,17 @@ Available static markers Fires when the Python interpreter finishes a garbage collection cycle. ``arg0`` is the number of collected objects. +.. c:function:: import__find__load__start(str modulename) + + Fires before :mod:`importlib` attempts to find and load the module. + ``arg0`` is the module name. + +.. c:function:: import__find__load__done(str modulename, int found) + + Fires after :mod:`importlib`'s find_and_load function is called. + ``arg0`` is the module name, ``arg1`` indicates if module was + successfully loaded. + SystemTap Tapsets ----------------- diff --git a/Include/pydtrace.d b/Include/pydtrace.d index 883605566d5..a6a5e7ec224 100644 --- a/Include/pydtrace.d +++ b/Include/pydtrace.d @@ -10,6 +10,8 @@ provider python { probe line(const char *, const char *, int); probe gc__start(int); probe gc__done(long); + probe import__find__load__start(const char *); + probe import__find__load__done(const char *, int); }; #pragma D attributes Evolving/Evolving/Common provider python provider diff --git a/Include/pydtrace.h b/Include/pydtrace.h index c43a253d3cc..037961d429c 100644 --- a/Include/pydtrace.h +++ b/Include/pydtrace.h @@ -34,6 +34,8 @@ static inline void PyDTrace_INSTANCE_NEW_START(int arg0) {} static inline void PyDTrace_INSTANCE_NEW_DONE(int arg0) {} static inline void PyDTrace_INSTANCE_DELETE_START(int arg0) {} static inline void PyDTrace_INSTANCE_DELETE_DONE(int arg0) {} +static inline void PyDTrace_IMPORT_FIND_LOAD_START(const char *arg0) {} +static inline void PyDTrace_IMPORT_FIND_LOAD_DONE(const char *arg0, int arg1) {} static inline int PyDTrace_LINE_ENABLED(void) { return 0; } static inline int PyDTrace_FUNCTION_ENTRY_ENABLED(void) { return 0; } @@ -44,6 +46,8 @@ static inline int PyDTrace_INSTANCE_NEW_START_ENABLED(void) { return 0; } static inline int PyDTrace_INSTANCE_NEW_DONE_ENABLED(void) { return 0; } static inline int PyDTrace_INSTANCE_DELETE_START_ENABLED(void) { return 0; } static inline int PyDTrace_INSTANCE_DELETE_DONE_ENABLED(void) { return 0; } +static inline int PyDTrace_IMPORT_FIND_LOAD_START_ENABLED(void) { return 0; } +static inline int PyDTrace_IMPORT_FIND_LOAD_DONE_ENABLED(void) { return 0; } #endif /* !WITH_DTRACE */ diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-25-12-35-48.bpo-31574.5yX5r5.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-25-12-35-48.bpo-31574.5yX5r5.rst new file mode 100644 index 00000000000..e5c8ae28542 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-09-25-12-35-48.bpo-31574.5yX5r5.rst @@ -0,0 +1 @@ +Importlib was instrumented with two dtrace probes to profile import timing. diff --git a/Python/import.c b/Python/import.c index 5e841ca782d..e50ea4d03cc 100644 --- a/Python/import.c +++ b/Python/import.c @@ -12,6 +12,7 @@ #include "frameobject.h" #include "osdefs.h" #include "importdl.h" +#include "pydtrace.h" #ifdef HAVE_FCNTL_H #include <fcntl.h> @@ -1667,9 +1668,18 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals, } else { Py_XDECREF(mod); + + if (PyDTrace_IMPORT_FIND_LOAD_START_ENABLED()) + PyDTrace_IMPORT_FIND_LOAD_START(PyUnicode_AsUTF8(abs_name)); + mod = _PyObject_CallMethodIdObjArgs(interp->importlib, &PyId__find_and_load, abs_name, interp->import_func, NULL); + + if (PyDTrace_IMPORT_FIND_LOAD_DONE_ENABLED()) + PyDTrace_IMPORT_FIND_LOAD_DONE(PyUnicode_AsUTF8(abs_name), + mod != NULL); + if (mod == NULL) { goto error; } [View Less]

1 0

[3.6] bpo-31641: Allow arbitrary iterables in `concurrent.futures.as_completed()` (GH-3830) (#3831)
by Łukasz Langa Sept. 29, 2017

Sept. 29, 2017

https://github.com/python/cpython/commit/9ef28b6ad3d5aff767e3d852499def8b5a… commit: 9ef28b6ad3d5aff767e3d852499def8b5ae5ff5d branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Łukasz Langa <lukasz(a)langa.pl> date: 2017-09-29T15:07:01-07:00 summary: [3.6] bpo-31641: Allow arbitrary iterables in `concurrent.futures.as_completed()` (GH-3830) (#3831) This was possible before. GH-1560 introduced a regression after 3.6.2 got … [View More]

1 0

bpo-31641: Allow arbitrary iterables in `concurrent.futures.as_completed()` (#3830)
by Łukasz Langa Sept. 29, 2017

Sept. 29, 2017

https://github.com/python/cpython/commit/574562c5ddb2f0429aab9af762442e6f9a… commit: 574562c5ddb2f0429aab9af762442e6f9a3f26ab branch: master author: Łukasz Langa <lukasz(a)langa.pl> committer: GitHub <noreply(a)github.com> date: 2017-09-29T14:33:34-07:00 summary: bpo-31641: Allow arbitrary iterables in `concurrent.futures.as_completed()` (#3830) This was possible before. GH-1560 introduced a regression after 3.6.2 got released where only sequences were accepted now. This commit … [View More]

1 0

[3.6] bpo-31285: Remove splitlines identifier from Python/_warnings.c (GH-3803) (#3829)
by Serhiy Storchaka Sept. 29, 2017

Sept. 29, 2017

https://github.com/python/cpython/commit/66c2b9f13ef2197a5212fd58372173124d… commit: 66c2b9f13ef2197a5212fd58372173124df76467 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-09-29T22:26:45+03:00 summary: [3.6] bpo-31285: Remove splitlines identifier from Python/_warnings.c (GH-3803) (#3829) (forgot to remove it in GH-3219) (cherry picked from commit … [View More]

1 0

bpo-31602: Fix an assertion failure in zipimporter.get_source() in case of a bad zlib.decompress() (GH-3784)
by Brett Cannon Sept. 29, 2017

Sept. 29, 2017

https://github.com/python/cpython/commit/01c6a8859ef2ff5545a87cf537573bd342… commit: 01c6a8859ef2ff5545a87cf537573bd342c848bf branch: master author: Oren Milman <orenmn(a)gmail.com> committer: Brett Cannon <brettcannon(a)users.noreply.github.com> date: 2017-09-29T11:34:31-07:00 summary: bpo-31602: Fix an assertion failure in zipimporter.get_source() in case of a bad zlib.decompress() (GH-3784) While a rare potential failure (it requires swapping out zlib.decompress() itself and … [View More]forcing it to return a non-bytes object), this change prevents a potential C-level assertion failure and instead substitutes it with an exception. Thanks to Oren Milman for the patch. files: A Misc/NEWS.d/next/Core and Builtins/2017-09-27-09-30-03.bpo-31602.MtgLCn.rst M Lib/test/test_zipimport.py M Modules/zipimport.c diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py index daa5138751b..4a934ff6cbd 100644 --- a/Lib/test/test_zipimport.py +++ b/Lib/test/test_zipimport.py @@ -17,6 +17,10 @@ import inspect import io from traceback import extract_tb, extract_stack, print_tb +try: + import zlib +except ImportError: + zlib = None test_src = """\ def get_name(): @@ -669,6 +673,19 @@ def testBytesPath(self): class CompressedZipImportTestCase(UncompressedZipImportTestCase): compression = ZIP_DEFLATED + @support.cpython_only + def test_issue31602(self): + # There shouldn't be an assertion failure in zipimporter.get_source() + # in case of a bad zlib.decompress(). + def bad_decompress(*args): + return None + with ZipFile(TEMP_ZIP, 'w') as zip_file: + self.addCleanup(support.unlink, TEMP_ZIP) + zip_file.writestr('bar.py', b'print("hello world")', ZIP_DEFLATED) + zi = zipimport.zipimporter(TEMP_ZIP) + with support.swap_attr(zlib, 'decompress', bad_decompress): + self.assertRaises(TypeError, zi.get_source, 'bar') + class BadFileZipImportTestCase(unittest.TestCase): def assertZipFailure(self, filename): diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-27-09-30-03.bpo-31602.MtgLCn.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-27-09-30-03.bpo-31602.MtgLCn.rst new file mode 100644 index 00000000000..3a6320911e1 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-09-27-09-30-03.bpo-31602.MtgLCn.rst @@ -0,0 +1,2 @@ +Fix an assertion failure in `zipimporter.get_source()` in case of a bad +`zlib.decompress()`. Patch by Oren Milman. diff --git a/Modules/zipimport.c b/Modules/zipimport.c index 141ada5adc5..493e6db394a 100644 --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -1236,6 +1236,14 @@ get_data(PyObject *archive, PyObject *toc_entry) data = PyObject_CallFunction(decompress, "Oi", raw_data, -15); Py_DECREF(decompress); Py_DECREF(raw_data); + if (data != NULL && !PyBytes_Check(data)) { + PyErr_Format(PyExc_TypeError, + "zlib.decompress() must return a bytes object, not " + "%.200s", + Py_TYPE(data)->tp_name); + Py_DECREF(data); + return NULL; + } return data; eof_error: [View Less]

1 0

Tweak formatting of PR message template (#3828)
by Brett Cannon Sept. 29, 2017

Sept. 29, 2017

https://github.com/python/cpython/commit/66033733aa032707b57cf1b0e8d5a1c5e4… commit: 66033733aa032707b57cf1b0e8d5a1c5e4afceb9 branch: master author: Brett Cannon <brettcannon(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2017-09-29T11:16:38-07:00 summary: Tweak formatting of PR message template (#3828) files: M .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 70f4a6ce6bf..… [View More]

1 0