From 164f8fa1f8382589cd0517b1bc3e9ecbb65f4485 Mon Sep 17 00:00:00 2001
From: sweeneyde <36520290+sweeneyde@users.noreply.github.com>
Date: Fri, 27 Mar 2020 18:59:28 -0400
Subject: [PATCH] Make the specification more concise (#1344)

---
 pep-0616.rst | 47 +++++++----------------------------------------
 1 file changed, 7 insertions(+), 40 deletions(-)

diff --git a/pep-0616.rst b/pep-0616.rst
index 7039b74a138..401ffd82364 100644
--- a/pep-0616.rst
+++ b/pep-0616.rst
@@ -49,8 +49,8 @@ requires a module import, and results in less readable code.
 Specification
 =============
 
-The builtin ``str`` class will gain two new methods with roughly the
-following behavior::
+The builtin ``str`` class will gain two new methods which will behave
+as follows when ``type(self) is type(prefix) is type(suffix) is str``::
 
     def removeprefix(self: str, prefix: str, /) -> str:
         if self.startswith(prefix):
@@ -59,45 +59,20 @@ following behavior::
             return self[:]
 
     def removesuffix(self: str, suffix: str, /) -> str:
+        # suffix='' should not call self[:-0].
         if suffix and self.endswith(suffix):
             return self[:-len(suffix)]
         else:
             return self[:]
 
-Note that ``self[:]`` might not actually make a copy -- if the affix
-is empty or not found, and if ``type(self) is str``, then these methods
-may, but are not required to, make the optimization of returning ``self``.
-However, when called on instances of subclasses of ``str``, these
-methods should return base ``str`` objects, not ``self``.
-
-Without the check for the truthiness of ``suffix``,
-``s.removesuffix('')`` would be mishandled and always return the empty
-string due to the unintended evaluation of ``self[:-0]``.
+These methods, even when called on ``str`` subclasses, should always
+return base ``str`` objects.
 
 Methods with the corresponding semantics will be added to the builtin
 ``bytes`` and ``bytearray`` objects.  If ``b`` is either a ``bytes``
 or ``bytearray`` object, then ``b.removeprefix()`` and ``b.removesuffix()``
-will accept any bytes-like object as an argument.  Although the methods
-on the immutable ``str`` and ``bytes`` types may make the aforementioned
-optimization of returning the original object, ``bytearray.removeprefix()``
-and ``bytearray.removesuffix()`` should *always* return a copy, never the
-original object.
-
-To test whether any affixes were removed during the call, users
-may use the constant-time behavior of comparing the lengths of
-the original and new strings::
-
-    >>> string = 'Python String Input'
-    >>> new_string = string.removeprefix('Py')
-    >>> modified = (len(string) != len(new_string))
-    >>> modified
-    True
-
-Users may also continue using ``startswith()`` and ``endswith()``
-methods for control flow instead of testing the lengths as above.
-
-The two methods will also be added to ``collections.UserString``, with
-similar behavior.
+will accept any bytes-like object as an argument. The two methods will
+also be added to ``collections.UserString``, with similar behavior.
 
 
 Motivating examples from the Python standard library
@@ -233,14 +208,6 @@ expansion of the ``lstrip``/``rstrip`` API -- repeatedly applying the
 function until the argument is unchanged.  This behavior is attainable
 from the proposed behavior via by the following::
 
-    >>> s = 'Foo' * 100 + 'Bar'
-    >>> prefix = 'Foo'
-    >>> while len(s) != len(s := s.removeprefix(prefix)): pass
-    >>> s
-    'Bar'
-
-or the more obvious and readable alternative::
-
     >>> s = 'Foo' * 100 + 'Bar'
     >>> prefix = 'Foo'
     >>> while s.startswith(prefix): s = s.removeprefix(prefix)