8000 Merge branch 3.8 into 3.8-slp · stackless-dev/stackless@f784a53 · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

Commit f784a53

Browse files
author
Anselm Kruis
committed
Merge branch 3.8 into 3.8-slp
2 parents 47dece3 + 9db66a2 commit f784a53

File tree

326 files changed

+5135
-2246
lines changed
  • idlelib
  • importlib
  • locale.py
  • ntpath.py
  • pathlib.py
  • pdb.py
  • shutil.py
  • sre_parse.py
  • statistics.py
  • test
  • unittest
  • venv/scripts/common
  • zipfile.py
  • Misc
  • Modules
  • Objects
  • PC
  • PCbuild

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    326 files changed

    +5135
    -2246
    lines changed

    ‎.azure-pipelines/windows-release/msi-steps.yml

    Lines changed: 4 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -51,6 +51,10 @@ steps:
    5151
    artifactName: tcltk_lib_amd64
    5252
    targetPath: $(Build.BinariesDirectory)\tcltk_lib_amd64
    5353

    54+
    - powershell: |
    55+
    copy $(Build.BinariesDirectory)\amd64\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
    56+
    displayName: 'Copy signed files into sources'
    57+
    5458
    - script: |
    5559
    call Tools\msi\get_externals.bat
    5660
    call PCbuild\find_python.bat

    ‎.azure-pipelines/windows-release/stage-build.yml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -122,7 +122,7 @@ jobs:
    122122
    displayName: Publish Tcl/Tk Library
    123123

    124124
    pool:
    125-
    vmName: win2016-vs2017
    125+
    vmName: windows-latest
    126126

    127127
    workspace:
    128128
    clean: all

    ‎.azure-pipelines/windows-release/stage-layout-full.yml

    Lines changed: 4 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -47,6 +47,10 @@ jobs:
    4747
    artifactName: tcltk_lib_$(Name)
    4848
    targetPath: $(Build.BinariesDirectory)\tcltk_lib
    4949

    50+
    - powershell: |
    51+
    copy $(Build.BinariesDirectory)\bin\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
    52+
    displayName: 'Copy signed files into sources'
    53+
    5054
    - template: ./layout-command.yml
    5155

    5256
    - powershell: |

    ‎.azure-pipelines/windows-release/stage-layout-msix.yml

    Lines changed: 4 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -40,6 +40,10 @@ jobs:
    4040
    artifactName: tcltk_lib_$(Name)
    4141
    targetPath: $(Build.BinariesDirectory)\tcltk_lib
    4242

    43+
    - powershell: |
    44+
    copy $(Build.BinariesDirectory)\bin\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
    45+
    displayName: 'Copy signed files into sources'
    46+
    4347
    - template: ./layout-command.yml
    4448

    4549
    - powershell: |

    ‎.azure-pipelines/windows-release/stage-layout-nuget.yml

    Lines changed: 4 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -29,6 +29,10 @@ jobs:
    2929
    artifactName: bin_$(Name)
    3030
    targetPath: $(Build.BinariesDirectory)\bin
    3131

    32+
    - powershell: |
    33+
    copy $(Build.BinariesDirectory)\bin\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
    34+
    displayName: 'Copy signed files into sources'
    35+
    3236
    - template: ./layout-command.yml
    3337

    3438
    - powershell: |

    ‎.azure-pipelines/windows-release/stage-publish-nugetorg.yml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -36,6 +36,6 @@ jobs:
    3636
    condition: and(succeeded(), eq(variables['SigningCertificate'], variables['__RealSigningCertificate']))
    3737
    inputs:
    3838
    command: push
    39-
    packagesToPush: $(Build.BinariesDirectory)\nuget\*.nupkg'
    39+
    packagesToPush: '$(Build.BinariesDirectory)\nuget\*.nupkg'
    4040
    nuGetFeedType: external
    4141
    publishFeedCredentials: 'Python on Nuget'

    ‎.azure-pipelines/windows-release/stage-sign.yml

    Lines changed: 12 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,7 @@
    1+
    parameters:
    2+
    Include: '*.exe, *.dll, *.pyd, *.cat, *.ps1'
    3+
    Exclude: 'vcruntime*, libffi*, libcrypto*, libssl*'
    4+
    15
    jobs:
    26
    - job: Sign_Python
    37
    displayName: Sign Python binaries
    @@ -17,7 +21,7 @@ jobs:
    1721
    Name: amd64
    1822

    1923
    steps:
    20-
    - checkout: none
    24+
    - template: ./checkout.yml
    2125
    - template: ./find-sdk.yml
    2226

    2327
    - powershell: |
    @@ -31,13 +35,18 @@ jobs:
    3135
    targetPath: $(Build.BinariesDirectory)\bin
    3236

    3337
    - powershell: |
    34-
    $files = (gi *.exe, *.dll, *.pyd, *.cat -Exclude vcruntime*, libffi*, libcrypto*, libssl*)
    38+
    copy "$(Build.SourcesDirectory)\Lib\venv\scripts\common\Activate.ps1" .
    39+
    displayName: 'Copy files from source'
    40+
    workingDirectory: $(Build.BinariesDirectory)\bin
    41+
    42+
    - powershell: |
    43+
    $files = (gi ${{ parameters.Include }} -Exclude ${{ parameters.Exclude }})
    3544
    signtool sign /a /n "$(SigningCertificate)" /fd sha256 /d "$(SigningDescription)" $files
    3645
    displayName: 'Sign binaries'
    3746
    workingDirectory: $(Build.BinariesDirectory)\bin
    3847
    3948
    - powershell: |
    40-
    $files = (gi *.exe, *.dll, *.pyd, *.cat -Exclude vcruntime*, libffi*, libcrypto*, libssl*)
    49+
    $files = (gi ${{ parameters.Include }} -Exclude ${{ parameters.Exclude }})
    4150
    $failed = $true
    4251
    foreach ($retry in 1..10) {
    4352
    signtool timestamp /t http://timestamp.verisign.com/scripts/timestamp.dll $files

    ‎.gitattributes

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -54,7 +54,7 @@ Python/Python-ast.c linguist-generated=true
    5454
    Include/opcode.h linguist-generated=true
    5555
    Python/opcode_targets.h linguist-generated=true
    5656
    Objects/typeslots.inc linguist-generated=true
    57-
    Modules/unicodedata_db.h linguist-generated=true
    57+
    *_db.h linguist-generated=true
    5858
    Doc/library/token-list.inc linguist-generated=true
    5959
    Include/token.h linguist-generated=true
    6060
    Lib/token.py linguist-generated=true

    ‎.gitignore

    Lines changed: 1 addition & 7 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,14 +1,8 @@
    1-
    # added for local development
    2-
    .buildaix/
    3-
    Modules/python.exp
    4-
    buildaix/
    5-
    installp/
    6-
    .gitignore
    7-
    81
    # Two-trick pony for OSX and other case insensitive file systems:
    92
    # Ignore ./python binary on Unix but still look into ./Python/ directory.
    103
    /python
    114
    !/Python/
    5+
    126
    *.cover
    137
    *.iml
    148
    *.o
    57AE

    ‎Doc/bugs.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -80,7 +80,7 @@ taken on the bug.
    8080
    Article which goes into some detail about how to create a useful bug report.
    8181
    This describes what kind of information is useful and why it is useful.
    8282

    83-
    `Bug Writing Guidelines <https://developer.mozilla.org/en-US/docs/Mozilla/QA/Bug_writing_guidelines>`_
    83+
    `Bug Report Writing Guidelines <https://developer.mozilla.org/en-US/docs/Mozilla/QA/Bug_writing_guidelines>`_
    8484
    Information about writing a good bug report. Some of this is specific to the
    8585
    Mozilla project, but describes general good practices.
    8686

    ‎Doc/c-api/buffer.rst

    Lines changed: 6 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -475,6 +475,12 @@ Buffer-related functions
    475475
    (*order* is ``'A'``). Return ``0`` otherwise. This function always succeeds.
    476476
    477477
    478+
    .. c:function:: void* PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices)
    479+
    480+
    Get the memory area pointed to by the *indices* inside the given *view*.
    481+
    *indices* must point to an array of ``view->ndim`` indices.
    482+
    483+
    478484
    .. c:function:: int PyBuffer_ToContiguous(void *buf, Py_buffer *src, Py_ssize_t len, char order)
    479485
    480486
    Copy *len* bytes from *src* to its contiguous representation in *buf*.

    ‎Doc/c-api/exceptions.rst

    Lines changed: 0 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -809,7 +809,6 @@ the variables:
    809809
    single: PyExc_SystemError
    810810
    single: PyExc_SystemExit
    811811
    single: PyExc_TabError
    812-
    single: PyExc_TargetScopeError
    813812
    single: PyExc_TimeoutError
    814813
    single: PyExc_TypeError
    815814
    single: PyExc_UnboundLocalError
    @@ -911,8 +910,6 @@ the variables:
    911910
    +-----------------------------------------+---------------------------------+----------+
    912911
    | :c:data:`PyExc_TabError` | :exc:`TabError` | |
    913912
    +-----------------------------------------+---------------------------------+----------+
    914-
    | :c:data:`PyExc_TargetScopeError` | :exc:`TargetScopeError` | |
    915-
    +-----------------------------------------+---------------------------------+----------+
    916913
    | :c:data:`PyExc_TimeoutError` | :exc:`TimeoutError` | |
    917914
    +-----------------------------------------+---------------------------------+----------+
    918915
    | :c:data:`PyExc_TypeError` | :exc:`TypeError` | |

    ‎Doc/c-api/init.rst

    Lines changed: 14 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -7,6 +7,8 @@
    77
    Initialization, Finalization, and Threads
    88
    *****************************************
    99

    10+
    See also :ref:`Python Initialization Configuration <init-config>`.
    11+
    1012
    .. _pre-init-safe:
    1113

    1214
    Before Python Initialization
    @@ -1141,10 +1143,18 @@ Sub-interpreter support
    11411143
    11421144
    While in most uses, you will only embed a single Python interpreter, there
    11431145
    are cases where you need to create several independent interpreters in the
    1144-
    same process and perhaps even in the same thread. Sub-interpreters allow
    1145-
    you to do that. You can switch between sub-interpreters using the
    1146-
    :c:func:`PyThreadState_Swap` function. You can create and destroy them
    1147-
    using the following functions:
    1146+
    same process and perhaps even in the same thread. Sub-interpreters allow
    1147+
    you to do that.
    1148+
    1149+
    The "main" interpreter is the first one created when the runtime initializes.
    1150+
    It is usually the only Python interpreter in a process. Unlike sub-interpreters,
    1151+
    the main interpreter has unique process-global responsibilities like signal
    1152+
    handling. It is also responsible for execution during runtime initialization and
    1153+
    is usually the active interpreter during runtime finalization. The
    1154+
    :c:func:`PyInterpreterState_Main` funtion returns a pointer to its state.
    1155+
    1156+
    You can switch between sub-interpreters using the :c:func:`PyThreadState_Swap`
    1157+
    function. You can create and destroy them using the following functions:
    11481158
    11491159
    11501160
    .. c:function:: PyThreadState* Py_NewInterpreter()

    ‎Doc/c-api/init_config.rst

    Lines changed: 8 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -48,6 +48,8 @@ The preconfiguration (``PyPreConfig`` type) is stored in
    4848
    ``_PyRuntime.preconfig`` and the configuration (``PyConfig`` type) is stored in
    4949
    ``PyInterpreterState.config``.
    5050

    51+
    See also :ref:`Initialization, Finalization, and Threads <initialization>`.
    52+
    5153
    .. seealso::
    5254
    :pep:`587` "Python Initialization Configuration".
    5355

    @@ -72,8 +74,12 @@ PyWideStringList
    7274
    7375
    .. c:function:: PyStatus PyWideStringList_Insert(PyWideStringList *list, Py_ssize_t index, const wchar_t *item)
    7476
    75-
    Insert *item* into *list* at *index*. If *index* is greater than *list*
    76-
    length, just append *item* to *list*.
    77+
    Insert *item* into *list* at *index*.
    78+
    79+
    If *index* is greater than or equal to *list* length, append *item* to
    80+
    *list*.
    81+
    82+
    *index* must be greater than or equal to 0.
    7783
    7884
    Python must be preinitialized to call this function.
    7985

    ‎Doc/conf.py

    Lines changed: 4 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -63,8 +63,10 @@
    6363
    needs_sphinx = '1.8'
    6464

    6565
    # Ignore any .rst files in the venv/ directory.
    66-
    venvdir = os.getenv('VENVDIR', 'venv')
    67-
    exclude_patterns = [venvdir+'/*', 'README.rst']
    66+
    exclude_patterns = ['venv/*', 'README.rst']
    67+
    venvdir = os.getenv('VENVDIR')
    68+
    if venvdir is not None:
    69+
    exclude_patterns.append(venvdir + '/*')
    6870

    6971
    # Disable Docutils smartquotes for several translations
    7072
    smartquotes_excludes = {

    ‎Doc/data/refcounts.dat

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -2462,7 +2462,7 @@ PyUnicode_FromWideChar:Py_ssize_t:size::
    24622462
    PyUnicode_AsWideChar:Py_ssize_t:::
    24632463
    PyUnicode_AsWideChar:PyObject*:*unicode:0:
    24642464
    PyUnicode_AsWideChar:wchar_t*:w::
    2465-
    PyUnicode_AsWideChar:Pyssize_t:size::
    2465+
    PyUnicode_AsWideChar:Py_ssize_t:size::
    24662466

    24672467
    PyUnicode_AsWideCharString:wchar_t*:::
    24682468
    PyUnicode_AsWideCharString:PyObject*:unicode:0:

    ‎Doc/faq/programming.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -659,7 +659,7 @@ How can my code discover the name of an object?
    659659
    -----------------------------------------------
    660660

    661661
    Generally speaking, it can't, because objects don't really have names.
    662-
    Essentially, assignment always binds a name to a value; The same is true of
    662+
    Essentially, assignment always binds a name to a value; the same is true of
    663663
    ``def`` and ``class`` statements, but in that case the value is a
    664664
    callable. Consider the following code::
    665665

    ‎Doc/howto/descriptor.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -117,7 +117,7 @@ The important points to remember are:
    117117
    * non-data descriptors may be overridden by instance dictionaries.
    118118

    119119
    The object returned by ``super()`` also has a custom :meth:`__getattribute__`
    120-
    method for invoking descriptors. The call ``super(B, obj).m()`` searches
    120+
    method for invoking descriptors. The attribute lookup ``super(B, obj).m`` searches
    121121
    ``obj.__class__.__mro__`` for the base class ``A`` immediately following ``B``
    122122
    and then returns ``A.__dict__['m'].__get__(obj, B)``. If not a descriptor,
    123123
    ``m`` is returned unchanged. If not in the dictionary, ``m`` reverts to a

    0 commit comments

    Comments
     (0)
    0