From 5bbbeb6269f0402dbeb51200120f1057e2f6a9b5 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Fri, 14 Sep 2018 12:01:35 +0300 Subject: [PATCH] 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. --- VERSION | 2 +- doc/news.rst | 8 ++++++++ pyderasn.py | 4 ---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 7d5c902..bf77d54 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1 +4.2 diff --git a/doc/news.rst b/doc/news.rst index 21b73de..05f5df5 100644 --- 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 ed4071d..8857955 100755 --- 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: -- 2.44.0