From 0758362ca777039bf6a2d033cf665944f46e3c9a Mon Sep 17 00:00:00 2001 From: Jan Pipek Date: Fri, 6 Sep 2019 14:59:50 +0200 Subject: API that work with pyasn1-modules --- pyasn1/codec/ber/decoder.py | 6 +++--- pyasn1/codec/cer/decoder.py | 6 +++--- pyasn1/codec/der/decoder.py | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pyasn1/codec/ber/decoder.py b/pyasn1/codec/ber/decoder.py index 44c1c9d..bbca7f5 100644 --- a/pyasn1/codec/ber/decoder.py +++ b/pyasn1/codec/ber/decoder.py @@ -1730,9 +1730,9 @@ def decodeStream(substrate, asn1Spec=None, **kwargs): def decode(substrate, asn1Spec=None, **kwargs): # TODO: Temporary solution before merging with upstream # It preserves the original API - substrate = BytesIO(substrate) - iterator = decodeStream(substrate, asn1Spec=asn1Spec, **kwargs) - return next(iterator), substrate.read() + substrate = asSeekableStream(substrate) + value = _decode(substrate, asn1Spec=asn1Spec, **kwargs) + return value, substrate.read() # XXX diff --git a/pyasn1/codec/cer/decoder.py b/pyasn1/codec/cer/decoder.py index abff803..ba74cb4 100644 --- a/pyasn1/codec/cer/decoder.py +++ b/pyasn1/codec/cer/decoder.py @@ -132,6 +132,6 @@ def decodeStream(substrate, asn1Spec=None, **kwargs): def decode(substrate, asn1Spec=None, **kwargs): # TODO: Temporary solution before merging with upstream # It preserves the original API - substrate = BytesIO(substrate) - iterator = decodeStream(substrate, asn1Spec=asn1Spec, **kwargs) - return next(iterator), substrate.read() + substrate = asSeekableStream(substrate) + value = _decode(substrate, asn1Spec=asn1Spec, **kwargs) + return value, substrate.read() diff --git a/pyasn1/codec/der/decoder.py b/pyasn1/codec/der/decoder.py index 46621bf..973846b 100644 --- a/pyasn1/codec/der/decoder.py +++ b/pyasn1/codec/der/decoder.py @@ -112,6 +112,6 @@ def decodeStream(substrate, asn1Spec=None, **kwargs): def decode(substrate, asn1Spec=None, **kwargs): # TODO: Temporary solution before merging with upstream # It preserves the original API - substrate = BytesIO(substrate) - iterator = decodeStream(substrate, asn1Spec=asn1Spec, **kwargs) - return next(iterator), substrate.read() + substrate = asSeekableStream(substrate) + value = _decode(substrate, asn1Spec=asn1Spec, **kwargs) + return value, substrate.read() \ No newline at end of file -- cgit v1.2.1