Merge pull request #22411 from DimitriPapadopoulos/python2_doc

DOC: Remove documentation specific to Python 2

2 files changed, 4 insertions, 6 deletions

diff --git a/numpy/__init__.py b/numpy/__init__.py
index 66b8e3eca..3260046d6 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -200,10 +200,9 @@ else:
 
     _msg = (
         "`np.{n}` is a deprecated alias for `np.compat.{n}`. "
-        "To silence this warning, use `np.compat.{n}` by itself. "
-        "In the likely event your code does not need to work on Python 2 "
-        "you can use the builtin `{n2}` for which `np.compat.{n}` is itself "
-        "an alias. Doing this will not modify any behaviour and is safe. "
+        "To silence this warning, use `np.compat.{n}` by itself, or "
+        "the builtin `{n2}` for which `np.compat.{n}` is itself an "
+        "alias. Doing this will not modify any behaviour and is safe. "
         "{extended_msg}\n"
         "Deprecated in NumPy 1.20; for more details and guidance: "
         "https://numpy.org/devdocs/release/1.20.0-notes.html#deprecations")
diff --git a/numpy/core/_add_newdocs.py b/numpy/core/_add_newdocs.py
index 0405bfbe0..4ff838b77 100644
--- a/numpy/core/_add_newdocs.py
+++ b/numpy/core/_add_newdocs.py
@@ -1354,8 +1354,7 @@ add_newdoc('numpy.core.multiarray', 'fromstring',
             decimal numbers, an operation which is better spelt
             ``frombuffer(string, dtype, count)``. If `string` contains unicode
             text, the binary mode of `fromstring` will first encode it into
-            bytes using either utf-8 (python 3) or the default encoding
-            (python 2), neither of which produce sane results.
+            bytes using utf-8, which will not produce sane results.
 
     ${ARRAY_FUNCTION_LIKE}