diff options
author | Ilya Etingof <etingof@gmail.com> | 2018-07-29 08:48:50 +0200 |
---|---|---|
committer | Ilya Etingof <etingof@gmail.com> | 2018-07-29 09:23:39 +0200 |
commit | e5c30776b510a88f760ca701558778b08a591e9d (patch) | |
tree | cc44e15cac511603b9437bc0c80c989af091d4b3 /pyasn1 | |
parent | 4ad415d71beb6b466842e6c32ec6387b88a3dbae (diff) | |
download | pyasn1-git-e5c30776b510a88f760ca701558778b08a591e9d.tar.gz |
Fix some typos and prepare for 0.4.5
Diffstat (limited to 'pyasn1')
-rw-r--r-- | pyasn1/__init__.py | 2 | ||||
-rw-r--r-- | pyasn1/codec/ber/decoder.py | 4 | ||||
-rw-r--r-- | pyasn1/codec/ber/encoder.py | 12 | ||||
-rw-r--r-- | pyasn1/codec/cer/encoder.py | 2 | ||||
-rw-r--r-- | pyasn1/error.py | 2 | ||||
-rw-r--r-- | pyasn1/type/base.py | 12 | ||||
-rw-r--r-- | pyasn1/type/constraint.py | 2 | ||||
-rw-r--r-- | pyasn1/type/namedtype.py | 16 |
8 files changed, 28 insertions, 24 deletions
diff --git a/pyasn1/__init__.py b/pyasn1/__init__.py index e2e4c5c..68db4f1 100644 --- a/pyasn1/__init__.py +++ b/pyasn1/__init__.py @@ -1,7 +1,7 @@ import sys # https://www.python.org/dev/peps/pep-0396/ -__version__ = '0.4.4' +__version__ = '0.4.5' if sys.version_info[:2] < (2, 4): raise RuntimeError('PyASN1 requires Python 2.4 or later') diff --git a/pyasn1/codec/ber/decoder.py b/pyasn1/codec/ber/decoder.py index a27b3e0..514e91d 100644 --- a/pyasn1/codec/ber/decoder.py +++ b/pyasn1/codec/ber/decoder.py @@ -70,6 +70,10 @@ class ExplicitTagDecoder(AbstractSimpleDecoder): value, _ = decodeFun(head, asn1Spec, tagSet, length, **options) + if debug.logger & debug.flagDecoder: + debug.logger('explicit tag container carries %d octets of trailing payload (will be lost!): %s' % ( + len(_), debug.hexdump(_))) + return value, tail def indefLenValueDecoder(self, substrate, asn1Spec, diff --git a/pyasn1/codec/ber/encoder.py b/pyasn1/codec/ber/encoder.py index 0094b22..f77a8a5 100644 --- a/pyasn1/codec/ber/encoder.py +++ b/pyasn1/codec/ber/encoder.py @@ -305,7 +305,7 @@ class RealEncoder(AbstractItemEncoder): if m < 0: ms = -1 # mantissa sign if e < 0: - es = -1 # exponenta sign + es = -1 # exponent sign m *= ms if encbase == 8: m *= 2 ** (abs(e) % 3 * es) @@ -331,7 +331,7 @@ class RealEncoder(AbstractItemEncoder): return self._dropFloatingPoint(m, self.binEncBase, e) # auto choosing base 2/8/16 mantissa = [m, m, m] - exponenta = [e, e, e] + exponent = [e, e, e] sign = 1 encbase = 2 e = float('inf') @@ -339,9 +339,9 @@ class RealEncoder(AbstractItemEncoder): (sign, mantissa[i], encBase[i], - exponenta[i]) = self._dropFloatingPoint(mantissa[i], encBase[i], exponenta[i]) - if abs(exponenta[i]) < abs(e) or (abs(exponenta[i]) == abs(e) and mantissa[i] < m): - e = exponenta[i] + exponent[i]) = self._dropFloatingPoint(mantissa[i], encBase[i], exponent[i]) + if abs(exponent[i]) < abs(e) or (abs(exponent[i]) == abs(e) and mantissa[i] < m): + e = exponent[i] m = int(mantissa[i]) encbase = encBase[i] return sign, m, encbase, e @@ -364,7 +364,7 @@ class RealEncoder(AbstractItemEncoder): ms, m, encbase, e = self._chooseEncBase(value) if ms < 0: # mantissa sign fo |= 0x40 # sign bit - # exponenta & mantissa normalization + # exponent & mantissa normalization if encbase == 2: while m & 0x1 == 0: m >>= 1 diff --git a/pyasn1/codec/cer/encoder.py b/pyasn1/codec/cer/encoder.py index 768d3c1..fbe7cf5 100644 --- a/pyasn1/codec/cer/encoder.py +++ b/pyasn1/codec/cer/encoder.py @@ -41,7 +41,7 @@ class TimeEncoderMixIn(object): def encodeValue(self, value, asn1Spec, encodeFun, **options): # Encoding constraints: # - minutes are mandatory, seconds are optional - # - subseconds must NOT be zero + # - sub-seconds must NOT be zero # - no hanging fraction dot # - time in UTC (Z) # - only dot is allowed for fractions diff --git a/pyasn1/error.py b/pyasn1/error.py index c05e65c..31a221e 100644 --- a/pyasn1/error.py +++ b/pyasn1/error.py @@ -25,5 +25,5 @@ class SubstrateUnderrunError(PyAsn1Error): """Create pyasn1 exception object The `SubstrateUnderrunError` exception indicates insufficient serialised - data on input of a deserialisation routine. + data on input of a de-serialization routine. """ diff --git a/pyasn1/type/base.py b/pyasn1/type/base.py index adaab22..2f4ea4c 100644 --- a/pyasn1/type/base.py +++ b/pyasn1/type/base.py @@ -343,10 +343,10 @@ class AbstractSimpleAsn1Item(Asn1ItemBase): value = self._value - initilaizers = self.readOnly.copy() - initilaizers.update(kwargs) + initializers = self.readOnly.copy() + initializers.update(kwargs) - return self.__class__(value, **initilaizers) + return self.__class__(value, **initializers) def subtype(self, value=noValue, **kwargs): """Create a specialization of |ASN.1| schema or value object. @@ -540,10 +540,10 @@ class AbstractConstructedAsn1Item(Asn1ItemBase): """ cloneValueFlag = kwargs.pop('cloneValueFlag', False) - initilaizers = self.readOnly.copy() - initilaizers.update(kwargs) + initializers = self.readOnly.copy() + initializers.update(kwargs) - clone = self.__class__(**initilaizers) + clone = self.__class__(**initializers) if cloneValueFlag: self._cloneComponentValues(clone, cloneValueFlag) diff --git a/pyasn1/type/constraint.py b/pyasn1/type/constraint.py index a704331..15b887d 100644 --- a/pyasn1/type/constraint.py +++ b/pyasn1/type/constraint.py @@ -352,7 +352,7 @@ class InnerTypeConstraint(AbstractConstraint): if idx not in self.__multipleTypeConstraint: raise error.ValueConstraintError(value) constraint, status = self.__multipleTypeConstraint[idx] - if status == 'ABSENT': # XXX presense is not checked! + if status == 'ABSENT': # XXX presence is not checked! raise error.ValueConstraintError(value) constraint(value) diff --git a/pyasn1/type/namedtype.py b/pyasn1/type/namedtype.py index f162d19..0ce18df 100644 --- a/pyasn1/type/namedtype.py +++ b/pyasn1/type/namedtype.py @@ -265,18 +265,18 @@ class NamedTypes(object): return nameToPosMap def __computeAmbiguousTypes(self): - ambigiousTypes = {} - partialAmbigiousTypes = () + ambiguousTypes = {} + partialAmbiguousTypes = () for idx, namedType in reversed(tuple(enumerate(self.__namedTypes))): if namedType.isOptional or namedType.isDefaulted: - partialAmbigiousTypes = (namedType,) + partialAmbigiousTypes + partialAmbiguousTypes = (namedType,) + partialAmbiguousTypes else: - partialAmbigiousTypes = (namedType,) - if len(partialAmbigiousTypes) == len(self.__namedTypes): - ambigiousTypes[idx] = self + partialAmbiguousTypes = (namedType,) + if len(partialAmbiguousTypes) == len(self.__namedTypes): + ambiguousTypes[idx] = self else: - ambigiousTypes[idx] = NamedTypes(*partialAmbigiousTypes, **dict(terminal=True)) - return ambigiousTypes + ambiguousTypes[idx] = NamedTypes(*partialAmbiguousTypes, **dict(terminal=True)) + return ambiguousTypes def getTypeByPosition(self, idx): """Return ASN.1 type object by its position in fields set. |