Bump pyasn1 to 0.5.* (#10801)

Author: Avasam

stubs/pyasn1/@tests/stubtest_allowlist.txt

@@ -8,3 +8,9 @@ pyasn1.codec.native.encoder.SetEncoder.protoDict
 # Attempted "__ne__" operation on ASN.1 schema object
 pyasn1.type.base
 pyasn1.type.univ
+
+# Specifying kwargs
+pyasn1.codec.ber.decoder.Decoder.__call__
+pyasn1.codec.ber.decoder.StreamingDecoder.__init__
+pyasn1.codec.native.decoder.Decoder.__init__
+pyasn1.codec.native.encoder.Encoder.__init__

stubs/pyasn1/METADATA.toml

@@ -1,2 +1,2 @@
-version = "0.4.*"
+version = "0.5.*"
 upstream_repository = "https://github.com/pyasn1/pyasn1"

stubs/pyasn1/pyasn1/__init__.pyi

@@ -0,0 +1,3 @@
+from typing_extensions import Final
+
+__version__: Final[str]

stubs/pyasn1/pyasn1/codec/ber/decoder.pyi

@@ -6,7 +6,9 @@ from pyasn1.type import base, char, univ, useful
 from pyasn1.type.base import Asn1Type
 from pyasn1.type.tag import TagSet
 
-class AbstractDecoder:
+__all__ = ["StreamingDecoder", "Decoder", "decode"]
+
+class AbstractPayloadDecoder:
     protoComponent: Asn1Type | None
     @abstractmethod
     def valueDecoder(
@@ -33,11 +35,11 @@ class AbstractDecoder:
         **options,
     ) -> None: ...
 
-class AbstractSimpleDecoder(AbstractDecoder, metaclass=ABCMeta):
+class AbstractSimplePayloadDecoder(AbstractPayloadDecoder, metaclass=ABCMeta):
     @staticmethod
-    def substrateCollector(asn1Object, substrate, length): ...
+    def substrateCollector(asn1Object, substrate, length, options): ...
 
-class ExplicitTagDecoder(AbstractSimpleDecoder):
+class RawPayloadDecoder(AbstractSimplePayloadDecoder):
     protoComponent: univ.Any
     def valueDecoder(
         self,
@@ -62,7 +64,7 @@ class ExplicitTagDecoder(AbstractSimpleDecoder):
         **options,
     ): ...
 
-class IntegerDecoder(AbstractSimpleDecoder):
+class IntegerPayloadDecoder(AbstractSimplePayloadDecoder):
     protoComponent: univ.Integer
     def valueDecoder(
         self,
@@ -76,10 +78,10 @@ class IntegerDecoder(AbstractSimpleDecoder):
         **options,
     ): ...
 
-class BooleanDecoder(IntegerDecoder):
+class BooleanPayloadDecoder(IntegerPayloadDecoder):
     protoComponent: univ.Boolean
 
-class BitStringDecoder(AbstractSimpleDecoder):
+class BitStringPayloadDecoder(AbstractSimplePayloadDecoder):
     protoComponent: univ.BitString
     supportConstructedForm: bool
     def valueDecoder(
@@ -105,7 +107,7 @@ class BitStringDecoder(AbstractSimpleDecoder):
         **options,
     ): ...
 
-class OctetStringDecoder(AbstractSimpleDecoder):
+class OctetStringPayloadDecoder(AbstractSimplePayloadDecoder):
     protoComponent: univ.OctetString
     supportConstructedForm: bool
     def valueDecoder(
@@ -131,7 +133,7 @@ class OctetStringDecoder(AbstractSimpleDecoder):
         **options,
     ): ...
 
-class NullDecoder(AbstractSimpleDecoder):
+class NullPayloadDecoder(AbstractSimplePayloadDecoder):
     protoComponent: univ.Null
     def valueDecoder(
         self,
@@ -145,7 +147,7 @@ class NullDecoder(AbstractSimpleDecoder):
         **options,
     ): ...
 
-class ObjectIdentifierDecoder(AbstractSimpleDecoder):
+class ObjectIdentifierPayloadDecoder(AbstractSimplePayloadDecoder):
     protoComponent: univ.ObjectIdentifier
     def valueDecoder(
         self,
@@ -159,7 +161,7 @@ class ObjectIdentifierDecoder(AbstractSimpleDecoder):
         **options,
     ): ...
 
-class RealDecoder(AbstractSimpleDecoder):
+class RealPayloadDecoder(AbstractSimplePayloadDecoder):
     protoComponent: univ.Real
     def valueDecoder(
         self,
@@ -173,10 +175,10 @@ class RealDecoder(AbstractSimpleDecoder):
         **options,
     ): ...
 
-class AbstractConstructedDecoder(AbstractDecoder, metaclass=ABCMeta):
+class AbstractConstructedPayloadDecoder(AbstractPayloadDecoder, metaclass=ABCMeta):
     protoComponent: base.ConstructedAsn1Type | None
 
-class UniversalConstructedTypeDecoder(AbstractConstructedDecoder):
+class ConstructedPayloadDecoderBase(AbstractConstructedPayloadDecoder):
     protoRecordComponent: univ.SequenceAndSetBase | None
     protoSequenceComponent: univ.SequenceOfAndSetOfBase | None
     def valueDecoder(
@@ -202,27 +204,27 @@ class UniversalConstructedTypeDecoder(AbstractConstructedDecoder):
         **options,
     ): ...
 
-class SequenceOrSequenceOfDecoder(UniversalConstructedTypeDecoder):
+class SequenceOrSequenceOfPayloadDecoder(ConstructedPayloadDecoderBase):
     protoRecordComponent: univ.Sequence
     protoSequenceComponent: univ.SequenceOf
 
-class SequenceDecoder(SequenceOrSequenceOfDecoder):
+class SequencePayloadDecoder(SequenceOrSequenceOfPayloadDecoder):
     protoComponent: univ.Sequence
 
-class SequenceOfDecoder(SequenceOrSequenceOfDecoder):
+class SequenceOfPayloadDecoder(SequenceOrSequenceOfPayloadDecoder):
     protoComponent: univ.SequenceOf
 
-class SetOrSetOfDecoder(UniversalConstructedTypeDecoder):
+class SetOrSetOfPayloadDecoder(ConstructedPayloadDecoderBase):
     protoRecordComponent: univ.Set
     protoSequenceComponent: univ.SetOf
 
-class SetDecoder(SetOrSetOfDecoder):
+class SetPayloadDecoder(SetOrSetOfPayloadDecoder):
     protoComponent: univ.Set
 
-class SetOfDecoder(SetOrSetOfDecoder):
+class SetOfPayloadDecoder(SetOrSetOfPayloadDecoder):
     protoComponent: univ.SetOf
 
-class ChoiceDecoder(AbstractConstructedDecoder):
+class ChoicePayloadDecoder(AbstractConstructedPayloadDecoder):
     protoComponent: univ.Choice
     def valueDecoder(
         self,
@@ -247,7 +249,7 @@ class ChoiceDecoder(AbstractConstructedDecoder):
         **options,
     ): ...
 
-class AnyDecoder(AbstractSimpleDecoder):
+class AnyPayloadDecoder(AbstractSimplePayloadDecoder):
     protoComponent: univ.Any
     def valueDecoder(
         self,
@@ -272,53 +274,61 @@ class AnyDecoder(AbstractSimpleDecoder):
         **options,
     ): ...
 
-class UTF8StringDecoder(OctetStringDecoder):
+class UTF8StringPayloadDecoder(OctetStringPayloadDecoder):
     protoComponent: char.UTF8String
 
-class NumericStringDecoder(OctetStringDecoder):
+class NumericStringPayloadDecoder(OctetStringPayloadDecoder):
     protoComponent: char.NumericString
 
-class PrintableStringDecoder(OctetStringDecoder):
+class PrintableStringPayloadDecoder(OctetStringPayloadDecoder):
     protoComponent: char.PrintableString
 
-class TeletexStringDecoder(OctetStringDecoder):
+class TeletexStringPayloadDecoder(OctetStringPayloadDecoder):
     protoComponent: char.TeletexString
 
-class VideotexStringDecoder(OctetStringDecoder):
+class VideotexStringPayloadDecoder(OctetStringPayloadDecoder):
     protoComponent: char.VideotexString
 
-class IA5StringDecoder(OctetStringDecoder):
+class IA5StringPayloadDecoder(OctetStringPayloadDecoder):
     protoComponent: char.IA5String
 
-class GraphicStringDecoder(OctetStringDecoder):
+class GraphicStringPayloadDecoder(OctetStringPayloadDecoder):
     protoComponent: char.GraphicString
 
-class VisibleStringDecoder(OctetStringDecoder):
+class VisibleStringPayloadDecoder(OctetStringPayloadDecoder):
     protoComponent: char.VisibleString
 
-class GeneralStringDecoder(OctetStringDecoder):
+class GeneralStringPayloadDecoder(OctetStringPayloadDecoder):
     protoComponent: char.GeneralString
 
-class UniversalStringDecoder(OctetStringDecoder):
+class UniversalStringPayloadDecoder(OctetStringPayloadDecoder):
     protoComponent: char.UniversalString
 
-class BMPStringDecoder(OctetStringDecoder):
+class BMPStringPayloadDecoder(OctetStringPayloadDecoder):
     protoComponent: char.BMPString
 
-class ObjectDescriptorDecoder(OctetStringDecoder):
+class ObjectDescriptorPayloadDecoder(OctetStringPayloadDecoder):
     protoComponent: useful.ObjectDescriptor
 
-class GeneralizedTimeDecoder(OctetStringDecoder):
+class GeneralizedTimePayloadDecoder(OctetStringPayloadDecoder):
     protoComponent: useful.GeneralizedTime
 
-class UTCTimeDecoder(OctetStringDecoder):
+class UTCTimePayloadDecoder(OctetStringPayloadDecoder):
     protoComponent: useful.UTCTime
 
-class Decoder:
+TAG_MAP: dict[TagSet, AbstractPayloadDecoder]
+TYPE_MAP: dict[int, AbstractPayloadDecoder]
+# deprecated aliases
+tagMap = TAG_MAP
+typeMap = TYPE_MAP
+
+class SingleItemDecoder:
     defaultErrorState: int
-    defaultRawDecoder: AnyDecoder
+    defaultRawDecoder: AnyPayloadDecoder
     supportIndefLength: bool
-    def __init__(self, tagMap, typeMap={}) -> None: ...
+    TAG_MAP: dict[TagSet, AbstractPayloadDecoder]
+    TYPE_MAP: dict[int, AbstractPayloadDecoder]
+    def __init__(self, tagMap=..., typeMap=..., **ignored: Unused) -> None: ...
     def __call__(
         self,
         substrate,
@@ -332,3 +342,15 @@ class Decoder:
     ): ...
 
 decode: Decoder
+
+class StreamingDecoder:
+    SINGLE_ITEM_DECODER: type[SingleItemDecoder]
+
+    def __init__(self, substrate, asn1Spec=None, tagMap=..., typeMap=..., **ignored: Unused) -> None: ...
+    def __iter__(self): ...
+
+class Decoder:
+    STREAMING_DECODER: type[StreamingDecoder]
+
+    @classmethod
+    def __call__(cls, substrate, asn1Spec=None, tagMap=..., typeMap=..., **ignored: Unused): ...

stubs/pyasn1/pyasn1/codec/ber/encoder.pyi

@@ -1,7 +1,10 @@
-from _typeshed import Incomplete
+from _typeshed import Incomplete, Unused
 from abc import abstractmethod
 
 from pyasn1.type.base import Asn1Type
+from pyasn1.type.tag import TagSet
+
+__all__ = ["Encoder", "encode"]
 
 class AbstractItemEncoder:
     supportIndefLenMode: bool
@@ -58,10 +61,25 @@ class ChoiceEncoder(AbstractItemEncoder):
 class AnyEncoder(OctetStringEncoder):
     def encodeValue(self, value, asn1Spec, encodeFun, **options): ...
 
-class Encoder:
+TAG_MAP: dict[TagSet, AbstractItemEncoder]
+TYPE_MAP: dict[int, AbstractItemEncoder]
+# deprecated aliases
+tagMap = TAG_MAP
+typeMap = TYPE_MAP
+
+class SingleItemEncoder:
     fixedDefLengthMode: bool | None
     fixedChunkSize: int | None
-    def __init__(self, tagMap, typeMap={}) -> None: ...
+    TAG_MAP: dict[TagSet, AbstractItemEncoder]
+    TYPE_MAP: dict[int, AbstractItemEncoder]
+
+    def __init__(self, tagMap=..., typeMap=..., **ignored: Unused) -> None: ...
     def __call__(self, value, asn1Spec: Asn1Type | None = None, **options): ...
 
+class Encoder:
+    SINGLE_ITEM_ENCODER: type[SingleItemEncoder]
+
+    def __init__(self, tagMap=..., typeMap=..., **options: Unused) -> None: ...
+    def __call__(self, pyObject, asn1Spec: Asn1Type | None = None, **options): ...
+
 encode: Encoder

stubs/pyasn1/pyasn1/codec/ber/eoo.pyi

@@ -1,6 +1,8 @@
 from pyasn1.type import base
 from pyasn1.type.tag import TagSet
 
+__all__ = ["endOfOctets"]
+
 class EndOfOctets(base.SimpleAsn1Type):
     defaultValue: int
     tagSet: TagSet

stubs/pyasn1/pyasn1/codec/cer/decoder.pyi

@@ -4,7 +4,9 @@ from pyasn1.codec.ber import decoder
 from pyasn1.type import univ
 from pyasn1.type.tag import TagSet
 
-class BooleanDecoder(decoder.AbstractSimpleDecoder):
+__all__ = ["decode", "StreamingDecoder"]
+
+class BooleanPayloadDecoder(decoder.AbstractSimplePayloadDecoder):
     protoComponent: univ.Boolean
     def valueDecoder(
         self,
@@ -18,10 +20,24 @@ class BooleanDecoder(decoder.AbstractSimpleDecoder):
         **options,
     ): ...
 
-BitStringDecoder = decoder.BitStringDecoder
-OctetStringDecoder = decoder.OctetStringDecoder
-RealDecoder = decoder.RealDecoder
+BitStringPayloadDecoder = decoder.BitStringPayloadDecoder
+OctetStringPayloadDecoder = decoder.OctetStringPayloadDecoder
+RealPayloadDecoder = decoder.RealPayloadDecoder
+
+TAG_MAP: dict[TagSet, decoder.AbstractPayloadDecoder]
+TYPE_MAP: dict[int, decoder.AbstractPayloadDecoder]
+# deprecated aliases
+tagMap = TAG_MAP
+typeMap = TYPE_MAP
+
+class SingleItemDecoder(decoder.SingleItemDecoder):
+    TAG_MAP: dict[TagSet, decoder.AbstractPayloadDecoder]
+    TYPE_MAP: dict[int, decoder.AbstractPayloadDecoder]
+
+class StreamingDecoder(decoder.StreamingDecoder):
+    SINGLE_ITEM_DECODER: type[SingleItemDecoder]
 
-class Decoder(decoder.Decoder): ...
+class Decoder(decoder.Decoder):
+    STREAMING_DECODER: type[StreamingDecoder]
 
 decode: Decoder

stubs/pyasn1/pyasn1/codec/cer/encoder.pyi

@@ -1,6 +1,9 @@
 from typing import ClassVar
 
 from pyasn1.codec.ber import encoder
+from pyasn1.type.tag import TagSet
+
+__all__ = ["Encoder", "encode"]
 
 class BooleanEncoder(encoder.IntegerEncoder):
     def encodeValue(self, value, asn1Spec, encodeFun, **options): ...
@@ -33,8 +36,20 @@ class SetEncoder(encoder.SequenceEncoder):
 class SequenceEncoder(encoder.SequenceEncoder):
     omitEmptyOptionals: bool
 
-class Encoder(encoder.Encoder):
+TAG_MAP: dict[TagSet, encoder.AbstractItemEncoder]
+TYPE_MAP: dict[int, encoder.AbstractItemEncoder]
+# deprecated aliases
+tagMap = TAG_MAP
+typeMap = TYPE_MAP
+
+class SingleItemEncoder(encoder.SingleItemEncoder):
     fixedDefLengthMode: bool
     fixedChunkSize: int
 
+    TAG_MAP: dict[TagSet, encoder.AbstractItemEncoder]
+    TYPE_MAP: dict[int, encoder.AbstractItemEncoder]
+
+class Encoder(encoder.Encoder):
+    SINGLE_ITEM_ENCODER: type[SingleItemEncoder]
+
 encode: Encoder