Skip to content

Commit ad9a38a

Browse files
sweeneydesweeneyde
authored
Merge branch 'main' into unquicken
2 parents c69c952 + aff8c4f commit ad9a38a

File tree

79 files changed

+1247
-437
lines changed

Some content is hidden

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

79 files changed

+1247
-437
lines changed

‎.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ jobs:
185185
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
186186
- name: 'Restore OpenSSL build'
187187
id: cache-openssl
188-
uses: actions/cache@v3.0.1
188+
uses: actions/cache@v3.0.2
189189
with:
190190
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
191191
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
@@ -248,7 +248,7 @@ jobs:
248248
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
249249
- name: 'Restore OpenSSL build'
250250
id: cache-openssl
251-
uses: actions/cache@v3.0.1
251+
uses: actions/cache@v3.0.2
252252
with:
253253
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
254254
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
@@ -292,7 +292,7 @@ jobs:
292292
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
293293
- name: 'Restore OpenSSL build'
294294
id: cache-openssl
295-
uses: actions/cache@v3.0.1
295+
uses: actions/cache@v3.0.2
296296
with:
297297
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
298298
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}

‎.github/workflows/new-bugs-announce-notifier.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99
notify-new-bugs-announce:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/setup-node@v2
12+
- uses: actions/setup-node@v3
1313
with:
1414
node-version: 14
1515
- run: npm install mailgun.js form-data
1616
- name: Send notification
17-
uses: actions/github-script@v5
17+
uses: actions/github-script@v6
1818
env:
1919
MAILGUN_API_KEY: ${{ secrets.PSF_MAILGUN_KEY }}
2020
with:

‎.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: "Check PRs"
18-
uses: actions/stale@v4
18+
uses: actions/stale@v5
1919
with:
2020
repo-token: ${{ secrets.GITHUB_TOKEN }}
2121
stale-pr-message: 'This PR is stale because it has been open for 30 days with no activity.'

‎Doc/c-api/init.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ Process-wide parameters
553553
period. The returned string points into static storage; the caller should not
554554
modify its value. The value is available to Python code as :data:`sys.version`.
555555
556-
See also the :data:`Py_Version` constant.
556+
See also the :c:var:`Py_Version` constant.
557557
558558
559559
.. c:function:: const char* Py_GetPlatform()

‎Doc/faq/programming.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ set of modules required by a program and bind these modules together with a
7878
Python binary to produce a single executable.
7979

8080
One is to use the freeze tool, which is included in the Python source tree as
81-
``Tools/freeze``. It converts Python byte code to C arrays; a C compiler you can
81+
``Tools/freeze``. It converts Python byte code to C arrays; with a C compiler you can
8282
embed all your modules into a new program, which is then linked with the
8383
standard Python modules.
8484

‎Doc/library/asyncio-runner.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ To mitigate this issue, :mod:`asyncio` handles :const:`signal.SIGINT` as follows
139139
execution.
140140
3. When :const:`signal.SIGINT` is raised by :kbd:`Ctrl-C`, the custom signal handler
141141
cancels the main task by calling :meth:`asyncio.Task.cancel` which raises
142-
:exc:`asyncio.CancelledError` inside the the main task. This causes the Python stack
142+
:exc:`asyncio.CancelledError` inside the main task. This causes the Python stack
143143
to unwind, ``try/except`` and ``try/finally`` blocks can be used for resource
144144
cleanup. After the main task is cancelled, :meth:`asyncio.Runner.run` raises
145145
:exc:`KeyboardInterrupt`.

‎Doc/library/asyncio-subprocess.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ their completion.
275275
Use the :meth:`communicate` method rather than
276276
:attr:`process.stdin.write() <stdin>`,
277277
:attr:`await process.stdout.read() <stdout>` or
278-
:attr:`await process.stderr.read <stderr>`.
278+
:attr:`await process.stderr.read() <stderr>`.
279279
This avoids deadlocks due to streams pausing reading or writing
280280
and blocking the child process.
281281

