diff options
author | Ilya Etingof <etingof@gmail.com> | 2019-11-23 09:57:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-23 09:57:24 +0100 |
commit | 2b646e07d5d83f0892fa2a809ae4c981430cb12c (patch) | |
tree | 20b10450bced84c425ca0735b4ee7202e68ee1ec /pyasn1/type/base.py | |
parent | 788af3c44edc2ebd079eda3f7a4ae2f9931446fd (diff) | |
parent | f10434e31f9293c4e739ac6c5d1519f407bd1540 (diff) | |
download | pyasn1-git-2b646e07d5d83f0892fa2a809ae4c981430cb12c.tar.gz |
Merge branch 'master' into streamoptimum37
Diffstat (limited to 'pyasn1/type/base.py')
-rw-r--r-- | pyasn1/type/base.py | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/pyasn1/type/base.py b/pyasn1/type/base.py index 994f1c9..f0ef270 100644 --- a/pyasn1/type/base.py +++ b/pyasn1/type/base.py @@ -7,7 +7,6 @@ import sys from pyasn1 import error -from pyasn1.compat import calling from pyasn1.type import constraint from pyasn1.type import tag from pyasn1.type import tagmap @@ -179,31 +178,31 @@ class NoValue(object): Any operation attempted on the *noValue* object will raise the *PyAsn1Error* exception. """ - skipMethods = set( - ('__slots__', - # attributes - '__getattribute__', - '__getattr__', - '__setattr__', - '__delattr__', - # class instance - '__class__', - '__init__', - '__del__', - '__new__', - '__repr__', - '__qualname__', - '__objclass__', - 'im_class', - '__sizeof__', - # pickle protocol - '__reduce__', - '__reduce_ex__', - '__getnewargs__', - '__getinitargs__', - '__getstate__', - '__setstate__') - ) + skipMethods = { + '__slots__', + # attributes + '__getattribute__', + '__getattr__', + '__setattr__', + '__delattr__', + # class instance + '__class__', + '__init__', + '__del__', + '__new__', + '__repr__', + '__qualname__', + '__objclass__', + 'im_class', + '__sizeof__', + # pickle protocol + '__reduce__', + '__reduce_ex__', + '__getnewargs__', + '__getinitargs__', + '__getstate__', + '__setstate__', + } _instance = None @@ -220,7 +219,7 @@ class NoValue(object): if (name not in cls.skipMethods and name.startswith('__') and name.endswith('__') and - calling.callable(getattr(typ, name)))] + callable(getattr(typ, name)))] for name in set(op_names): setattr(cls, name, getPlug(name)) |