Mailman 3 August 2017 - Python-checkins

bpo-19903: IDLE: Calltips changed to use inspect.signature (#2822)
by Terry Jan Reedy 09 Aug '17

09 Aug '17

https://github.com/python/cpython/commit/3b0f620c1a2a21272a9e2aeca6ca1d1ac1… commit: 3b0f620c1a2a21272a9e2aeca6ca1d1ac10f8162 branch: master author: Louie Lu <git(a)louie.lu> committer: Terry Jan Reedy <tjreedy(a)udel.edu> date: 2017-08-09T20:58:13-04:00 summary: bpo-19903: IDLE: Calltips changed to use inspect.signature (#2822) Idlelib.calltips.get_argspec now uses inspect.signature instead of inspect.getfullargspec, like help() does. This improves the signature in the call tip in a few different cases, including builtins converted to provide a signature. A message is added if the object is not callable, has an invalid signature, or if it has positional-only parameters. Patch by Louie Lu. files: A Misc/NEWS.d/next/IDLE/2017-08-03-14-08-42.bpo-19903.sqE1FS.rst M Lib/idlelib/calltips.py M Lib/idlelib/idle_test/test_calltips.py diff --git a/Lib/idlelib/calltips.py b/Lib/idlelib/calltips.py index a8a3abe6c69..49625eac158 100644 --- a/Lib/idlelib/calltips.py +++ b/Lib/idlelib/calltips.py @@ -123,6 +123,8 @@ def get_entity(expression): _INDENT = ' '*4 # for wrapped signatures _first_param = re.compile(r'(?<=\()\w*\,?\s*') _default_callable_argspec = "See source or doc" +_invalid_method = "invalid method signature" +_argument_positional = "\n['/' marks preceding arguments as positional-only]\n" def get_argspec(ob): @@ -134,25 +136,30 @@ def get_argspec(ob): empty line or _MAX_LINES. For builtins, this typically includes the arguments in addition to the return value. ''' - argspec = "" + argspec = default = "" try: ob_call = ob.__call__ except BaseException: - return argspec - if isinstance(ob, type): - fob = ob.__init__ - elif isinstance(ob_call, types.MethodType): - fob = ob_call - else: - fob = ob - if isinstance(fob, (types.FunctionType, types.MethodType)): - argspec = inspect.formatargspec(*inspect.getfullargspec(fob)) - if (isinstance(ob, (type, types.MethodType)) or - isinstance(ob_call, types.MethodType)): - argspec = _first_param.sub("", argspec) + return default + + fob = ob_call if isinstance(ob_call, types.MethodType) else ob + + try: + argspec = str(inspect.signature(fob)) + except ValueError as err: + msg = str(err) + if msg.startswith(_invalid_method): + return _invalid_method + + if '/' in argspec: + """Using AC's positional argument should add the explain""" + argspec += _argument_positional + if isinstance(fob, type) and argspec == '()': + """fob with no argument, use default callable argspec""" + argspec = _default_callable_argspec lines = (textwrap.wrap(argspec, _MAX_COLS, subsequent_indent=_INDENT) - if len(argspec) > _MAX_COLS else [argspec] if argspec else []) + if len(argspec) > _MAX_COLS else [argspec] if argspec else []) if isinstance(ob_call, types.MethodType): doc = ob_call.__doc__ @@ -171,6 +178,7 @@ def get_argspec(ob): argspec = _default_callable_argspec return argspec + if __name__ == '__main__': from unittest import main main('idlelib.idle_test.test_calltips', verbosity=2) diff --git a/Lib/idlelib/idle_test/test_calltips.py b/Lib/idlelib/idle_test/test_calltips.py index 29b9f06faf8..fa92ece78ee 100644 --- a/Lib/idlelib/idle_test/test_calltips.py +++ b/Lib/idlelib/idle_test/test_calltips.py @@ -46,6 +46,7 @@ def test_builtins(self): # Python class that inherits builtin methods class List(list): "List() doc" + # Simulate builtin with no docstring for default tip test class SB: __call__ = None @@ -53,18 +54,28 @@ def gtest(obj, out): self.assertEqual(signature(obj), out) if List.__doc__ is not None: - gtest(List, List.__doc__) + gtest(List, '(iterable=(), /)' + ct._argument_positional + '\n' + + List.__doc__) gtest(list.__new__, - 'Create and return a new object. See help(type) for accurate signature.') + '(*args, **kwargs)\nCreate and return a new object. See help(type) for accurate signature.') gtest(list.__init__, + '(self, /, *args, **kwargs)' + ct._argument_positional + '\n' + 'Initialize self. See help(type(self)) for accurate signature.') - append_doc = "Append object to the end of the list." - gtest(list.append, append_doc) - gtest([].append, append_doc) - gtest(List.append, append_doc) + append_doc = ct._argument_positional + "\nAppend object to the end of the list." + gtest(list.append, '(self, object, /)' + append_doc) + gtest(List.append, '(self, object, /)' + append_doc) + gtest([].append, '(object, /)' + append_doc) gtest(types.MethodType, "method(function, instance)") gtest(SB(), default_tip) + import re + p = re.compile('') + gtest(re.sub, '''(pattern, repl, string, count=0, flags=0)\nReturn the string obtained by replacing the leftmost +non-overlapping occurrences of the pattern in string by the +replacement repl. repl can be either a string or a callable; +if a string, backslash escapes in it are processed. If it is +a callable, it's passed the match object and must return''') + gtest(p.sub, '''(repl, string, count=0)\nReturn the string obtained by replacing the leftmost non-overlapping occurrences o...''') def test_signature_wrap(self): if textwrap.TextWrapper.__doc__ is not None: @@ -132,12 +143,20 @@ def test_starred_parameter(self): # test that starred first parameter is *not* removed from argspec class C: def m1(*args): pass - def m2(**kwds): pass c = C() - for meth, mtip in ((C.m1, '(*args)'), (c.m1, "(*args)"), - (C.m2, "(**kwds)"), (c.m2, "(**kwds)"),): + for meth, mtip in ((C.m1, '(*args)'), (c.m1, "(*args)"),): self.assertEqual(signature(meth), mtip) + def test_invalid_method_signature(self): + class C: + def m2(**kwargs): pass + class Test: + def __call__(*, a): pass + + mtip = ct._invalid_method + self.assertEqual(signature(C().m2), mtip) + self.assertEqual(signature(Test()), mtip) + def test_non_ascii_name(self): # test that re works to delete a first parameter name that # includes non-ascii chars, such as various forms of A. @@ -156,17 +175,23 @@ def test_attribute_exception(self): class NoCall: def __getattr__(self, name): raise BaseException - class Call(NoCall): + class CallA(NoCall): + def __call__(oui, a, b, c): + pass + class CallB(NoCall): def __call__(self, ci): pass - for meth, mtip in ((NoCall, default_tip), (Call, default_tip), - (NoCall(), ''), (Call(), '(ci)')): + + for meth, mtip in ((NoCall, default_tip), (CallA, default_tip), + (NoCall(), ''), (CallA(), '(a, b, c)'), + (CallB(), '(ci)')): self.assertEqual(signature(meth), mtip) def test_non_callables(self): for obj in (0, 0.0, '0', b'0', [], {}): self.assertEqual(signature(obj), '') + class Get_entityTest(unittest.TestCase): def test_bad_entity(self): self.assertIsNone(ct.get_entity('1/0')) diff --git a/Misc/NEWS.d/next/IDLE/2017-08-03-14-08-42.bpo-19903.sqE1FS.rst b/Misc/NEWS.d/next/IDLE/2017-08-03-14-08-42.bpo-19903.sqE1FS.rst new file mode 100644 index 00000000000..f25fc80c3dd --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2017-08-03-14-08-42.bpo-19903.sqE1FS.rst @@ -0,0 +1,3 @@ +IDLE: Calltips use `inspect.signature` instead of `inspect.getfullargspec`. +This improves calltips for builtins converted to use Argument Clinic. +Patch by Louie Lu.

1 0

[65 flat] Results for Python (master branch) 2017-08-09
by lp_benchmark_robot＠intel.com 09 Aug '17

09 Aug '17

Results for project python/master, build date: 2017-08-09 03:03:42-07:00. - commit: 88eee44 - previous commit: 733d0f6 - revision date: 2017-08-09 10:51:43+02: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+00:00. +-----+------------------------+--------+------------+------------+------------+ | | |relative|change since|change since|current rev | | | benchmark|std_dev*| last run | baseline |run with PGO| +-----+------------------------+--------+------------+------------+------------+ | :-| | 2to3| 1.179% | +0.304% | +4.226% | +7.833% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method| 0.814% | +0.069% | +22.190% | +10.335% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_slots| 2.776% | -0.789% | +23.208% | +10.188% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_unknown| 0.681% | -0.046% | +21.007% | +10.941% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_simple| 3.057% | -0.039% | +2.742% | +16.127% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chameleon| 2.241% | +0.040% | +11.225% | +10.034% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chaos| 1.767% | -0.060% | +5.930% | +11.533% | +-----+------------------------+--------+------------+------------+------------+ | :-| | crypto_pyaes| 0.342% | +0.009% | +4.374% | +5.394% | +-----+------------------------+--------+------------+------------+------------+ | :-| | deltablue| 4.187% | -0.011% | +6.911% | +18.684% | +-----+------------------------+--------+------------+------------+------------+ | :-| | django_template| 2.526% | +0.396% | +9.605% | +12.644% | +-----+------------------------+--------+------------+------------+------------+ | :-| | dulwich_log| 1.361% | -0.231% | +3.966% | +6.856% | +-----+------------------------+--------+------------+------------+------------+ | :-| | fannkuch| 1.231% | -0.163% | +4.765% | +5.990% | +-----+------------------------+--------+------------+------------+------------+ | :-| | float| 0.819% | +0.227% | +3.020% | +6.090% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_text| 1.422% | -0.020% | +8.688% | +12.245% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_xml| 2.489% | +0.510% | +7.158% | +9.955% | +-----+------------------------+--------+------------+------------+------------+ | :-| | go| 0.848% | +0.002% | +6.118% | +11.023% | +-----+------------------------+--------+------------+------------+------------+ | :-| | hexiom| 0.335% | +0.060% | +9.107% | +11.806% | +-----+------------------------+--------+------------+------------+------------+ | :-| | html5lib| 3.811% | +0.134% | +7.551% | +11.112% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_dumps| 1.460% | -0.124% | +4.267% | +10.005% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_loads| 1.144% | +0.503% | +2.942% | +10.947% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_format| 1.655% | +0.126% | +8.419% | +11.939% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_silent| 3.146% | -0.661% | +46.753% | +11.743% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_simple| 1.274% | -0.074% | +9.155% | +13.396% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mako| 0.613% | +0.028% | +18.817% | +11.645% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mdp| 5.798% | -0.114% | +5.739% | +14.363% | +-----+------------------------+--------+------------+------------+------------+ | :-| | meteor_contest| 2.004% | -0.108% | +3.845% | +6.189% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nbody| 1.478% | -0.029% | -2.149% | +3.048% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nqueens| 1.070% | -0.297% | +2.702% | +7.677% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pathlib| 1.315% | -0.555% | +5.129% | +10.416% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle| 2.543% | -0.298% | +1.714% | +23.043% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_dict| 0.437% | -0.041% | +2.516% | +18.405% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_list| 0.957% | -0.191% | +4.713% | +19.288% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_pure_python| 3.669% | +0.697% | +11.916% | +9.672% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pidigits| 0.155% | -0.013% | +0.292% | +10.155% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup| 0.118% | -0.107% | +9.200% | +4.800% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup_no_site| 0.099% | -0.105% | +1.019% | +4.660% | +-----+------------------------+--------+------------+------------+------------+ | :-| | raytrace| 0.812% | +0.200% | +9.552% | +13.384% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_compile| 4.846% | -0.909% | -10.557% | +13.905% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_dna| 0.452% | +0.243% | +1.728% | +8.439% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_effbot| 2.078% | -0.243% | +0.545% | +3.024% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_v8| 1.229% | -0.232% | +11.258% | +3.481% | +-----+------------------------+--------+------------+------------+------------+ | :-| | richards| 1.787% | -0.501% | +7.837% | +14.285% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_fft| 0.520% | +0.088% | +0.731% | +1.813% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_lu| 1.347% | -0.424% | +26.831% | +8.898% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_monte_carlo| 2.869% | -0.265% | +3.142% | +6.873% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sor| 1.435% | -0.291% | +12.933% | +10.112% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sparse_mat_mult| 3.021% | -0.429% | -0.731% | +0.608% | +-----+------------------------+--------+------------+------------+------------+ | :-| | spectral_norm| 0.314% | +0.152% | +5.863% | +1.659% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_declarative| 1.350% | -0.531% | +4.970% | +8.136% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_imperative| 3.232% | -0.594% | +4.808% | +5.314% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlite_synth| 4.731% | +0.448% | +3.111% | +7.274% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_expand| 2.376% | -0.353% | +12.238% | +9.142% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_integrate| 1.337% | -0.019% | +10.546% | +6.852% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_str| 3.728% | +0.786% | +12.115% | +9.844% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_sum| 4.647% | -2.062% | +12.678% | +10.611% | +-----+------------------------+--------+------------+------------+------------+ | :-| | telco| 3.735% | -0.128% | +23.859% | +9.220% | +-----+------------------------+--------+------------+------------+------------+ | :-| | tornado_http| 1.210% | -0.196% | +5.724% | +5.707% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpack_sequence| 1.357% | -0.243% | +0.576% | -0.098% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle| 7.619% | -0.013% | +9.097% | +20.811% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_list| 0.967% | -0.078% | -1.879% | +16.299% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_pure_python| 2.395% | +0.277% | +6.552% | +7.226% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_generate| 1.139% | -0.256% | +5.844% | +6.995% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_iterparse| 1.997% | +0.231% | +2.667% | +5.300% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_parse| 2.634% | +0.028% | -5.479% | +10.135% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_process| 1.614% | +0.013% | +6.527% | +7.756% | +-----+------------------------+--------+------------+------------+------------+ * 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.

1 0

bpo-31160: test_builtin: don't check waitpid() status (#3050)
by Victor Stinner 09 Aug '17

09 Aug '17

https://github.com/python/cpython/commit/3ca9f50f96cfa5c1b7aa56639042531b57… commit: 3ca9f50f96cfa5c1b7aa56639042531b57f07fbb branch: master author: Victor Stinner <victor.stinner(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2017-08-09T23:08:22+02:00 summary: bpo-31160: test_builtin: don't check waitpid() status (#3050) files: M Lib/test/test_builtin.py diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index 219a08abd3f..9d949b74cb8 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -1569,8 +1569,8 @@ def run_child(self, child, terminal_input): % (len(lines), child_output)) os.close(fd) - pid, status = os.waitpid(pid, 0) - self.assertEqual(status, 0) + # Wait until the child process completes + os.waitpid(pid, 0) return lines

1 0

bpo-31160: Fix test_random for zombie process (#3045)
by Victor Stinner 09 Aug '17

09 Aug '17

https://github.com/python/cpython/commit/da5e9301877346942fa4279612750d6a09… commit: da5e9301877346942fa4279612750d6a09e05153 branch: master author: Victor Stinner <victor.stinner(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2017-08-09T17:59:05+02:00 summary: bpo-31160: Fix test_random for zombie process (#3045) TestModule.test_after_fork() now calls os.waitpid() to read the exit status of the child process to avoid creating a zombie process. files: M Lib/test/test_random.py diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py index f657b46b3a8..fbb1cf6696e 100644 --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -907,7 +907,9 @@ def __init__(self, newarg=None): def test_after_fork(self): # Test the global Random instance gets reseeded in child r, w = os.pipe() - if os.fork() == 0: + pid = os.fork() + if pid == 0: + # child process try: val = random.getrandbits(128) with open(w, "w") as f: @@ -915,12 +917,16 @@ def test_after_fork(self): finally: os._exit(0) else: + # parent process os.close(w) val = random.getrandbits(128) with open(r, "r") as f: child_val = eval(f.read()) self.assertNotEqual(val, child_val) + pid, status = os.waitpid(pid, 0) + self.assertEqual(status, 0) + if __name__ == "__main__": unittest.main()

1 0

bpo-31160: regrtest now reaps child processes (#3044)
by Victor Stinner 09 Aug '17

09 Aug '17

https://github.com/python/cpython/commit/e3510d74aacc477c30f42f2b941d69689b… commit: e3510d74aacc477c30f42f2b941d69689bbc478e branch: master author: Victor Stinner <victor.stinner(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2017-08-09T17:44:33+02:00 summary: bpo-31160: regrtest now reaps child processes (#3044) Add a post_test_cleanup() function which currently only calls support.reap_children(). files: M Lib/test/libregrtest/runtest.py diff --git a/Lib/test/libregrtest/runtest.py b/Lib/test/libregrtest/runtest.py index 0210409817b..dbd463435c7 100644 --- a/Lib/test/libregrtest/runtest.py +++ b/Lib/test/libregrtest/runtest.py @@ -146,6 +146,10 @@ def runtest(ns, test): runtest.stringio = None +def post_test_cleanup(): + support.reap_children() + + def runtest_inner(ns, test, display_failure=True): support.unload(test) @@ -173,6 +177,7 @@ def test_runner(): if ns.huntrleaks: refleak = dash_R(the_module, test, test_runner, ns.huntrleaks) test_time = time.time() - start_time + post_test_cleanup() except support.ResourceDenied as msg: if not ns.quiet and not ns.pgo: print(test, "skipped --", msg, flush=True)

1 0

bpo-31160: Fix test_builtin for zombie process (#3043)
by Victor Stinner 09 Aug '17

09 Aug '17

https://github.com/python/cpython/commit/4baca1b0f7325032598cd38e7ceffc79b6… commit: 4baca1b0f7325032598cd38e7ceffc79b616d255 branch: master author: Victor Stinner <victor.stinner(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2017-08-09T17:44:19+02:00 summary: bpo-31160: Fix test_builtin for zombie process (#3043) PtyTests.run_child() now calls os.waitpid() to read the exit status of the child process to avoid creating zombie process and leaking processes in the background. files: M Lib/test/test_builtin.py diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index a83d20f4343..219a08abd3f 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -1568,6 +1568,10 @@ def run_child(self, child, terminal_input): self.fail("got %d lines in pipe but expected 2, child output was:\n%s" % (len(lines), child_output)) os.close(fd) + + pid, status = os.waitpid(pid, 0) + self.assertEqual(status, 0) + return lines def check_input_tty(self, prompt, terminal_input, stdio_encoding=None):

1 0

bpo-31159: fix language switch regex on unknown yet built languages. (#3039)
by Victor Stinner 09 Aug '17

09 Aug '17

https://github.com/python/cpython/commit/122081deef86174beee965be1207fa46ea… commit: 122081deef86174beee965be1207fa46ea23533d branch: master author: Julien Palard <julien(a)palard.fr> committer: Victor Stinner <victor.stinner(a)gmail.com> date: 2017-08-09T17:01:15+02:00 summary: bpo-31159: fix language switch regex on unknown yet built languages. (#3039) This fix a regex issue (a missing non-matching group around an 'or' list) and the specific possible case where a translation is built but not yet in known by the picker, but not explicitly listing possible languages in the regex. files: M Doc/tools/static/switchers.js diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js index de9e7b76f9e..ff23202a5e0 100644 --- a/Doc/tools/static/switchers.js +++ b/Doc/tools/static/switchers.js @@ -110,7 +110,7 @@ // Returns the path segment of the language as a string, like 'fr/' // or '' if not found. function language_segment_from_url(url) { - var language_regexp = '\.org/(' + Object.keys(all_languages).join('|') + '/)'; + var language_regexp = '\.org/([a-z]{2}(?:-[a-z]{2})?/)'; var match = url.match(language_regexp); if (match !== null) return match[1]; @@ -120,7 +120,7 @@ // Returns the path segment of the version as a string, like '3.6/' // or '' if not found. function version_segment_in_url(url) { - var language_segment = '(?:(?:' + Object.keys(all_languages).join('|') + ')/)'; + var language_segment = '(?:[a-z]{2}(?:-[a-z]{2})?/)'; var version_segment = '(?:(?:' + version_regexs.join('|') + ')/)'; var version_regexp = '\\.org/' + language_segment + '?(' + version_segment + ')'; var match = url.match(version_regexp);

1 0

[3.6] bpo-31150: Wait for child process in test_forkinthread to avoid thread reaped warnings (#3041)
by Victor Stinner 09 Aug '17

09 Aug '17

https://github.com/python/cpython/commit/4388b4257abf3b9c348cf4db8c6144dcc0… commit: 4388b4257abf3b9c348cf4db8c6144dcc07f3e98 branch: 3.6 author: Ammar Askar <ammar_askar(a)hotmail.com> committer: Victor Stinner <victor.stinner(a)gmail.com> date: 2017-08-09T16:59:21+02:00 summary: [3.6] bpo-31150: Wait for child process in test_forkinthread to avoid thread reaped warnings (#3041) files: M Lib/test/test_thread.py diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py index 3909b75ccd4..2e2655aee7f 100644 --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -239,6 +239,8 @@ def thread1(): os._exit(0) else: # parent os.close(self.write_fd) + pid, status = os.waitpid(pid, 0) + self.assertEqual(status, 0) thread.start_new_thread(thread1, ()) self.assertEqual(os.read(self.read_fd, 2), b"OK",

1 0

[2.7] bpo-31150: Wait for child process in test_forkinthread to avoid thread reaped warnings (#3042)
by Victor Stinner 09 Aug '17

09 Aug '17

https://github.com/python/cpython/commit/425680bbd2dc14ef8dc5d1928f44fc7cc4… commit: 425680bbd2dc14ef8dc5d1928f44fc7cc43018c4 branch: 2.7 author: Ammar Askar <ammar_askar(a)hotmail.com> committer: Victor Stinner <victor.stinner(a)gmail.com> date: 2017-08-09T16:54:53+02:00 summary: [2.7] bpo-31150: Wait for child process in test_forkinthread to avoid thread reaped warnings (#3042) files: M Lib/test/test_thread.py diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py index 2f9abe078fc..c8caa5ddff0 100644 --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -245,6 +245,8 @@ def thread1(): os._exit(0) else: # parent os.close(self.write_fd) + pid, status = os.waitpid(pid, 0) + self.assertEqual(status, 0) thread.start_new_thread(thread1, ()) self.assertEqual(os.read(self.read_fd, 2), "OK",

1 0

bpo-31072: Add filter to zipapp (#3021)
by Paul Moore 09 Aug '17

09 Aug '17

https://github.com/python/cpython/commit/b811d664defed085d16951088afb579fb6… commit: b811d664defed085d16951088afb579fb649c58d branch: master author: Jeffrey Rackauckas <jeffreyrack(a)gmail.com> committer: Paul Moore <p.f.moore(a)gmail.com> date: 2017-08-09T14:37:17+01:00 summary: bpo-31072: Add filter to zipapp (#3021) bpo-31072: Add a filter argument to zipapp.create_archive (GH-3021) * Add an include_file argument to allow callers to decide which files to include * Document the new argument files: A Misc/NEWS.d/next/Library/2017-08-09-13-45-23.bpo-31072.NLXDPV.rst M Doc/library/zipapp.rst M Lib/test/test_zipapp.py M Lib/zipapp.py M Misc/ACKS diff --git a/Doc/library/zipapp.rst b/Doc/library/zipapp.rst index 71753cb9a0d..993c2ccc398 100644 --- a/Doc/library/zipapp.rst +++ b/Doc/library/zipapp.rst @@ -98,7 +98,8 @@ Python API The module defines two convenience functions: -.. function:: create_archive(source, target=None, interpreter=None, main=None) +.. function:: create_archive(source, target=None, interpreter=None, main=None, + include_file=None) Create an application archive from *source*. The source can be any of the following: @@ -143,6 +144,10 @@ The module defines two convenience functions: contain a ``__main__.py`` file, as otherwise the resulting archive would not be executable. + The *include_file* argument specifies a callback function that is passed the + relative path to the file in order to determine which files to store when + being called against a directory. + If a file object is specified for *source* or *target*, it is the caller's responsibility to close it after calling create_archive. diff --git a/Lib/test/test_zipapp.py b/Lib/test/test_zipapp.py index d8d44375bdd..47eed5f4a6c 100644 --- a/Lib/test/test_zipapp.py +++ b/Lib/test/test_zipapp.py @@ -53,6 +53,23 @@ def test_create_archive_with_subdirs(self): self.assertIn('foo/', z.namelist()) self.assertIn('bar/', z.namelist()) + def test_create_archive_with_include_file(self): + # Test packing a directory and using include_file to specify which files to include. + def skip_pyc_files(file): + return '.pyc' not in str(file) + source = self.tmpdir / 'source' + source.mkdir() + (source / '__main__.py').touch() + (source / 'test.py').touch() + (source / 'test.pyc').touch() + target = self.tmpdir / 'source.pyz' + + zipapp.create_archive(source, target, include_file=skip_pyc_files) + with zipfile.ZipFile(target, 'r') as z: + self.assertIn('__main__.py', z.namelist()) + self.assertIn('test.py', z.namelist()) + self.assertNotIn('test.pyc', z.namelist()) + def test_create_archive_default_target(self): # Test packing a directory to the default name. source = self.tmpdir / 'source' diff --git a/Lib/zipapp.py b/Lib/zipapp.py index c23b788d1c9..bf15b6806dd 100644 --- a/Lib/zipapp.py +++ b/Lib/zipapp.py @@ -73,7 +73,8 @@ def _copy_archive(archive, new_archive, interpreter=None): os.chmod(new_archive, os.stat(new_archive).st_mode | stat.S_IEXEC) -def create_archive(source, target=None, interpreter=None, main=None): +def create_archive(source, target=None, interpreter=None, main=None, + include_file=None): """Create an application archive from SOURCE. The SOURCE can be the name of a directory, or a filename or a file-like @@ -135,7 +136,8 @@ def create_archive(source, target=None, interpreter=None, main=None): with zipfile.ZipFile(fd, 'w') as z: for child in source.rglob('*'): arcname = child.relative_to(source).as_posix() - z.write(child, arcname) + if include_file is None or include_file(pathlib.Path(arcname)): + z.write(child, arcname) if main_py: z.writestr('__main__.py', main_py.encode('utf-8')) diff --git a/Misc/ACKS b/Misc/ACKS index e340392d8e1..d6088b3f5d9 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1253,6 +1253,7 @@ Brian Quinlan Anders Qvist Thomas Rachel Ram Rachum +Jeffrey Rackauckas Jérôme Radix Burton Radons Abhilash Raj diff --git a/Misc/NEWS.d/next/Library/2017-08-09-13-45-23.bpo-31072.NLXDPV.rst b/Misc/NEWS.d/next/Library/2017-08-09-13-45-23.bpo-31072.NLXDPV.rst new file mode 100644 index 00000000000..8c96201210f --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-08-09-13-45-23.bpo-31072.NLXDPV.rst @@ -0,0 +1 @@ +Add an ``include_file`` parameter to ``zipapp.create_archive()``

1 0