Mailman 3 August 2017 - Python-checkins

Daily reference leaks (4243df51fe43): sum=4
by solipsis＠pitrou.net Aug. 31, 2017

Aug. 31, 2017

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

1 0

[3.6] Fix the indentation in Extending Python code example (GH-3244) (GH-3250)
by Mariatta Aug. 31, 2017

Aug. 31, 2017

https://github.com/python/cpython/commit/b5db7bb9da1120912a1795fbc6106d0eba… commit: b5db7bb9da1120912a1795fbc6106d0eba5a01c7 branch: 3.6 author: Mariatta <Mariatta(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2017-08-30T23:11:02-07:00 summary: [3.6] Fix the indentation in Extending Python code example (GH-3244) (GH-3250) Code was indented with three spaces. Fixed using four spaces. (cherry picked from commit d9a2b99ac45b5529d2a6227b0d529397be831dab) files: M Doc/extending/extending.rst diff --git a/Doc/extending/extending.rst b/Doc/extending/extending.rst index 4ac820a432b..93584627a29 100644 --- a/Doc/extending/extending.rst +++ b/Doc/extending/extending.rst @@ -333,12 +333,12 @@ function. The method table must be referenced in the module definition structure:: static struct PyModuleDef spammodule = { - PyModuleDef_HEAD_INIT, - "spam", /* name of module */ - spam_doc, /* module documentation, may be NULL */ - -1, /* size of per-interpreter state of the module, - or -1 if the module keeps state in global variables. */ - SpamMethods + PyModuleDef_HEAD_INIT, + "spam", /* name of module */ + spam_doc, /* module documentation, may be NULL */ + -1, /* size of per-interpreter state of the module, + or -1 if the module keeps state in global variables. */ + SpamMethods }; This structure, in turn, must be passed to the interpreter in the module's

1 0

[1 down, 64 flat] Results for Python (master branch) 2017-08-30
by lp_benchmark_robot＠intel.com Aug. 31, 2017

Aug. 31, 2017

