Restored CLI workability

diff --git a/VERSION b/VERSION
index 0f0fefae5ac96803e7227191df7a6974709eb45d..5904f7adec1a0d8e5e10d8e72fcff747645ef796 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.1
+7.2

diff --git a/doc/install.rst b/doc/install.rst
index 54e7dfa83b3fde78d0411fcc89ea536f90e41aa0..e57faadedc7a443c1262a0a5a838970b6fb8378e 100644 (file)
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -4,11 +4,11 @@ Install
 Preferable way is to :ref:`download <download>` tarball with the
 signature from `official website <http://pyderasn.cypherpunks.ru/>`__::
 
-    $ [fetch|wget] http://pyderasn.cypherpunks.ru/pyderasn-7.1.tar.xz
-    $ [fetch|wget] http://pyderasn.cypherpunks.ru/pyderasn-7.1.tar.xz.sig
-    $ gpg --verify pyderasn-7.1.tar.xz.sig pyderasn-7.1.tar.xz
-    $ xz --decompress --stdout pyderasn-7.1.tar.xz | tar xf -
-    $ cd pyderasn-7.1
+    $ [fetch|wget] http://pyderasn.cypherpunks.ru/pyderasn-7.2.tar.xz
+    $ [fetch|wget] http://pyderasn.cypherpunks.ru/pyderasn-7.2.tar.xz.sig
+    $ gpg --verify pyderasn-7.2.tar.xz.sig pyderasn-7.2.tar.xz
+    $ xz --decompress --stdout pyderasn-7.2.tar.xz | tar xf -
+    $ cd pyderasn-7.2
     $ python setup.py install
     # or copy pyderasn.py (+six.py, possibly termcolor.py) to your PYTHONPATH
 
@@ -19,7 +19,7 @@ You can also find it mirrored on :ref:`download <download>` page.
 You could use pip (**no** OpenPGP authentication is performed!) with PyPI::
 
     $ cat > requirements.txt <<EOF
-    pyderasn==7.1 --hash=sha256:TO-BE-FILLED
+    pyderasn==7.2 --hash=sha256:TO-BE-FILLED
     six==1.14.0 --hash=sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a
     EOF
     $ pip install --requirement requirements.txt

diff --git a/doc/news.rst b/doc/news.rst
index ec93f52a4413ea275a87f97f433afd1ce39c97d5..8ed34217d76109acccd8f260f2503e156bb58cbe 100644 (file)
--- a/doc/news.rst
+++ b/doc/news.rst
@@ -1,6 +1,13 @@
 News
 ====
 
+.. _release7.2:
+
+7.2
+---
+
+* Restored workability of some command line options
+
 .. _release7.1:
 
 7.1

diff --git a/pyderasn.py b/pyderasn.py
index 303018d154378c1cb06ba84046f4e3522cd4df82..120fb8c53198f18baa52b8c8d3cd874877457d37 100755 (executable)
--- a/pyderasn.py
+++ b/pyderasn.py
@@ -1124,7 +1124,7 @@ except ImportError:  # pragma: no cover
     def colored(what, *args, **kwargs):
         return what
 
-__version__ = "7.1"
+__version__ = "7.2"
 
 __all__ = (
     "agg_octet_string",
@@ -7053,6 +7053,7 @@ def generic_decoder():  # pragma: no cover
             with_colours=False,
             with_decode_path=False,
             decode_path_only=(),
+            decode_path=(),
     ):
         def _pprint_pps(pps):
             for pp in pps:
@@ -7084,7 +7085,7 @@ def generic_decoder():  # pragma: no cover
                 else:
                     for row in _pprint_pps(pp):
                         yield row
-        return "\n".join(_pprint_pps(obj.pps()))
+        return "\n".join(_pprint_pps(obj.pps(decode_path)))
     return SEQUENCEOF(), pprint_any
 
 
@@ -7149,9 +7150,9 @@ def main():  # pragma: no cover
         [obj_by_path(_path) for _path in (args.oids or "").split(",")]
         if args.oids else ()
     )
+    from functools import partial
     if args.schema:
         schema = obj_by_path(args.schema)
-        from functools import partial
         pprinter = partial(pprint, big_blobs=True)
     else:
         schema, pprinter = generic_decoder()