]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-30174: Remove duplicate definition from pickletools (#1301)
authorJelle Zijlstra <jelle.zijlstra@gmail.com>
Thu, 27 Apr 2017 16:05:26 +0000 (09:05 -0700)
committerSerhiy Storchaka <storchaka@gmail.com>
Thu, 27 Apr 2017 16:05:26 +0000 (19:05 +0300)
There were two almost identical definitions of bytes1.

Lib/pickletools.py

index 5e129b5b56373b8eb13355d7b58caabc1e1282a8..0c8dddc10bbc7e937d4bc876062baf5dee8e3560 100644 (file)
@@ -469,35 +469,6 @@ string4 = ArgumentDescriptor(
               """)
 
 
-def read_bytes1(f):
-    r"""
-    >>> import io
-    >>> read_bytes1(io.BytesIO(b"\x00"))
-    b''
-    >>> read_bytes1(io.BytesIO(b"\x03abcdef"))
-    b'abc'
-    """
-
-    n = read_uint1(f)
-    assert n >= 0
-    data = f.read(n)
-    if len(data) == n:
-        return data
-    raise ValueError("expected %d bytes in a bytes1, but only %d remain" %
-                     (n, len(data)))
-
-bytes1 = ArgumentDescriptor(
-              name="bytes1",
-              n=TAKEN_FROM_ARGUMENT1,
-              reader=read_bytes1,
-              doc="""A counted bytes string.
-
-              The first argument is a 1-byte unsigned int giving the number
-              of bytes in the string, and the second argument is that many
-              bytes.
-              """)
-
-
 def read_bytes1(f):
     r"""
     >>> import io