‎Doc/library/contextlib.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Functions and classes provided:
181181
``page.close()`` will be called when the :keyword:`with` block is exited.
182182

183183

184-
.. class:: aclosing(thing)
184+
.. function:: aclosing(thing)
185185

186186
Return an async context manager that calls the ``aclose()`` method of *thing*
187187
upon completion of the block. This is basically equivalent to::

‎Doc/library/dataclasses.rst

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ directly specified in the ``InventoryItem`` definition shown above.
4646
Module contents
4747
---------------
4848

49-
.. decorator:: dataclass(*, init=True, repr=True, eq=True, order=False, unsafe_hash=False, frozen=False, match_args=True, kw_only=False, slots=False)
49+
.. decorator:: dataclass(*, init=True, repr=True, eq=True, order=False, unsafe_hash=False, frozen=False, match_args=True, kw_only=False, slots=False, weakref_slot=False)
5050

5151
This function is a :term:`decorator` that is used to add generated
5252
:term:`special method`\s to classes, as described below.
@@ -79,7 +79,7 @@ Module contents
7979
class C:
8080
...
8181

82-
@dataclass(init=True, repr=True, eq=True, order=False, unsafe_hash=False, frozen=False, match_args=True, kw_only=False, slots=False)
82+
@dataclass(init=True, repr=True, eq=True, order=False, unsafe_hash=False, frozen=False, match_args=True, kw_only=False, slots=False, weakref_slot=False)
8383
class C:
8484
...
8585

@@ -198,6 +198,13 @@ Module contents
198198
base class ``__slots__`` may be any iterable, but *not* an iterator.
199199

200200

201+
- ``weakref_slot``: If true (the default is ``False``), add a slot
202+
named "__weakref__", which is required to make an instance
203+
weakref-able. It is an error to specify ``weakref_slot=True``
204+
without also specifying ``slots=True``.
205+
206+
.. versionadded:: 3.11
207+
201208
``field``\s may optionally specify a default value, using normal
202209
Python syntax::
203210

@@ -381,7 +388,7 @@ Module contents
381388
:func:`astuple` raises :exc:`TypeError` if ``obj`` is not a dataclass
382389
instance.
383390

384-
.. function:: make_dataclass(cls_name, fields, *, bases=(), namespace=None, init=True, repr=True, eq=True, order=False, unsafe_hash=False, frozen=False, match_args=True, kw_only=False, slots=False)
391+
.. function:: make_dataclass(cls_name, fields, *, bases=(), namespace=None, init=True, repr=True, eq=True, order=False, unsafe_hash=False, frozen=False, match_args=True, kw_only=False, slots=False, weakref_slot=False)
385392

386393
Creates a new dataclass with name ``cls_name``, fields as defined
387394
in ``fields``, base classes as given in ``bases``, and initialized
@@ -390,8 +397,8 @@ Module contents
390397
or ``(name, type, Field)``. If just ``name`` is supplied,
391398
``typing.Any`` is used for ``type``. The values of ``init``,
392399
``repr``, ``eq``, ``order``, ``unsafe_hash``, ``frozen``,
393-
``match_args``, ``kw_only``, and ``slots`` have the same meaning as
394-
they do in :func:`dataclass`.
400+
``match_args``, ``kw_only``, ``slots``, and ``weakref_slot`` have
401+
the same meaning as they do in :func:`dataclass`.
395402

396403
This function is not strictly required, because any Python
397404
mechanism for creating a new class with ``__annotations__`` can

‎Doc/library/fileinput.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,5 +224,5 @@ The two following opening hooks are provided by this module:
224224
Added the optional *errors* parameter.
225225

226226
.. deprecated:: 3.10
227-
This function is deprecated since :func:`input` and :class:`FileInput`
227+
This function is deprecated since :func:`fileinput.input` and :class:`FileInput`
228228
now have *encoding* and *errors* parameters.

0 commit comments

Comments
 (0)