Skip to content

Commit 329c039

Browse files
committed
Merge remote-tracking branch 'upstream/main' into feat/codecs/xmlcharrefreplace-handler-129173
2 parents 1eb2503 + 4d3a7ea commit 329c039

File tree

98 files changed

+1982
-874
lines changed

Some content is hidden

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

98 files changed

+1982
-874
lines changed

Doc/c-api/module.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ The available slot types are:
415415
in one module definition.
416416
417417
If ``Py_mod_multiple_interpreters`` is not specified, the import
418-
machinery defaults to ``Py_MOD_MULTIPLE_INTERPRETERS_NOT_SUPPORTED``.
418+
machinery defaults to ``Py_MOD_MULTIPLE_INTERPRETERS_SUPPORTED``.
419419
420420
.. versionadded:: 3.12
421421

Doc/c-api/unicode.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,15 @@ APIs:
607607
decref'ing the returned objects.
608608
609609
610+
.. c:function:: const char* PyUnicode_GetDefaultEncoding(void)
611+
612+
Return the name of the default string encoding, ``"utf-8"``.
613+
See :func:`sys.getdefaultencoding`.
614+
615+
The returned string does not need to be freed, and is valid
616+
until interpreter shutdown.
617+
618+
610619
.. c:function:: Py_ssize_t PyUnicode_GetLength(PyObject *unicode)
611620
612621
Return the length of the Unicode object, in code points.

Doc/data/refcounts.dat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2770,6 +2770,9 @@ PyUnicode_FromFormatV:PyObject*::+1:
27702770
PyUnicode_FromFormatV:const char*:format::
27712771
PyUnicode_FromFormatV:va_list:args::
27722772

2773+
PyUnicode_GetDefaultEncoding:const char*:::
2774+
PyUnicode_GetDefaultEncoding::void::
2775+
27732776
PyUnicode_GetLength:Py_ssize_t:::
27742777
PyUnicode_GetLength:PyObject*:unicode:0:
27752778

Doc/glossary.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ Glossary
719719
iterables include all sequence types (such as :class:`list`, :class:`str`,
720720
and :class:`tuple`) and some non-sequence types like :class:`dict`,
721721
:term:`file objects <file object>`, and objects of any classes you define
722-
with an :meth:`~iterator.__iter__` method or with a
722+
with an :meth:`~object.__iter__` method or with a
723723
:meth:`~object.__getitem__` method
724724
that implements :term:`sequence` semantics.
725725

Doc/library/abc.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,18 +141,18 @@ a helper class :class:`ABC` to alternatively define ABCs through inheritance:
141141
MyIterable.register(Foo)
142142

143143
The ABC ``MyIterable`` defines the standard iterable method,
144-
:meth:`~iterator.__iter__`, as an abstract method. The implementation given
144+
:meth:`~object.__iter__`, as an abstract method. The implementation given
145145
here can still be called from subclasses. The :meth:`!get_iterator` method
146146
is also part of the ``MyIterable`` abstract base class, but it does not have
147147
to be overridden in non-abstract derived classes.
148148

149149
The :meth:`__subclasshook__` class method defined here says that any class
150-
that has an :meth:`~iterator.__iter__` method in its
150+
that has an :meth:`~object.__iter__` method in its
151151
:attr:`~object.__dict__` (or in that of one of its base classes, accessed
152152
via the :attr:`~type.__mro__` list) is considered a ``MyIterable`` too.
153153

