Merge pull request #446 from python/master

Sync Fork from Upstream Repo

Author: sthagen

Doc/data/stable_abi.dat

@@ -192,6 +192,7 @@ PyExc_ConnectionRefusedError
 PyExc_ConnectionResetError
 PyExc_DeprecationWarning
 PyExc_EOFError
+PyExc_EncodingWarning
 PyExc_EnvironmentError
 PyExc_Exception
 PyExc_FileExistsError
@@ -615,6 +616,7 @@ PyType_GetFlags
 PyType_GetModule
 PyType_GetModuleState
 PyType_GetSlot
+PyType_HasFeature
 PyType_IsSubtype
 PyType_Modified
 PyType_Ready

Doc/whatsnew/3.10.rst

@@ -420,7 +420,7 @@ Several other key features:
 - Mapping patterns: ``{"bandwidth": b, "latency": l}`` captures the
   ``"bandwidth"`` and ``"latency"`` values from a dict.  Unlike sequence
   patterns, extra keys are ignored.  A wildcard ``**rest`` is also
-  supported.  (But ``**_`` would be redundant, so it not allowed.)
+  supported.  (But ``**_`` would be redundant, so is not allowed.)
 
 - Subpatterns may be captured using the ``as`` keyword::
 
@@ -462,13 +462,13 @@ Optional ``EncodingWarning`` and ``encoding="locale"`` option
 The default encoding of :class:`TextIOWrapper` and :func:`open` is
 platform and locale dependent. Since UTF-8 is used on most Unix
 platforms, omitting ``encoding`` option when opening UTF-8 files
-(e.g. JSON, YAML, TOML, Markdown) is very common bug. For example::
+(e.g. JSON, YAML, TOML, Markdown) is a very common bug. For example::
 
    # BUG: "rb" mode or encoding="utf-8" should be used.
    with open("data.json") as f:
-       data = json.laod(f)
+       data = json.load(f)
 
-To find this type of bugs, optional ``EncodingWarning`` is added.
+To find this type of bug, optional ``EncodingWarning`` is added.
 It is emitted when :data:`sys.flags.warn_default_encoding <sys.flags>`
 is true and locale-specific default encoding is used.
 

Lib/test/test_file.py

@@ -52,7 +52,7 @@ def testReadinto_text(self):
         # verify readinto refuses text files
         a = array('b', b'x'*10)
         self.f.close()
-        self.f = self.open(TESTFN, 'r')
+        self.f = self.open(TESTFN, encoding="utf-8")
         if hasattr(self.f, "readinto"):
             self.assertRaises(TypeError, self.f.readinto, a)
 

Lib/test/test_file_eintr.py

@@ -213,7 +213,7 @@ class TestTextIOSignalInterrupt(TestFileIOSignalInterrupt):
     def _generate_infile_setup_code(self):
         """Returns the infile = ... line of code to make a TextIOWrapper."""
         return ('import %s as io ;'
-                'infile = io.open(sys.stdin.fileno(), "rt", newline=None) ;'
+                'infile = io.open(sys.stdin.fileno(), encoding="utf-8", newline=None) ;'
                 'assert isinstance(infile, io.TextIOWrapper)' %
                 self.modname)