Skip to content

Commit eac3c51

Browse files
committed
Merge branch 'master' of github.com:python/cpython into bugfix/pprint-set-ordering
2 parents cdcccc1 + 804d689 commit eac3c51

File tree

217 files changed

+8630
-6327
lines changed

Some content is hidden

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

217 files changed

+8630
-6327
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ jobs:
7575
fi
7676
- name: Check exported libpython symbols
7777
run: make smelly
78+
- name: Check limited ABI symbols
79+
run: make check-limited-abi
7880

7981
build_win32:
8082
name: 'Windows (x86)'
@@ -135,7 +137,7 @@ jobs:
135137
run: sudo ./.github/workflows/posix-deps-apt.sh
136138
- name: 'Restore OpenSSL build'
137139
id: cache-openssl
138-
uses: actions/[email protected].2
140+
uses: actions/[email protected].3
139141
with:
140142
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
141143
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: sudo ./.github/workflows/posix-deps-apt.sh
3333
- name: 'Restore OpenSSL build'
3434
id: cache-openssl
35-
uses: actions/[email protected].2
35+
uses: actions/[email protected].3
3636
with:
3737
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
3838
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}

.github/workflows/doc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: 'Build documentation'
3939
run: xvfb-run make -C Doc/ PYTHON=../python SPHINXOPTS="-q -W --keep-going -j4" doctest html
4040
- name: 'Upload'
41-
uses: actions/[email protected].0
41+
uses: actions/[email protected].1
4242
with:
4343
name: doc-html
4444
path: Doc/build/html

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@ script:
192192
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./python Tools/scripts/patchcheck.py --travis $TRAVIS_PULL_REQUEST; fi
193193
# Check that all symbols exported by libpython start with "Py" or "_Py"
194194
- make smelly
195+
# Check that all symbols in the limited abi are present
196+
- make check-limited-abi
195197
# `-r -w` implicitly provided through `make buildbottest`.
196198
- |
197199
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then

Doc/c-api/tuple.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Tuple Objects
5757
.. c:function:: PyObject* PyTuple_GetItem(PyObject *p, Py_ssize_t pos)
5858
5959
Return the object at position *pos* in the tuple pointed to by *p*. If *pos* is
60-
out of bounds, return ``NULL`` and set an :exc:`IndexError` exception.
60+
negative or out of bounds, return ``NULL`` and set an :exc:`IndexError` exception.
6161
6262
6363
.. c:function:: PyObject* PyTuple_GET_ITEM(PyObject *p, Py_ssize_t pos)

0 commit comments

Comments
 (0)