154154
Finally, the last line makes ``Foo`` a virtual subclass of ``MyIterable``,
155-
even though it does not define an :meth:`~iterator.__iter__` method (it uses
155+
even though it does not define an :meth:`~object.__iter__` method (it uses
156156
the old-style iterable protocol, defined in terms of :meth:`~object.__len__` and
157157
:meth:`~object.__getitem__`). Note that this will not make ``get_iterator``
158158
available as a method of ``Foo``, so it is provided separately.

Doc/library/configparser.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,6 +1244,10 @@ ConfigParser Objects
12441244
*space_around_delimiters* is true, delimiters between
12451245
keys and values are surrounded by spaces.
12461246

1247+
.. versionchanged:: 3.14
1248+
Raises InvalidWriteError if this would write a representation which cannot
1249+
be accurately parsed by a future :meth:`read` call from this parser.
1250+
12471251
.. note::
12481252

12491253
Comments in the original configuration file are not preserved when
@@ -1459,6 +1463,17 @@ Exceptions
14591463

14601464
.. versionadded:: 3.14
14611465

1466+
.. exception:: InvalidWriteError
1467+
1468+
Exception raised when an attempted :meth:`ConfigParser.write` would not be parsed
1469+
accurately with a future :meth:`ConfigParser.read` call.
1470+
1471+
Ex: Writing a key beginning with the :attr:`ConfigParser.SECTCRE` pattern
1472+
would parse as a section header when read. Attempting to write this will raise
1473+
this exception.
1474+
1475+
.. versionadded:: 3.14
1476+
14621477
.. rubric:: Footnotes
14631478

14641479
.. [1] Config parsers allow for heavy customization. If you are interested in

Doc/library/idle.rst

Lines changed: 50 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -660,29 +660,61 @@ functions to be used from IDLE's Python shell.
660660
Command line usage
661661
^^^^^^^^^^^^^^^^^^
662662

663-
.. code-block:: none
663+
.. program:: idle
664664

665-
idle.py [-c command] [-d] [-e] [-h] [-i] [-r file] [-s] [-t title] [-] [arg] ...
665+
IDLE can be invoked from the command line with various options. The general syntax is:
666666

667-
-c command run command in the shell window
668-
-d enable debugger and open shell window
669-
-e open editor window
670-
-h print help message with legal combinations and exit
671-
-i open shell window
672-
-r file run file in shell window
673-
-s run $IDLESTARTUP or $PYTHONSTARTUP first, in shell window
674-
-t title set title of shell window
675-
- run stdin in shell (- must be last option before args)
667+
.. code-block:: bash
676668
677-
If there are arguments:
669+
python -m idlelib [options] [file ...]
678670
679-
* If ``-``, ``-c``, or ``r`` is used, all arguments are placed in
680-
``sys.argv[1:...]`` and ``sys.argv[0]`` is set to ``''``, ``'-c'``,
681-
or ``'-r'``. No editor window is opened, even if that is the default
682-
set in the Options dialog.
671+
The following options are available:
672+
673+
.. option:: -c <command>
674+
675+
Run the specified Python command in the shell window.
676+
For example, pass ``-c "print('Hello, World!')"``.
677+
On Windows, the outer quotes must be double quotes as shown.
678+
679+
.. option:: -d
680+
681+
Enable the debugger and open the shell window.
682+
683+
.. option:: -e
684+
685+
Open an editor window.
686+
687+
.. option:: -h
688+
689+
Print a help message with legal combinations of options and exit.
690+
691+
.. option:: -i
692+
693+
Open a shell window.
694+
695+
.. option:: -r <file>
696+
697+
Run the specified file in the shell window.
698+
699+
.. option:: -s
700+
701+
Run the startup file (as defined by the environment variables :envvar:`IDLESTARTUP` or :envvar:`PYTHONSTARTUP`) before opening the shell window.
702+
703+
.. option:: -t <title>
704+
705+
Set the title of the shell window.
706+
707+
.. option:: -
708+
709+
Read and execute standard input in the shell window. This option must be the last one before any arguments.
710+
711+
If arguments are provided:
712+
713+
- If ``-``, ``-c``, or ``-r`` is used, all arguments are placed in ``sys.argv[1:]``,
714+
and ``sys.argv[0]`` is set to ``''``, ``'-c'``, or ``'-r'`` respectively.
715+
No editor window is opened, even if that is the default set in the *Options* dialog.
716+
- Otherwise, arguments are treated as files to be opened for editing, and ``sys.argv`` reflects the arguments passed to IDLE itself.
683717

684-
* Otherwise, arguments are files opened for editing and
685-
``sys.argv`` reflects the arguments passed to IDLE itself.
686718

687719
Startup failure
688720
^^^^^^^^^^^^^^^

Doc/library/multiprocessing.rst

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,35 +380,40 @@ However, if you really do need to use some shared data then
380380
proxies.
381381

382382
A manager returned by :func:`Manager` will support types
383-
:class:`list`, :class:`dict`, :class:`~managers.Namespace`, :class:`Lock`,
383+
:class:`list`, :class:`dict`, :class:`set`, :class:`~managers.Namespace`, :class:`Lock`,
384384
:class:`RLock`, :class:`Semaphore`, :class:`BoundedSemaphore`,
385385
:class:`Condition`, :class:`Event`, :class:`Barrier`,
386386
:class:`Queue`, :class:`Value` and :class:`Array`. For example, ::
387387

388388
from multiprocessing import Process, Manager
389389

390-
def f(d, l):
390+
def f(d, l, s):
391391
d[1] = '1'
392392
d['2'] = 2
393393
d[0.25] = None
394394
l.reverse()
395+
s.add('a')
396+
s.add('b')
395397

396398
if __name__ == '__main__':
397399
with Manager() as manager:
398400
d = manager.dict()
399401
l = manager.list(range(10))
402+
s = manager.set()
400403

401-
p = Process(target=f, args=(d, l))
404+
p = Process(target=f, args=(d, l, s))
402405
p.start()
403406
p.join()
404407

405408
print(d)
406409
print(l)
410+
print(s)
407411

408412
will print ::
409413

410414
{0.25: None, 1: '1', '2': 2}
411415
[9, 8, 7, 6, 5, 4, 3, 2, 1, 0]
416+
{'a', 'b'}
412417

413418
Server process managers are more flexible than using shared memory objects
414419
because they can be made to support arbitrary object types. Also, a single
@@ -1942,6 +1947,15 @@ their parent process exits. The manager classes are defined in the
19421947

19431948
Create a shared :class:`list` object and return a proxy for it.
19441949

1950+
.. method:: set()
1951+
set(sequence)
1952+
set(mapping)
1953+
1954+
Create a shared :class:`set` object and return a proxy for it.
1955+
1956+
.. versionadded:: next
1957+
:class:`set` support was added.
1958+
19451959
.. versionchanged:: 3.6
19461960
Shared objects are capable of being nested. For example, a shared
19471961
container object such as a shared list can contain other shared objects

Doc/library/stdtypes.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -949,9 +949,9 @@ Generator Types
949949
---------------
950950

951951
Python's :term:`generator`\s provide a convenient way to implement the iterator
952-
protocol. If a container object's :meth:`~iterator.__iter__` method is implemented as a
952+
protocol. If a container object's :meth:`~object.__iter__` method is implemented as a
953953
generator, it will automatically return an iterator object (technically, a
954-
generator object) supplying the :meth:`!__iter__` and :meth:`~generator.__next__`
954+
generator object) supplying the :meth:`~iterator.__iter__` and :meth:`~generator.__next__`
955955
methods.
956956
More information about generators can be found in :ref:`the documentation for
957957
the yield expression <yieldexpr>`.

Doc/library/sys.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -771,8 +771,8 @@ always available. Unless explicitly noted otherwise, all variables are read-only
771771

772772
.. function:: getdefaultencoding()
773773

774-
Return the name of the current default string encoding used by the Unicode
775-
implementation.
774+
Return ``'utf-8'``. This is the name of the default string encoding, used
775+
in methods like :meth:`str.encode`.
776776

777777

778778
.. function:: getdlopenflags()

0 commit comments

Comments
 (0)