diff options
| author | Jan Pipek <jan.pipek@gmail.com> | 2019-09-06 14:59:50 +0200 |
|---|---|---|
| committer | Ilya Etingof <etingof@gmail.com> | 2019-11-15 19:31:42 +0100 |
| commit | acc422a26d61237db975d3b4bbb836fc8b5a6ffb (patch) | |
| tree | e94629e5341c837f519cd7705faafe287bb31261 | |
| parent | 7bdade5c71642ad34487db53130cd0c3372dc860 (diff) | |
| download | pyasn1-git-acc422a26d61237db975d3b4bbb836fc8b5a6ffb.tar.gz | |
API that work with pyasn1-modules
| -rw-r--r-- | pyasn1/codec/ber/decoder.py | 6 | ||||
| -rw-r--r-- | pyasn1/codec/cer/decoder.py | 6 | ||||
| -rw-r--r-- | 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 f7a32eb..8acbf5d 100644 --- a/pyasn1/codec/ber/decoder.py +++ b/pyasn1/codec/ber/decoder.py @@ -1758,9 +1758,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 |