From 5a4e3d8f9c37e700402b23fafbfc413e5ca3113d Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Thu, 27 Apr 2017 09:05:26 -0700 Subject: [PATCH] bpo-30174: Remove duplicate definition from pickletools (#1301) There were two almost identical definitions of bytes1. --- Lib/pickletools.py | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/Lib/pickletools.py b/Lib/pickletools.py index 5e129b5b56..0c8dddc10b 100644 --- a/Lib/pickletools.py +++ b/Lib/pickletools.py @@ -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 -- 2.50.0