Revert "CHOICE should proxy lenindef/bered attributed of underlying object"

This reverts commit 795d767d71d08311fe4e57efaa7521455db1d574.

Only bered-attribute should exist. lenindef/ber_encoded are properties
of underlying choice's value.

diff --git a/VERSION b/VERSION
index 7d5c902e777905446c67de7e52a945b88fd2038c..bf77d549685a9e09678fbbda05a071b312cf2de3 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1
+4.2

diff --git a/doc/news.rst b/doc/news.rst
index 21b73defda79cd5360b1e4e98e5441f75069a328..05f5df56b43ef8e42393c2daea023ebb2e26621b 100644 (file)
--- a/doc/news.rst
+++ b/doc/news.rst
@@ -1,6 +1,14 @@
 News
 ====
 
+.. _release4.2:
+
+4.2
+---
+* Removed ``lenindef``, ``ber_encoded`` attributes from the Choice --
+  they must be taken from underlying value, as Choice does not have its
+  own encoding
+
 .. _release4.1:
 
 4.1

diff --git a/pyderasn.py b/pyderasn.py
index ed4071d8dffc5896bd0a92719baeee52220653b4..88579558b731b42143a1363c07226e54f274a87e 100755 (executable)
--- a/pyderasn.py
+++ b/pyderasn.py
@@ -3998,8 +3998,6 @@ class Choice(Obj):
             _decoded=(offset, 0, value.fulllen),
         )
         obj._value = (choice, value)
-        obj.lenindef = value.lenindef
-        obj.ber_encoded = value.ber_encoded
         return obj, tail
 
     def __repr__(self):
@@ -4023,8 +4021,6 @@ class Choice(Obj):
             llen=self.llen,
             vlen=self.vlen,
             expl_lenindef=self.expl_lenindef,
-            lenindef=self.lenindef,
-            ber_encoded=self.ber_encoded,
             bered=self.bered,
         )
         if self.ready: