aboutsummaryrefslogtreecommitdiff
path: root/pyasn1/type
diff options
context:
space:
mode:
authorIlya Etingof <etingof@gmail.com>2017-08-02 19:08:55 +0200
committerIlya Etingof <etingof@gmail.com>2017-08-02 19:08:55 +0200
commite68458f5196f31631485a9a86857f95f1a52afdb (patch)
tree05aff8bf0c89f12a2e97d6d936fce1ebe93da6ac /pyasn1/type
parent7ba223cc51acd1ae100816848d9ddd1332a276ed (diff)
downloadpyasn1-e68458f5196f31631485a9a86857f95f1a52afdb.tar.gz
OctetString.asNumbers caching removed
Diffstat (limited to 'pyasn1/type')
-rw-r--r--pyasn1/type/tag.py6
-rw-r--r--pyasn1/type/univ.py8
2 files changed, 4 insertions, 10 deletions
diff --git a/pyasn1/type/tag.py b/pyasn1/type/tag.py
index 001e0a0..df305a1 100644
--- a/pyasn1/type/tag.py
+++ b/pyasn1/type/tag.py
@@ -61,7 +61,7 @@ class Tag(object):
self.__tagFormat = tagFormat
self.__tagId = tagId
self.__tagClassId = tagClass, tagId
- self.__lazyHash = None
+ self.__hash = hash(self.__tagClassId)
def __str__(self):
return '[%s:%s:%s]' % (self.__tagClass, self.__tagFormat, self.__tagId)
@@ -90,9 +90,7 @@ class Tag(object):
return self.__tagClassId >= other
def __hash__(self):
- if self.__lazyHash is None:
- self.__lazyHash = hash(self.__tagClassId)
- return self.__lazyHash
+ return self.__hash
def __getitem__(self, idx):
if idx == 0:
diff --git a/pyasn1/type/univ.py b/pyasn1/type/univ.py
index 74a14f1..9371606 100644
--- a/pyasn1/type/univ.py
+++ b/pyasn1/type/univ.py
@@ -951,9 +951,7 @@ class OctetString(base.AbstractSimpleAsn1Item):
return str(self._value)
def asNumbers(self):
- if self.__asNumbersCache is None:
- self.__asNumbersCache = tuple([ord(x) for x in self._value])
- return self.__asNumbersCache
+ return tuple([ord(x) for x in self._value])
else:
def prettyIn(self, value):
@@ -991,9 +989,7 @@ class OctetString(base.AbstractSimpleAsn1Item):
return bytes(self._value)
def asNumbers(self):
- if self.__asNumbersCache is None:
- self.__asNumbersCache = tuple(self._value)
- return self.__asNumbersCache
+ return tuple(self._value)
def prettyOut(self, value):
if sys.version_info[0] <= 2: