Skip to content

Commit 50ec910

Browse files
[pyasn1] Fix componentType to accept Asn1Type in SequenceOf (#15442)
1 parent 9c855f3 commit 50ec910

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

stubs/ldap3/ldap3/protocol/novell.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class NmasSetUniversalPasswordResponseValue(Sequence):
4141
componentType: NamedTypes
4242

4343
class ReplicaList(SequenceOf):
44-
componentType: OctetString # type: ignore[assignment]
44+
componentType: OctetString
4545

4646
class ReplicaInfoRequestValue(Sequence):
4747
tagSet: TagSet

stubs/ldap3/ldap3/protocol/rfc4511.pyi

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ class AttributeValueAssertion(Sequence):
4545
class MatchingRuleId(LDAPString): ...
4646

4747
class Vals(SetOf):
48-
componentType: AttributeValue # type: ignore[assignment]
48+
componentType: AttributeValue
4949

5050
class ValsAtLeast1(SetOf):
51-
componentType: AttributeValue # type: ignore[assignment]
51+
componentType: AttributeValue
5252
subtypeSpec: ConstraintsIntersection
5353

5454
class PartialAttribute(Sequence):
@@ -58,7 +58,7 @@ class Attribute(Sequence):
5858
componentType: NamedTypes
5959

6060
class AttributeList(SequenceOf):
61-
componentType: Attribute # type: ignore[assignment]
61+
componentType: Attribute
6262

6363
class Simple(OctetString):
6464
tagSet: TagSet
@@ -97,7 +97,7 @@ class URI(LDAPString): ...
9797

9898
class Referral(SequenceOf):
9999
tagSet: TagSet
100-
componentType: URI # type: ignore[assignment]
100+
componentType: URI
101101

102102
class ServerSaslCreds(OctetString):
103103
tagSet: TagSet
@@ -117,7 +117,7 @@ class Control(Sequence):
117117

118118
class Controls(SequenceOf):
119119
tagSet: TagSet
120-
componentType: Control # type: ignore[assignment]
120+
componentType: Control
121121

122122
class Scope(Enumerated):
123123
namedValues: NamedValues
@@ -129,7 +129,7 @@ class TypesOnly(Boolean): ...
129129
class Selector(LDAPString): ...
130130

131131
class AttributeSelection(SequenceOf):
132-
componentType: Selector # type: ignore[assignment]
132+
componentType: Selector
133133

134134
class MatchingRule(MatchingRuleId):
135135
tagSet: TagSet
@@ -161,7 +161,7 @@ class Substring(Choice):
161161

162162
class Substrings(SequenceOf):
163163
subtypeSpec: ConstraintsIntersection
164-
componentType: Substring # type: ignore[assignment]
164+
componentType: Substring
165165

166166
class SubstringFilter(Sequence):
167167
tagSet: TagSet
@@ -170,12 +170,12 @@ class SubstringFilter(Sequence):
170170
class And(SetOf):
171171
tagSet: TagSet
172172
subtypeSpec: ConstraintsIntersection
173-
componentType: Filter # type: ignore[assignment]
173+
componentType: Filter
174174

175175
class Or(SetOf):
176176
tagSet: TagSet
177177
subtypeSpec: ConstraintsIntersection
178-
componentType: Filter # type: ignore[assignment]
178+
componentType: Filter
179179

180180
class Not(Choice): ...
181181

@@ -201,7 +201,7 @@ class Filter(Choice):
201201
componentType: NamedTypes
202202

203203
class PartialAttributeList(SequenceOf):
204-
componentType: PartialAttribute # type: ignore[assignment]
204+
componentType: PartialAttribute
205205

206206
class Operation(Enumerated):
207207
namedValues: NamedValues
@@ -210,7 +210,7 @@ class Change(Sequence):
210210
componentType: NamedTypes
211211

212212
class Changes(SequenceOf):
213-
componentType: Change # type: ignore[assignment]
213+
componentType: Change
214214

215215
class DeleteOldRDN(Boolean): ...
216216

@@ -256,7 +256,7 @@ class SearchRequest(Sequence):
256256
class SearchResultReference(SequenceOf):
257257
tagSet: TagSet
258258
subtypeSpec: ConstraintsIntersection
259-
componentType: URI # type: ignore[assignment]
259+
componentType: URI
260260

261261
class SearchResultEntry(Sequence):
262262
tagSet: TagSet

stubs/pyasn1/pyasn1/type/base.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ AbstractSimpleAsn1Item = SimpleAsn1Type
126126

127127
class ConstructedAsn1Type(Asn1Type):
128128
strictConstraints: bool
129-
componentType: namedtype.NamedTypes | None
129+
componentType: namedtype.NamedTypes | Asn1Type | None
130130
sizeSpec: constraint.ConstraintsIntersection
131131
def __init__(self, **kwargs) -> None: ...
132132
def __eq__(self, other): ...

stubs/pyasn1/pyasn1/type/univ.pyi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,13 @@ class Enumerated(Integer):
241241
namedValues: namedval.NamedValues
242242

243243
class SequenceOfAndSetOfBase(base.ConstructedAsn1Type):
244-
componentType: namedtype.NamedTypes | None
244+
componentType: base.Asn1Type | None
245245
tagSet: TagSet
246246
subtypeSpec: constraint.ConstraintsIntersection
247247
def __init__(
248248
self,
249249
*args,
250-
componentType: namedtype.NamedTypes | None = ...,
250+
componentType: base.Asn1Type | None = ...,
251251
tagSet: TagSet = ...,
252252
subtypeSpec: constraint.ConstraintsIntersection = ...,
253253
) -> None: ...

0 commit comments

Comments
 (0)