diff options
| author | Ilya Etingof <etingof@gmail.com> | 2019-06-23 10:15:12 +0200 |
|---|---|---|
| committer | Ilya Etingof <etingof@gmail.com> | 2019-06-23 10:50:37 +0200 |
| commit | 54dfd6246aeb4a63566f449f9df18f434c70a5be (patch) | |
| tree | 2f5a4299b13755bbbe17675f64b72638f0dda33e | |
| parent | 25cf116ef8d11bb0e08454c0f3635c9f4002c2d6 (diff) | |
| download | pyasn1-git-54dfd6246aeb4a63566f449f9df18f434c70a5be.tar.gz | |
Add `omitEmptyOptionals` encoder option
Added `omitEmptyOptionals` option which is respected by `Sequence`
and `Set` encoders. When `omitEmptyOptionals` is set to `True`, empty
initialized optional components are not encoded. Default is `False`.
| -rw-r--r-- | CHANGES.rst | 4 | ||||
| -rw-r--r-- | pyasn1/codec/ber/encoder.py | 25 |
2 files changed, 23 insertions, 6 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index dabdb33..7ebad6c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,7 +2,9 @@ Revision 0.4.6, released XX-01-2019 ----------------------------------- -No changes yet +- Added `omitEmptyOptionals` option which is respected by `Sequence` + and `Set` encoders. When `omitEmptyOptionals` is set to `True`, empty + initialized optional components are not encoded. Default is `False`. Revision 0.4.5, released 29-12-2018 ----------------------------------- diff --git a/pyasn1/codec/ber/encoder.py b/pyasn1/codec/ber/encoder.py index 65b8514..325ed46 100644 --- a/pyasn1/codec/ber/encoder.py +++ b/pyasn1/codec/ber/encoder.py @@ -4,6 +4,8 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pyasn1/license.html # +import sys + from pyasn1 import debug from pyasn1 import error from pyasn1.codec.ber import eoo @@ -93,9 +95,15 @@ class AbstractItemEncoder(object): # base tag? if not idx: - substrate, isConstructed, isOctets = self.encodeValue( - value, asn1Spec, encodeFun, **options - ) + try: + substrate, isConstructed, isOctets = self.encodeValue( + value, asn1Spec, encodeFun, **options + ) + + except error.PyAsn1Error: + exc = sys.exc_info() + raise error.PyAsn1Error( + 'Error encoding %r: %s' % (value, exc[1])) if LOG: LOG('encoded %svalue %s into %s' % ( @@ -518,6 +526,13 @@ class SequenceEncoder(AbstractItemEncoder): substrate = null + omitEmptyOptionals = options.get( + 'omitEmptyOptionals', self.omitEmptyOptionals) + + if LOG: + LOG('%sencoding empty OPTIONAL components' % ( + omitEmptyOptionals and 'not ' or '')) + if asn1Spec is None: # instance of ASN.1 schema value.verifySizeSpec() @@ -538,7 +553,7 @@ class SequenceEncoder(AbstractItemEncoder): LOG('not encoding DEFAULT component %r' % (namedType,)) continue - if self.omitEmptyOptionals: + if omitEmptyOptionals: options.update(ifNotEmpty=namedType.isOptional) chunk = encodeFun(component, asn1Spec, **options) @@ -575,7 +590,7 @@ class SequenceEncoder(AbstractItemEncoder): LOG('not encoding DEFAULT component %r' % (namedType,)) continue - if self.omitEmptyOptionals: + if omitEmptyOptionals: options.update(ifNotEmpty=namedType.isOptional) chunk = encodeFun(component, asn1Spec[idx], **options) |