from os import environ
from string import ascii_letters
from string import digits
+from sys import version_info
from unicodedata import category as unicat
from six import add_metaclass
def colored(what, *args, **kwargs):
return what
-__version__ = "6.2"
+__version__ = "6.3"
__all__ = (
"Any",
EOC_LEN = len(EOC)
LENINDEF = b"\x80" # length indefinite mark
LENINDEF_PP_CHAR = "I" if PY2 else "∞"
-NAMEDTUPLE_KWARGS = {} if PY2 else {"module": __name__}
+NAMEDTUPLE_KWARGS = {} if version_info < (3, 6) else {"module": __name__}
SET01 = frozenset("01")
DECIMALS = frozenset(digits)
DECIMAL_SIGNS = ".,"
if len(path) != len(sub_decode_path):
continue
for p1, p2 in zip(path, sub_decode_path):
- if (p1 != any) and (p1 != p2):
+ if (not p1 is any) and (p1 != p2):
break
else:
return define
return spec.default
return None
- def _encoded_values(self):
- raws = []
+ def _values_for_encoding(self):
for name, spec in iteritems(self.specs):
value = self._value.get(name)
if value is None:
if spec.optional:
continue
raise ObjNotReady(name)
- raws.append(value.encode())
- return raws
+ yield value
def _encode(self):
- v = b"".join(self._encoded_values())
+ v = b"".join(v.encode() for v in self._values_for_encoding())
return b"".join((self.tag, len_encode(len(v)), v))
def _decode(self, tlv, offset, decode_path, ctx, tag_only):
.. _allow_unordered_set_ctx:
DER prohibits unordered values encoding and will raise an error
- during decode. If If :ref:`bered <bered_ctx>` context option is set,
- then no error will occure. Also you can disable strict values
+ during decode. If :ref:`bered <bered_ctx>` context option is set,
+ then no error will occur. Also you can disable strict values
ordering check by setting ``"allow_unordered_set": True``
:ref:`context <ctx>` option.
"""
asn1_type_name = "SET"
def _encode(self):
- raws = self._encoded_values()
+ raws = [v.encode() for v in self._values_for_encoding()]
raws.sort()
v = b"".join(raws)
return b"".join((self.tag, len_encode(len(v)), v))
def __getitem__(self, key):
return self._value[key]
- def _encoded_values(self):
- return [v.encode() for v in self._value]
+ def _values_for_encoding(self):
+ return iter(self._value)
def _encode(self):
- v = b"".join(self._encoded_values())
+ v = b"".join(v.encode() for v in self._values_for_encoding())
return b"".join((self.tag, len_encode(len(v)), v))
def _decode(self, tlv, offset, decode_path, ctx, tag_only, ordering_check=False):
asn1_type_name = "SET OF"
def _encode(self):
- raws = self._encoded_values()
+ raws = [v.encode() for v in self._values_for_encoding()]
raws.sort()
v = b"".join(raws)
return b"".join((self.tag, len_encode(len(v)), v))