Skip to content

Commit 71f486e

Browse files
committed
Fix DeprecationWarning stacklevel for deprecated attributes (#101)
Fixes: #86
1 parent d7cb42d commit 71f486e

8 files changed

Lines changed: 8 additions & 8 deletions

File tree

pyasn1/codec/ber/decoder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2210,6 +2210,6 @@ def _callSubstrateFunV4asV5(substrateFunV4, asn1Object, substrate, length):
22102210

22112211
def __getattr__(attr: str):
22122212
if newAttr := {"tagMap": "TAG_MAP", "typeMap": "TYPE_MAP"}.get(attr):
2213-
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning)
2213+
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning, stacklevel=2)
22142214
return globals()[newAttr]
22152215
raise AttributeError(attr)

pyasn1/codec/ber/encoder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -949,6 +949,6 @@ def __call__(self, pyObject, asn1Spec=None, **options):
949949

950950
def __getattr__(attr: str):
951951
if newAttr := {"tagMap": "TAG_MAP", "typeMap": "TYPE_MAP"}.get(attr):
952-
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning)
952+
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning, stacklevel=2)
953953
return globals()[newAttr]
954954
raise AttributeError(attr)

pyasn1/codec/cer/decoder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,6 @@ class Decoder(decoder.Decoder):
144144

145145
def __getattr__(attr: str):
146146
if newAttr := {"tagMap": "TAG_MAP", "typeMap": "TYPE_MAP"}.get(attr):
147-
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning)
147+
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning, stacklevel=2)
148148
return globals()[newAttr]
149149
raise AttributeError(attr)

pyasn1/codec/cer/encoder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,6 @@ class Encoder(encoder.Encoder):
326326

327327
def __getattr__(attr: str):
328328
if newAttr := {"tagMap": "TAG_MAP", "typeMap": "TYPE_MAP"}.get(attr):
329-
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning)
329+
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning, stacklevel=2)
330330
return globals()[newAttr]
331331
raise AttributeError(attr)

pyasn1/codec/der/decoder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,6 @@ class Decoder(decoder.Decoder):
115115

116116
def __getattr__(attr: str):
117117
if newAttr := {"tagMap": "TAG_MAP", "typeMap": "TYPE_MAP"}.get(attr):
118-
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning)
118+
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning, stacklevel=2)
119119
return globals()[newAttr]
120120
raise AttributeError(attr)

pyasn1/codec/der/encoder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,6 @@ class Encoder(encoder.Encoder):
121121

122122
def __getattr__(attr: str):
123123
if newAttr := {"tagMap": "TAG_MAP", "typeMap": "TYPE_MAP"}.get(attr):
124-
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning)
124+
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning, stacklevel=2)
125125
return globals()[newAttr]
126126
raise AttributeError(attr)

pyasn1/codec/native/decoder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,6 @@ def __call__(self, pyObject, asn1Spec=None, **kwargs):
239239

240240
def __getattr__(attr: str):
241241
if newAttr := {"tagMap": "TAG_MAP", "typeMap": "TYPE_MAP"}.get(attr):
242-
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning)
242+
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning, stacklevel=2)
243243
return globals()[newAttr]
244244
raise AttributeError(attr)

pyasn1/codec/native/encoder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,6 @@ def __call__(self, pyObject, asn1Spec=None, **options):
280280

281281
def __getattr__(attr: str):
282282
if newAttr := {"tagMap": "TAG_MAP", "typeMap": "TYPE_MAP"}.get(attr):
283-
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning)
283+
warnings.warn(f"{attr} is deprecated. Please use {newAttr} instead.", DeprecationWarning, stacklevel=2)
284284
return globals()[newAttr]
285285
raise AttributeError(attr)

0 commit comments

Comments
 (0)