Merge branch 'main' into subscope

Author: iritkatriel

Doc/library/json.rst

@@ -234,6 +234,16 @@ Basic Usage
       If ``True``, dictionaries will be outputted sorted by key.
       Default ``False``.
 
+   .. note::
+
+      Keys in key/value pairs of JSON are always of the type :class:`str`. When
+      a dictionary is converted into JSON, all the keys of the dictionary are
+      converted to strings. As a result of this, if a dictionary is converted
+      into JSON and then back into a dictionary, the dictionary may not equal
+      the original one. That is, ``loads(dumps(x)) != x`` if x has non-string
+      keys. *sort_keys* sorts the keys before they are converted to strings,
+      so numeric keys are sorted by value, not by their string representation.
+
    .. versionchanged:: 3.2
       Allow strings for *indent* in addition to integers.
 
@@ -253,17 +263,6 @@ Basic Usage
    table <py-to-json-table>`.  The arguments have the same meaning as in
    :func:`dump`.
 
-   .. note::
-
-      Keys in key/value pairs of JSON are always of the type :class:`str`. When
-      a dictionary is converted into JSON, all the keys of the dictionary are
-      coerced to strings. As a result of this, if a dictionary is converted
-      into JSON and then back into a dictionary, the dictionary may not equal
-      the original one. That is, ``loads(dumps(x)) != x`` if x has non-string
-      keys.
-      *sort_keys* sorts the keys before they are coerced to strings,
-      so numeric keys are sorted by value, not by their string representation.
-
 .. function:: load(fp, *, cls=None, object_hook=None, parse_float=None, \
                    parse_int=None, parse_constant=None, \
                    object_pairs_hook=None, array_hook=None, **kw)

Doc/reference/datamodel.rst

@@ -1557,6 +1557,16 @@ Special read-only attributes
    * - .. attribute:: codeobject.co_firstlineno
      - The line number of the first line of the function
 
+   * - .. attribute:: codeobject.co_linetable
+     - A :class:`bytes` object containing encoded source location information.
+       The exact format is an implementation detail and may change between
+       Python versions. Use :meth:`~codeobject.co_lines` and
+       :meth:`~codeobject.co_positions` for supported access to line and
+       position information. To create a modified copy of a code object,
+       use :meth:`~codeobject.replace`.
+
+       .. versionadded:: 3.10
+
    * - .. attribute:: codeobject.co_stacksize
      - The required stack size of the code object
 

Lib/curses/__init__.py

@@ -11,6 +11,7 @@
 """
 
 from _curses import *
+import _curses
 import os as _os
 import sys as _sys
 
@@ -33,6 +34,7 @@ def initscr():
         if key.startswith(('ACS_', 'WACS_')) or key in ('LINES', 'COLS'):
             setattr(curses, key, value)
     return stdscr
+initscr.__doc__ = _curses.initscr.__doc__
 
 # newterm() is wrapped for the same reason as initscr(): the ACS_* and WACS_*
 # constants and LINES/COLS only become available once a terminal is
@@ -50,6 +52,7 @@ def newterm(type=None, fd=None, infd=None, /):
             if key.startswith(('ACS_', 'WACS_')) or key in ('LINES', 'COLS'):
                 setattr(curses, key, value)
         return screen
+    newterm.__doc__ = _curses.newterm.__doc__
 
 # This is a similar wrapper for start_color(), which adds the COLORS and
 # COLOR_PAIRS variables which are only available after start_color() is
@@ -60,6 +63,7 @@ def start_color():
     _curses.start_color()
     curses.COLORS = _curses.COLORS
     curses.COLOR_PAIRS = _curses.COLOR_PAIRS
+start_color.__doc__ = _curses.start_color.__doc__
 
 # Import Python has_key() implementation if _curses doesn't contain has_key()
 

Lib/test/test_inspect/test_inspect.py

@@ -6378,15 +6378,10 @@ def test_thread_module_has_signatures(self):
         self._test_module_has_signatures(_thread, no_signature)
 
     def test_time_module_has_signatures(self):
-        no_signature = {
-            'asctime', 'ctime', 'get_clock_info', 'gmtime', 'localtime',
-            'strftime', 'strptime'
-        }
-        no_signature |= {name for name in
-            ['clock_getres', 'clock_settime', 'clock_settime_ns',
-             'pthread_getcpuclockid']
-            if hasattr(time, name)}
-        self._test_module_has_signatures(time, no_signature)
+        no_signature = {'strftime', 'strptime'}
+        unsupported_signature = {'asctime'}
+        self._test_module_has_signatures(time, no_signature,
+                                         unsupported_signature)
 
     def test_tokenize_module_has_signatures(self):
         import tokenize

Lib/test/test_unittest/testmock/testhelpers.py

@@ -1,8 +1,9 @@
 import inspect
-import time
 import types
 import unittest
 
+from test.support import import_helper
+
 from unittest.mock import (
     call, _Call, create_autospec, MagicMock,
     Mock, ANY, _CallList, patch, PropertyMock, _callable
@@ -929,8 +930,10 @@ def check_data_descriptor(mock_attr):
 
 
     def test_autospec_on_bound_builtin_function(self):
-        meth = types.MethodType(time.ctime, time.time())
-        self.assertIsInstance(meth(), str)
+        _testcapi = import_helper.import_module('_testcapi')
+        # This function is defined without a signature.
+        meth = types.MethodType(_testcapi.docstring_no_signature, object())
+        self.assertIsNone(meth())
         mocked = create_autospec(meth)
 
         # no signature, so no spec to check against

Modules/_cursesmodule.c

@@ -5536,7 +5536,14 @@ static PyMethodDef PyCursesScreen_methods[] = {
     {NULL, NULL}  /* sentinel */
 };
 
+PyDoc_STRVAR(PyCursesScreen_Type_doc,
+"A curses screen.\n"
+"\n"
+"Screen objects are returned by newterm() and new_prescr(), and represent\n"
+"a terminal together with its standard window, stdscr.");
+
 static PyType_Slot PyCursesScreen_Type_slots[] = {
+    {Py_tp_doc, (void *)PyCursesScreen_Type_doc},
     {Py_tp_methods, PyCursesScreen_methods},
     {Py_tp_getset, PyCursesScreen_getsets},
     {Py_tp_dealloc, PyCursesScreen_dealloc},
@@ -6931,12 +6938,12 @@ _curses.initscr
 
 Initialize the library.
 
-Return a WindowObject which represents the whole screen.
+Return a window object which represents the whole screen.
 [clinic start generated code]*/
 
 static PyObject *
 _curses_initscr_impl(PyObject *module)
-/*[clinic end generated code: output=619fb68443810b7b input=514f4bce1821f6b5]*/
+/*[clinic end generated code: output=619fb68443810b7b input=e2bf3a061b7d948a]*/
 {
     WINDOW *win;