Results for project python/master, build date: 2017-08-30 03:04:29-07:00. - commit: c67bae0 - previous commit: ba7d736 - revision date: 2017-08-30 11:01:08+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.048% | -1.346% | +3.061% | +9.359% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method| 1.202% | +0.039% | +23.012% | +7.570% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_slots| 1.327% | +0.307% | +23.910% | +7.272% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_unknown| 0.674% | -0.149% | +21.901% | +4.726% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_simple| 2.585% | -0.213% | +2.956% | +15.939% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chameleon| 1.813% | +0.047% | +12.125% | +10.327% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chaos| 0.886% | +0.384% | +6.533% | +10.625% | +-----+------------------------+--------+------------+------------+------------+ | :-| | crypto_pyaes| 0.545% | -0.515% | +2.784% | +6.513% | +-----+------------------------+--------+------------+------------+------------+ | :-| | deltablue| 4.388% | -0.579% | +5.565% | +20.314% | +-----+------------------------+--------+------------+------------+------------+ | :-| | django_template| 6.340% | -0.493% | +5.978% | +16.912% | +-----+------------------------+--------+------------+------------+------------+ | :-| | dulwich_log| 1.356% | -0.771% | +3.828% | +6.606% | +-----+------------------------+--------+------------+------------+------------+ | :-| | fannkuch| 0.603% | +0.318% | +5.835% | +4.004% | +-----+------------------------+--------+------------+------------+------------+ | :-| | float| 0.714% | +0.009% | +3.601% | +5.402% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_text| 0.934% | +0.056% | +8.142% | +11.716% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_xml| 1.989% | -1.184% | +5.805% | +11.112% | +-----+------------------------+--------+------------+------------+------------+ | :-| | go| 0.729% | +0.088% | +6.432% | +11.533% | +-----+------------------------+--------+------------+------------+------------+ | :-| | hexiom| 1.285% | +0.074% | +9.335% | +11.494% | +-----+------------------------+--------+------------+------------+------------+ | :-| | html5lib| 3.444% | -1.106% | +5.674% | +12.485% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_dumps| 2.675% | +0.171% | +4.330% | +8.050% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_loads| 2.109% | -0.635% | +1.164% | +11.747% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_format| 1.477% | -2.210% | +5.287% | +14.598% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_silent| 2.608% | +0.005% | +46.688% | +11.464% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_simple| 1.929% | -1.229% | +6.797% | +14.644% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mako| 0.417% | -0.376% | +18.847% | +10.590% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mdp| 4.484% | +0.860% | +7.087% | +12.092% | +-----+------------------------+--------+------------+------------+------------+ | :-| | meteor_contest| 1.940% | -0.342% | +4.089% | +5.592% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nbody| 0.713% | -1.017% | -4.983% | +9.026% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nqueens| 0.712% | -0.256% | +2.673% | +6.380% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pathlib| 1.380% | +1.127% | +3.044% | +11.652% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle| 2.559% | -0.819% | -0.516% | +24.265% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_dict| 0.624% | -0.070% | +2.504% | +20.513% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_list| 0.839% | -0.133% | +6.458% | +18.623% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_pure_python| 3.336% | -0.506% | +11.978% | +8.962% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pidigits| 0.145% | +0.001% | +0.430% | +9.609% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup| 0.146% | -0.200% | +8.577% | +5.512% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup_no_site| 0.104% | -0.251% | +0.652% | +5.080% | +-----+------------------------+--------+------------+------------+------------+ | :-| | raytrace| 1.955% | -0.310% | +8.469% | +12.826% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_compile| 5.273% | -0.248% | -9.178% | +11.707% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_dna| 1.406% | -0.423% | +1.852% | +7.680% | +-----+------------------------+--------+------------+------------+------------+ | :-( | regex_effbot|15.048% | -24.514% | -23.891% | +18.880% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_v8| 1.280% | -0.790% | +11.348% | +5.416% | +-----+------------------------+--------+------------+------------+------------+ | :-| | richards| 1.852% | +0.810% | +7.457% | +14.507% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_fft| 0.394% | -0.111% | +1.217% | +2.188% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_lu| 1.214% | +0.946% | +26.680% | +9.452% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_monte_carlo| 2.329% | +0.287% | +3.118% | +7.866% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sor| 1.680% | -0.192% | +14.227% | +9.717% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sparse_mat_mult| 1.225% | -0.194% | +0.760% | -3.308% | +-----+------------------------+--------+------------+------------+------------+ | :-| | spectral_norm| 0.731% | -0.445% | +5.341% | +3.281% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_declarative| 1.453% | -0.009% | +4.704% | +9.015% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_imperative| 3.026% | +0.237% | +5.225% | +5.929% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlite_synth| 3.926% | +3.372% | +1.214% | +9.586% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_expand| 1.905% | -0.100% | +12.125% | +9.478% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_integrate| 1.738% | -0.419% | +9.358% | +8.118% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_str| 4.556% | -0.842% | +11.301% | +10.473% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_sum| 4.225% | +0.195% | +13.510% | +10.671% | +-----+------------------------+--------+------------+------------+------------+ | :-| | telco| 5.261% | +0.587% | +22.151% | +10.186% | +-----+------------------------+--------+------------+------------+------------+ | :-| | tornado_http| 1.191% | -0.115% | +5.443% | +7.402% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpack_sequence| 0.900% | +0.136% | +2.709% | +0.089% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle| 8.464% | +1.609% | +7.768% | +20.435% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_list| 0.839% | +0.471% | -2.583% | +15.756% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_pure_python| 4.024% | -1.671% | +5.465% | +8.192% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_generate| 0.952% | +0.400% | +6.519% | +7.249% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_iterparse| 2.295% | -0.905% | +2.673% | +6.584% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_parse| 2.827% | -0.097% | -5.034% | +10.794% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_process| 1.297% | +0.213% | +7.421% | +7.603% | +-----+------------------------+--------+------------+------------+------------+ * Relative Standard Deviation (Standard Deviation/Average) If this is not displayed properly please visit our results page here: http://languagesperformance.intel.com/1-down-64-flat-results-for-python-mas… 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-30096: Use ABC in abc reference examples (#1220)
by Éric Araujo Aug. 30, 2017

Aug. 30, 2017

https://github.com/python/cpython/commit/122e88a8354e3f75aeaf6211232dac88ac… commit: 122e88a8354e3f75aeaf6211232dac88ac296d54 branch: master author: Eric Appelt <eric.appelt(a)gmail.com> committer: Éric Araujo <merwok(a)users.noreply.github.com> date: 2017-08-30T18:47:52-04:00 summary: bpo-30096: Use ABC in abc reference examples (#1220) Use base class rather than metaclass in examples. files: M Doc/library/abc.rst diff --git a/Doc/library/abc.rst b/Doc/library/abc.rst index 966003bd45a..6001db32df4 100644 --- a/Doc/library/abc.rst +++ b/Doc/library/abc.rst @@ -24,7 +24,33 @@ a class or instance provides a particular interface, for example, is it hashable or a mapping. -This module provides the following classes: +This module provides the metaclass :class:`ABCMeta` for defining ABCs and +a helper class :class:`ABC` to alternatively define ABCs through inheritance: + +.. class:: ABC + + A helper class that has :class:`ABCMeta` as its metaclass. With this class, + an abstract base class can be created by simply deriving from :class:`ABC` + avoiding sometimes confusing metaclass usage, for example:: + + from abc import ABC + + class MyABC(ABC): + pass + + Note that the type of :class:`ABC` is still :class:`ABCMeta`, therefore + inheriting from :class:`ABC` requires the usual precautions regarding + metaclass usage, as multiple inheritance may lead to metaclass conflicts. + One may also define an abstract base class by passing the metaclass + keyword and using :class:`ABCMeta` directly, for example:: + + from abc import ABCMeta + + class MyABC(metaclass=ABCMeta): + pass + + .. versionadded:: 3.4 + .. class:: ABCMeta @@ -46,15 +72,15 @@ This module provides the following classes: Register *subclass* as a "virtual subclass" of this ABC. For example:: - from abc import ABCMeta + from abc import ABC - class MyABC(metaclass=ABCMeta): - pass + class MyABC(ABC): + pass - MyABC.register(tuple) + MyABC.register(tuple) - assert issubclass(tuple, MyABC) - assert isinstance((), MyABC) + assert issubclass(tuple, MyABC) + assert isinstance((), MyABC) .. versionchanged:: 3.3 Returns the registered subclass, to allow usage as a class decorator. @@ -95,7 +121,7 @@ This module provides the following classes: def get_iterator(self): return iter(self) - class MyIterable(metaclass=ABCMeta): + class MyIterable(ABC): @abstractmethod def __iter__(self): @@ -132,17 +158,6 @@ This module provides the following classes: available as a method of ``Foo``, so it is provided separately. -.. class:: ABC - - A helper class that has :class:`ABCMeta` as its metaclass. With this class, - an abstract base class can be created by simply deriving from :class:`ABC`, - avoiding sometimes confusing metaclass usage. - - Note that the type of :class:`ABC` is still :class:`ABCMeta`, therefore - inheriting from :class:`ABC` requires the usual precautions regarding metaclass - usage, as multiple inheritance may lead to metaclass conflicts. - - .. versionadded:: 3.4 The :mod:`abc` module also provides the following decorators: @@ -168,7 +183,7 @@ The :mod:`abc` module also provides the following decorators: descriptors, it should be applied as the innermost decorator, as shown in the following usage examples:: - class C(metaclass=ABCMeta): + class C(ABC): @abstractmethod def my_abstract_method(self, ...): ... @@ -230,7 +245,7 @@ The :mod:`abc` module also provides the following decorators: is now correctly identified as abstract when applied to an abstract method:: - class C(metaclass=ABCMeta): + class C(ABC): @classmethod @abstractmethod def my_abstract_classmethod(cls, ...): @@ -251,7 +266,7 @@ The :mod:`abc` module also provides the following decorators: is now correctly identified as abstract when applied to an abstract method:: - class C(metaclass=ABCMeta): + class C(ABC): @staticmethod @abstractmethod def my_abstract_staticmethod(...): @@ -278,7 +293,7 @@ The :mod:`abc` module also provides the following decorators: is now correctly identified as abstract when applied to an abstract method:: - class C(metaclass=ABCMeta): + class C(ABC): @property @abstractmethod def my_abstract_property(self): @@ -288,7 +303,7 @@ The :mod:`abc` module also provides the following decorators: read-write abstract property by appropriately marking one or more of the underlying methods as abstract:: - class C(metaclass=ABCMeta): + class C(ABC): @property def x(self): ...

1 0

bpo-30737: Update DevGuide links to new URL (GH-3228)
by Mariatta Aug. 30, 2017

Aug. 30, 2017

https://github.com/python/cpython/commit/384899dfaeb83db38a6d3846d3cbc2f58a… commit: 384899dfaeb83db38a6d3846d3cbc2f58a6605cd branch: master author: Lisa Hewus Fresh <bugzPDX(a)users.noreply.github.com> committer: Mariatta <Mariatta(a)users.noreply.github.com> date: 2017-08-30T09:37:43-07:00 summary: bpo-30737: Update DevGuide links to new URL (GH-3228) Update old devguide links from https://docs.python.org/devguide to https://devguide.python.org files: M Doc/README.rst M Doc/bugs.rst M Doc/faq/general.rst M Doc/howto/curses.rst M Doc/using/unix.rst M Doc/using/windows.rst M Doc/whatsnew/2.6.rst M Doc/whatsnew/3.4.rst M Grammar/Grammar M Mac/README M Misc/ACKS M Misc/Porting M Misc/python.man M README.rst diff --git a/Doc/README.rst b/Doc/README.rst index dcd3d6e80ff..9156e7df672 100644 --- a/Doc/README.rst +++ b/Doc/README.rst @@ -7,7 +7,7 @@ available <https://docs.python.org/dev/download.html>`_. Documentation on authoring Python documentation, including information about both style and markup, is available in the "`Documenting Python -<https://docs.python.org/devguide/documenting.html>`_" chapter of the +<https://devguide.python.org/documenting/>`_" chapter of the developers guide. @@ -109,10 +109,10 @@ see the make targets above). Contributing ============ -Bugs in the content should be reported to the +Bugs in the content should be reported to the `Python bug tracker <https://bugs.python.org>`_. -Bugs in the toolset should be reported in the +Bugs in the toolset should be reported in the `Sphinx bug tracker <https://github.com/sphinx-doc/sphinx/issues>`_. You can also send a mail to the Python Documentation Team at docs(a)python.org, diff --git a/Doc/bugs.rst b/Doc/bugs.rst index 1b0a5a9a937..bc1d10f379c 100644 --- a/Doc/bugs.rst +++ b/Doc/bugs.rst @@ -88,5 +88,5 @@ the `core-mentorship mailing list`_ is a friendly place to get answers to any and all questions pertaining to the process of fixing issues in Python. .. _Documentation bugs: https://bugs.python.org/issue?@filter=status&@filter=components&components=… -.. _Python Developer's Guide: https://docs.python.org/devguide/ +.. _Python Developer's Guide: https://devguide.python.org/ .. _core-mentorship mailing list: https://mail.python.org/mailman/listinfo/core-mentorship/ diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 8f6a907a8a2..d4a97fd81af 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -167,7 +167,7 @@ several useful pieces of freely distributable software. The source will compile and run out of the box on most UNIX platforms. Consult the `Getting Started section of the Python Developer's Guide -<https://docs.python.org/devguide/setup.html>`__ for more +<https://devguide.python.org/setup/>`__ for more information on getting the source code and compiling it. @@ -223,7 +223,7 @@ newsgroups and on the Python home page at https://www.python.org/; an RSS feed o news is available. You can also access the development version of Python through Git. See -`The Python Developer's Guide <https://docs.python.org/devguide/>`_ for details. +`The Python Developer's Guide <https://devguide.python.org/>`_ for details. How do I submit bug reports and patches for Python? @@ -239,7 +239,7 @@ report bugs to Python, you can obtain your Roundup password through Roundup's `password reset procedure <https://bugs.python.org/user?@template=forgotten>`_. For more information on how Python is developed, consult `the Python Developer's -Guide <https://docs.python.org/devguide/>`_. +Guide <https://devguide.python.org/>`_. Are there any published articles about Python that I can reference? diff --git a/Doc/howto/curses.rst b/Doc/howto/curses.rst index cbff84160ff..1d3bfb87dc0 100644 --- a/Doc/howto/curses.rst +++ b/Doc/howto/curses.rst @@ -538,7 +538,7 @@ the Python interface. Often this isn't because they're difficult to implement, but because no one has needed them yet. Also, Python doesn't yet support the menu library associated with ncurses. Patches adding support for these would be welcome; see -`the Python Developer's Guide <https://docs.python.org/devguide/>`_ to +`the Python Developer's Guide <https://devguide.python.org/>`_ to learn more about submitting patches to Python. * `Writing Programs with NCURSES <http://invisible-island.net/ncurses/ncurses-intro.html>`_: diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst index 604688ce94c..8b96ebea396 100644 --- a/Doc/using/unix.rst +++ b/Doc/using/unix.rst @@ -67,7 +67,7 @@ Building Python If you want to compile CPython yourself, first thing you should do is get the `source <https://www.python.org/downloads/source/>`_. You can download either the latest release's source or just grab a fresh `clone -<https://docs.python.org/devguide/setup.html#getting-the-source-code>`_. (If you want +<https://devguide.python.org/setup/#getting-the-source-code>`_. (If you want to contribute patches, you will need a clone.) The build process consists in the usual :: @@ -140,4 +140,4 @@ Many editors and IDEs provide syntax highlighting, debugging tools, and PEP-8 ch Please go to `Python Editors <https://wiki.python.org/moin/PythonEditors>`_ and `Integrated Development Environments <https://wiki.python.org/moin/IntegratedDevelopmentEnvironments>`_ -for a comprehensive list. \ No newline at end of file +for a comprehensive list. diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index 68687e9f3ec..3d47d7c5154 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -896,7 +896,7 @@ Compiling Python on Windows If you want to compile CPython yourself, first thing you should do is get the `source <https://www.python.org/downloads/source/>`_. You can download either the latest release's source or just grab a fresh `checkout -<https://docs.python.org/devguide/setup.html#getting-the-source-code>`_. +<https://devguide.python.org/setup/#getting-the-source-code>`_. The source tree contains a build solution and project files for Microsoft Visual Studio 2015, which is the compiler used to build the official Python diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst index cc2fa3dcfa5..45b0ab9f345 100644 --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -232,7 +232,7 @@ have adopted Sphinx as their documentation tool. .. seealso:: - `Documenting Python <https://docs.python.org/devguide/documenting.html>`__ + `Documenting Python <https://devguide.python.org/documenting/>`__ Describes how to write for Python's documentation. `Sphinx <http://sphinx-doc.org/>`__ diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst index 72398f9250f..65971700c8b 100644 --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -1960,7 +1960,7 @@ Other Improvements ``.py`` extension. (Contributed by Paul Moore in :issue:`18569`.) * A new ``make`` target `coverage-report - <https://docs.python.org/devguide/coverage.html#measuring-coverage-of-c-code…>`_ + <https://devguide.python.org/coverage/#measuring-coverage-of-c-code-with-gco…>`_ will build python, run the test suite, and generate an HTML coverage report for the C codebase using ``gcov`` and `lcov <http://ltp.sourceforge.net/coverage/lcov.php>`_. @@ -2176,7 +2176,7 @@ The following obsolete and previously deprecated APIs and features have been removed: * The unmaintained ``Misc/TextMate`` and ``Misc/vim`` directories have been - removed (see the `devguide <https://docs.python.org/devguide>`_ + removed (see the `devguide <https://devguide.python.org>`_ for suggestions on what to use instead). * The ``SO`` makefile macro is removed (it was replaced by the diff --git a/Grammar/Grammar b/Grammar/Grammar index 59c807ef0c8..90582434bee 100644 --- a/Grammar/Grammar +++ b/Grammar/Grammar @@ -1,7 +1,7 @@ # Grammar for Python # NOTE WELL: You should also follow all the steps listed at -# https://docs.python.org/devguide/grammar.html +# https://devguide.python.org/grammar/ # Start symbols for the grammar: # single_input is a single interactive statement; diff --git a/Mac/README b/Mac/README index 07f09fa8366..d4194747ebb 100644 --- a/Mac/README +++ b/Mac/README @@ -98,7 +98,7 @@ In general, universal builds depend on specific features provided by the Apple-supplied compilers and other build tools included in Apple's Xcode development tools. You should install Xcode and the command line tools component appropriate for the OS X release you are running on. See the -Python Developer's Guide (http://docs.python.org/devguide/setup.html) +Python Developer's Guide (https://devguide.python.org/setup/) for more information. 2.1 Flavors of universal binaries @@ -355,4 +355,4 @@ Resources * http://www.python.org/community/sigs/current/pythonmac-sig/ - * http://docs.python.org/devguide/ \ No newline at end of file + * https://devguide.python.org/ diff --git a/Misc/ACKS b/Misc/ACKS index 91e04246f73..e1127bcc72b 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -627,6 +627,7 @@ Thomas Herve Bernhard Herzog Magnus L. Hetland Raymond Hettinger +Lisa Hewus Fresh Kevan Heydon Wouter van Heyst Kelsey Hightower diff --git a/Misc/Porting b/Misc/Porting index c43b1129788..f16c4600521 100644 --- a/Misc/Porting +++ b/Misc/Porting @@ -1 +1 @@ -This document is moved to https://docs.python.org/devguide/faq.html#how-do-i-port-python-to-a-new-pla… +This document is moved to https://devguide.python.org/porting/ diff --git a/Misc/python.man b/Misc/python.man index 385b6546c8a..075b974e904 100644 --- a/Misc/python.man +++ b/Misc/python.man @@ -438,7 +438,7 @@ Main website: https://www.python.org/ .br Documentation: https://docs.python.org/ .br -Developer resources: https://docs.python.org/devguide/ +Developer resources: https://devguide.python.org/ .br Downloads: https://www.python.org/downloads/ .br diff --git a/README.rst b/README.rst index 9c95815d9e9..4829271416e 100644 --- a/README.rst +++ b/README.rst @@ -28,7 +28,7 @@ General Information - Source code: https://github.com/python/cpython - Issue tracker: https://bugs.python.org - Documentation: https://docs.python.org -- Developer's Guide: https://docs.python.org/devguide/ +- Developer's Guide: https://devguide.python.org/ Contributing to CPython ----------------------- @@ -36,7 +36,7 @@ Contributing to CPython For more complete instructions on contributing to CPython development, see the `Developer Guide`_. -.. _Developer Guide: https://docs.python.org/devguide/ +.. _Developer Guide: https://devguide.python.org/ Using Python ------------

1 0

[Trivial] Remove now redundant assert (#3245)
by Antoine Pitrou Aug. 30, 2017

Aug. 30, 2017

https://github.com/python/cpython/commit/e91c2a5086c8fea64ad33d5f334da13ed0… commit: e91c2a5086c8fea64ad33d5f334da13ed0d5648a branch: master author: Antoine Pitrou <pitrou(a)free.fr> committer: GitHub <noreply(a)github.com> date: 2017-08-30T16:57:12+02:00 summary: [Trivial] Remove now redundant assert (#3245) files: M Lib/multiprocessing/pool.py diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py index e457f0a576f..b1ee725fac6 100644 --- a/Lib/multiprocessing/pool.py +++ b/Lib/multiprocessing/pool.py @@ -313,7 +313,6 @@ def imap(self, func, iterable, chunksize=1): raise ValueError( "Chunksize must be 1+, not {0:n}".format( chunksize)) - assert chunksize > 1 task_batches = Pool._get_tasks(func, iterable, chunksize) result = IMapIterator(self._cache) self._taskqueue.put(

1 0

Fix the indentation in Extending Python code example (GH-3244)
by Mariatta Aug. 30, 2017

Aug. 30, 2017

https://github.com/python/cpython/commit/d9a2b99ac45b5529d2a6227b0d529397be… commit: d9a2b99ac45b5529d2a6227b0d529397be831dab branch: master author: Sergey Fedoseev <fedoseev.sergey(a)gmail.com> committer: Mariatta <Mariatta(a)users.noreply.github.com> date: 2017-08-30T07:50:40-07:00 summary: Fix the indentation in Extending Python code example (GH-3244) Code was indented with three spaces. Fixed using four spaces. files: M Doc/extending/extending.rst diff --git a/Doc/extending/extending.rst b/Doc/extending/extending.rst index 2dc20fed131..7c273533aba 100644 --- a/Doc/extending/extending.rst +++ b/Doc/extending/extending.rst @@ -333,12 +333,12 @@ function. The method table must be referenced in the module definition structure:: static struct PyModuleDef spammodule = { - PyModuleDef_HEAD_INIT, - "spam", /* name of module */ - spam_doc, /* module documentation, may be NULL */ - -1, /* size of per-interpreter state of the module, - or -1 if the module keeps state in global variables. */ - SpamMethods + PyModuleDef_HEAD_INIT, + "spam", /* name of module */ + spam_doc, /* module documentation, may be NULL */ + -1, /* size of per-interpreter state of the module, + or -1 if the module keeps state in global variables. */ + SpamMethods }; This structure, in turn, must be passed to the interpreter in the module's

1 0

Removed noop branch from ctypes code (#3234)
by Antoine Pitrou Aug. 30, 2017

Aug. 30, 2017

https://github.com/python/cpython/commit/cb76029b47f26e969317f21d118392a699… commit: cb76029b47f26e969317f21d118392a699d1329e branch: master author: Alex Gaynor <alex.gaynor(a)gmail.com> committer: Antoine Pitrou <pitrou(a)free.fr> date: 2017-08-30T13:43:14+02:00 summary: Removed noop branch from ctypes code (#3234) files: M Lib/ctypes/__init__.py diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py index f8709683fb6..972ea0ac879 100644 --- a/Lib/ctypes/__init__.py +++ b/Lib/ctypes/__init__.py @@ -440,10 +440,7 @@ def LoadLibrary(self, name): windll = LibraryLoader(WinDLL) oledll = LibraryLoader(OleDLL) - if _os.name == "nt": - GetLastError = windll.kernel32.GetLastError - else: - GetLastError = windll.coredll.GetLastError + GetLastError = windll.kernel32.GetLastError from _ctypes import get_last_error, set_last_error def WinError(code=None, descr=None):

1 0

[3.6] bpo-31291: Fixed an assertion failure in zipimport.zipimporter.get_data() (GH-3226) (#3243)
by Serhiy Storchaka Aug. 30, 2017

Aug. 30, 2017

https://github.com/python/cpython/commit/095a421b1606ee27e00a5d9d253b05a9f0… commit: 095a421b1606ee27e00a5d9d253b05a9f0cfadb8 branch: 3.6 author: Oren Milman <orenmn(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-08-30T14:08:39+03:00 summary: [3.6] bpo-31291: Fixed an assertion failure in zipimport.zipimporter.get_data() (GH-3226) (#3243) if pathname.replace('/', '\\') returns non-string. (cherry picked from commit 631fdee6e61b4ba8ce800f827fecdd536bfb04f3) files: A Misc/NEWS.d/next/Core and Builtins/2017-08-28-11-51-29.bpo-31291.t8QggK.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 7ddbc509f9b..daa5138751b 100644 --- a/Lib/test/test_zipimport.py +++ b/Lib/test/test_zipimport.py @@ -521,6 +521,23 @@ def testGetData(self): z.close() os.remove(TEMP_ZIP) + def test_issue31291(self): + # There shouldn't be an assertion failure in get_data(). + class FunnyStr(str): + def replace(self, old, new): + return 42 + z = ZipFile(TEMP_ZIP, "w") + try: + name = "test31291.dat" + data = b'foo' + z.writestr(name, data) + z.close() + zi = zipimport.zipimporter(TEMP_ZIP) + self.assertEqual(data, zi.get_data(FunnyStr(name))) + finally: + z.close() + os.remove(TEMP_ZIP) + def testImporterAttr(self): src = """if 1: # indent hack def get_file(): diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-28-11-51-29.bpo-31291.t8QggK.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-28-11-51-29.bpo-31291.t8QggK.rst new file mode 100644 index 00000000000..0576785c7df --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-28-11-51-29.bpo-31291.t8QggK.rst @@ -0,0 +1,3 @@ +Fix an assertion failure in `zipimport.zipimporter.get_data` on Windows, +when the return value of ``pathname.replace('/','\\')`` isn't a string. +Patch by Oren Milman. diff --git a/Modules/zipimport.c b/Modules/zipimport.c index cccc033d2d9..5bf31cc0605 100644 --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -580,7 +580,8 @@ zipimporter_get_data(PyObject *obj, PyObject *args) return NULL; #ifdef ALTSEP - path = _PyObject_CallMethodId(path, &PyId_replace, "CC", ALTSEP, SEP); + path = _PyObject_CallMethodId((PyObject *)&PyUnicode_Type, &PyId_replace, + "OCC", path, ALTSEP, SEP); if (!path) return NULL; #else

1 0

[3.6] bpo-10746: Fix ctypes PEP 3118 type codes for c_long, c_bool, c_int (GH-31) (#3241)
by Antoine Pitrou Aug. 30, 2017

Aug. 30, 2017

https://github.com/python/cpython/commit/2d1653aa43cf02e6b74f9d4f178fac9969… commit: 2d1653aa43cf02e6b74f9d4f178fac9969a293e2 branch: 3.6 author: Pauli Virtanen <pav(a)iki.fi> committer: Antoine Pitrou <pitrou(a)free.fr> date: 2017-08-30T11:40:05+02:00 summary: [3.6] bpo-10746: Fix ctypes PEP 3118 type codes for c_long, c_bool, c_int (GH-31) (#3241) Ctypes currently produces wrong pep3118 type codes for several types. E.g. memoryview(ctypes.c_long()).format gives "<l" on 64-bit platforms, but it should be "<q" instead for sizeof(c_long) == 8 The problem is that the '<>' endian specification in the struct syntax also turns on the "standard size" mode, which makes type characters have a platform-independent meaning, which does not match with the codes used internally in ctypes. The struct module format syntax also does not allow specifying native-size non-native-endian items. This commit adds a converter function that maps the internal ctypes codes to appropriate struct module standard-size codes in the pep3118 format strings. The tests are modified to check for this. (cherry picked from commit 07f1658aa09f6798793c473c72b2951b7fefe220) files: A Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst M Lib/ctypes/test/test_pep3118.py M Modules/_ctypes/_ctypes.c diff --git a/Lib/ctypes/test/test_pep3118.py b/Lib/ctypes/test/test_pep3118.py index d68397ea802..f3c0e23e53e 100644 --- a/Lib/ctypes/test/test_pep3118.py +++ b/Lib/ctypes/test/test_pep3118.py @@ -112,6 +112,34 @@ class Complete(Structure): # This table contains format strings as they look on little endian # machines. The test replaces '<' with '>' on big endian machines. # + +# Platform-specific type codes +s_bool = {1: '?', 2: 'H', 4: 'L', 8: 'Q'}[sizeof(c_bool)] +s_short = {2: 'h', 4: 'l', 8: 'q'}[sizeof(c_short)] +s_ushort = {2: 'H', 4: 'L', 8: 'Q'}[sizeof(c_ushort)] +s_int = {2: 'h', 4: 'i', 8: 'q'}[sizeof(c_int)] +s_uint = {2: 'H', 4: 'I', 8: 'Q'}[sizeof(c_uint)] +s_long = {4: 'l', 8: 'q'}[sizeof(c_long)] +s_ulong = {4: 'L', 8: 'Q'}[sizeof(c_ulong)] +s_longlong = "q" +s_ulonglong = "Q" +s_float = "f" +s_double = "d" +s_longdouble = "g" + +# Alias definitions in ctypes/__init__.py +if c_int is c_long: + s_int = s_long +if c_uint is c_ulong: + s_uint = s_ulong +if c_longlong is c_long: + s_longlong = s_long +if c_ulonglong is c_ulong: + s_ulonglong = s_ulong +if c_longdouble is c_double: + s_longdouble = s_double + + native_types = [ # type format shape calc itemsize @@ -120,52 +148,51 @@ class Complete(Structure): (c_char, "<c", (), c_char), (c_byte, "<b", (), c_byte), (c_ubyte, "<B", (), c_ubyte), - (c_short, "<h", (), c_short), - (c_ushort, "<H", (), c_ushort), + (c_short, "<" + s_short, (), c_short), + (c_ushort, "<" + s_ushort, (), c_ushort), - # c_int and c_uint may be aliases to c_long - #(c_int, "<i", (), c_int), - #(c_uint, "<I", (), c_uint), + (c_int, "<" + s_int, (), c_int), + (c_uint, "<" + s_uint, (), c_uint), - (c_long, "<l", (), c_long), - (c_ulong, "<L", (), c_ulong), + (c_long, "<" + s_long, (), c_long), + (c_ulong, "<" + s_ulong, (), c_ulong), - # c_longlong and c_ulonglong are aliases on 64-bit platforms - #(c_longlong, "<q", None, c_longlong), - #(c_ulonglong, "<Q", None, c_ulonglong), + (c_longlong, "<" + s_longlong, (), c_longlong), + (c_ulonglong, "<" + s_ulonglong, (), c_ulonglong), (c_float, "<f", (), c_float), (c_double, "<d", (), c_double), - # c_longdouble may be an alias to c_double - (c_bool, "<?", (), c_bool), + (c_longdouble, "<" + s_longdouble, (), c_longdouble), + + (c_bool, "<" + s_bool, (), c_bool), (py_object, "<O", (), py_object), ## pointers (POINTER(c_byte), "&<b", (), POINTER(c_byte)), - (POINTER(POINTER(c_long)), "&&<l", (), POINTER(POINTER(c_long))), + (POINTER(POINTER(c_long)), "&&<" + s_long, (), POINTER(POINTER(c_long))), ## arrays and pointers (c_double * 4, "<d", (4,), c_double), (c_float * 4 * 3 * 2, "<f", (2,3,4), c_float), - (POINTER(c_short) * 2, "&<h", (2,), POINTER(c_short)), - (POINTER(c_short) * 2 * 3, "&<h", (3,2,), POINTER(c_short)), - (POINTER(c_short * 2), "&(2)<h", (), POINTER(c_short)), + (POINTER(c_short) * 2, "&<" + s_short, (2,), POINTER(c_short)), + (POINTER(c_short) * 2 * 3, "&<" + s_short, (3,2,), POINTER(c_short)), + (POINTER(c_short * 2), "&(2)<" + s_short, (), POINTER(c_short)), ## structures and unions - (Point, "T{<l:x:<l:y:}", (), Point), + (Point, "T{<l:x:<l:y:}".replace('l', s_long), (), Point), # packed structures do not implement the pep - (PackedPoint, "B", (), PackedPoint), - (Point2, "T{<l:x:<l:y:}", (), Point2), - (EmptyStruct, "T{}", (), EmptyStruct), + (PackedPoint, "B", (), PackedPoint), + (Point2, "T{<l:x:<l:y:}".replace('l', s_long), (), Point2), + (EmptyStruct, "T{}", (), EmptyStruct), # the pep does't support unions - (aUnion, "B", (), aUnion), + (aUnion, "B", (), aUnion), # structure with sub-arrays - (StructWithArrays, "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}", (), StructWithArrays), - (StructWithArrays * 3, "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}", (3,), StructWithArrays), + (StructWithArrays, "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}".replace('l', s_long), (), StructWithArrays), + (StructWithArrays * 3, "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}".replace('l', s_long), (3,), StructWithArrays), ## pointer to incomplete structure (Incomplete, "B", (), Incomplete), @@ -173,7 +200,7 @@ class Complete(Structure): # 'Complete' is a structure that starts incomplete, but is completed after the # pointer type to it has been created. - (Complete, "T{<l:a:}", (), Complete), + (Complete, "T{<l:a:}".replace('l', s_long), (), Complete), # Unfortunately the pointer format string is not fixed... (POINTER(Complete), "&B", (), POINTER(Complete)), @@ -196,10 +223,10 @@ class LEPoint(LittleEndianStructure): # and little endian machines. # endian_types = [ - (BEPoint, "T{>l:x:>l:y:}", (), BEPoint), - (LEPoint, "T{<l:x:<l:y:}", (), LEPoint), - (POINTER(BEPoint), "&T{>l:x:>l:y:}", (), POINTER(BEPoint)), - (POINTER(LEPoint), "&T{<l:x:<l:y:}", (), POINTER(LEPoint)), + (BEPoint, "T{>l:x:>l:y:}".replace('l', s_long), (), BEPoint), + (LEPoint, "T{<l:x:<l:y:}".replace('l', s_long), (), LEPoint), + (POINTER(BEPoint), "&T{>l:x:>l:y:}".replace('l', s_long), (), POINTER(BEPoint)), + (POINTER(LEPoint), "&T{<l:x:<l:y:}".replace('l', s_long), (), POINTER(LEPoint)), ] if __name__ == "__main__": diff --git a/Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst b/Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst new file mode 100644 index 00000000000..e7625631002 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst @@ -0,0 +1 @@ +Fix ctypes producing wrong PEP 3118 type codes for integer types. diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 12234e254e1..2c01e374f19 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -250,6 +250,71 @@ PyDict_GetItemProxy(PyObject *dict, PyObject *key) } /******************************************************************/ + +/* + Allocate a memory block for a pep3118 format string, filled with + a suitable PEP 3118 type code corresponding to the given ctypes + type. Returns NULL on failure, with the error indicator set. + + This produces type codes in the standard size mode (cf. struct module), + since the endianness may need to be swapped to a non-native one + later on. + */ +static char * +_ctypes_alloc_format_string_for_type(char code, int big_endian) +{ + char *result; + char pep_code = '\0'; + + switch (code) { +#if SIZEOF_INT == 2 + case 'i': pep_code = 'h'; break; + case 'I': pep_code = 'H'; break; +#elif SIZEOF_INT == 4 + case 'i': pep_code = 'i'; break; + case 'I': pep_code = 'I'; break; +#elif SIZEOF_INT == 8 + case 'i': pep_code = 'q'; break; + case 'I': pep_code = 'Q'; break; +#else +# error SIZEOF_INT has an unexpected value +#endif /* SIZEOF_INT */ +#if SIZEOF_LONG == 4 + case 'l': pep_code = 'l'; break; + case 'L': pep_code = 'L'; break; +#elif SIZEOF_LONG == 8 + case 'l': pep_code = 'q'; break; + case 'L': pep_code = 'Q'; break; +#else +# error SIZEOF_LONG has an unexpected value +#endif /* SIZEOF_LONG */ +#if SIZEOF__BOOL == 1 + case '?': pep_code = '?'; break; +#elif SIZEOF__BOOL == 2 + case '?': pep_code = 'H'; break; +#elif SIZEOF__BOOL == 4 + case '?': pep_code = 'L'; break; +#elif SIZEOF__BOOL == 8 + case '?': pep_code = 'Q'; break; +#else +# error SIZEOF__BOOL has an unexpected value +#endif /* SIZEOF__BOOL */ + default: + /* The standard-size code is the same as the ctypes one */ + pep_code = code; + break; + } + + result = PyMem_Malloc(3); + if (result == NULL) + return NULL; + + result[0] = big_endian ? '>' : '<'; + result[1] = pep_code; + result[2] = '\0'; + return result; +} + /* Allocate a memory block for a pep3118 format string, copy prefix (if non-null) and suffix into it. Returns NULL on failure, with the error @@ -1926,9 +1991,9 @@ PyCSimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) stgdict->setfunc = fmt->setfunc; stgdict->getfunc = fmt->getfunc; #ifdef WORDS_BIGENDIAN - stgdict->format = _ctypes_alloc_format_string(">", proto_str); + stgdict->format = _ctypes_alloc_format_string_for_type(proto_str[0], 1); #else - stgdict->format = _ctypes_alloc_format_string("<", proto_str); + stgdict->format = _ctypes_alloc_format_string_for_type(proto_str[0], 0); #endif if (stgdict->format == NULL) { Py_DECREF(result);

1 0