VERSION | 2 +- doc/install.rst | 10 +++++----- doc/news.rst | 7 +++++++ makedist.sh | 4 ++-- pyderasn.py | 4 ++-- diff --git a/VERSION b/VERSION index bcc3d79cb7d0ca8e46edd533d676782b19ec2f6780f3de6f5f60d559eaa3ebad..25a9b0fc4ded141ddf807f2130da3842b793869264705eb090bcbde456c303dc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.3 +5.4 diff --git a/doc/install.rst b/doc/install.rst index bf77bd3c702e901b51679780797a4e37ba34422f4fed8accf6070bf76a90e78f..69ddcf95f151715c4e7b76d5f39b9bfa4a33ed8b1d983349cee14ae92ec00f28 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -4,11 +4,11 @@ Preferable way is to :ref:`download ` tarball with the signature from `official website `__:: - $ wget http://pyderasn.cypherpunks.ru/pyderasn-3.13.tar.xz - $ wget http://pyderasn.cypherpunks.ru/pyderasn-3.13.tar.xz.sig - $ gpg --verify pyderasn-3.13.tar.xz.sig pyderasn-3.13.tar.xz - $ xz -d < pyderasn-3.13.tar.xz | tar xf - - $ cd pyderasn-3.13 + $ [fetch|wget] http://pyderasn.cypherpunks.ru/pyderasn-|VERSION|.tar.xz + $ [fetch|wget] http://pyderasn.cypherpunks.ru/pyderasn-5.4.tar.xz.sig + $ gpg --verify pyderasn-5.4.tar.xz.sig pyderasn-5.4.tar.xz + $ xz --decompress --stdout pyderasn-5.4.tar.xz | tar xf - + $ cd pyderasn-5.4 $ python setup.py install # or copy pyderasn.py (+six.py, possibly termcolor.py) to your PYTHONPATH diff --git a/doc/news.rst b/doc/news.rst index afbd2577397f85300239805937edcdafa9cddb9b887d456b111fce98178c2547..872edc2ddf43666dc1d76ed1fec8b21f106b87867b2b73d84e3d2de285f9206f 100644 --- a/doc/news.rst +++ b/doc/news.rst @@ -1,6 +1,13 @@ News ==== +.. _release5.4: + +5.4 +--- +* Do not shadow underlying ``DecodeError`` during decoding of optional + sequence's field + .. _release5.3: 5.3 diff --git a/makedist.sh b/makedist.sh index f340a7956098f0ad39b2ea152d720b58a305833453927ac4d69ee253c26eefec..ad250d2cdbff6fa3715d21885eb0204f19e35cfb30dff61414b0aa4211e23209 100755 --- a/makedist.sh +++ b/makedist.sh @@ -15,10 +15,10 @@ tar cfI - $tmp/includes | tar xfC - $tmp/pyderasn-"$release" PYTHONPATH="$tmp/pyderasn-$release" make -C $tmp/pyderasn-"$release"/doc -tar xvfC doc/download/six-*.tar.xz $tmp --include "*/*six.py" +tar xvfC doc/download/six-1.13.0.tar.xz $tmp --include "*/*six.py" mv -v $tmp/six-*/*six.py $tmp/pyderasn-"$release" -tar xvfC doc/download/termcolor-*.tar.xz $tmp --include "*/termcolor.py" +tar xvfC doc/download/termcolor-1.1.0.tar.xz $tmp --include "*/termcolor.py" mv -v $tmp/termcolor-*/termcolor.py $tmp/pyderasn-"$release" cd $tmp diff --git a/pyderasn.py b/pyderasn.py index 00de8739193fa7a0f58a82017781b79d1bb28a545f10762b28b2a84c39335e59..93bedecbabb8b2fbaa585b1e3bacd3e43f9d890d9c3fc8411d27d39948f58d75 100755 --- a/pyderasn.py +++ b/pyderasn.py @@ -4885,8 +4885,8 @@ decode_path=sub_decode_path, ctx=ctx, _ctx_immutable=False, ) - except TagMismatch: - if spec.optional: + except TagMismatch as err: + if (len(err.decode_path) == len(decode_path) + 1) and spec.optional: continue raise