From 51612d30425d074a4dea146fd5a8bb93e582c29d Mon Sep 17 00:00:00 2001 From: mara004 <geisserml@gmail.com> Date: Mon, 11 Dec 2023 16:28:56 +0100 Subject: [PATCH] Counterpart to ctypesgen library_sharing branch (#285) --- src/pypdfium2/__main__.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pypdfium2/__main__.py b/src/pypdfium2/__main__.py index 0f459c0bb..3864a4691 100644 --- a/src/pypdfium2/__main__.py +++ b/src/pypdfium2/__main__.py @@ -5,10 +5,17 @@ import argparse import importlib from pypdfium2.version import PYPDFIUM_INFO, PDFIUM_INFO -# the * import in pypdfium2.raw loses underscore-prefixed members, so import from the direct origin -from pypdfium2_raw.bindings import _loader_info as loader_info from pypdfium2._cli._parsers import setup_logging +try: + from pypdfium2_raw.bindings import _libs_info + pdfium_path = _libs_info["pdfium"]["path"] +except ImportError: + # retained for downward compatibility with conda pypdfium2_raw <= 6164 by date of initial build + # actually it's the ctypesgen version that matters, but we don't have info about that + from pypdfium2_raw.bindings import _loader_info + pdfium_path = _loader_info["libpath"] + SubCommands = { "arrange": "rearrange/merge documents", "attachments": "list/extract/edit embedded files", @@ -35,7 +42,7 @@ def get_parser(): main_parser.add_argument( "--version", "-v", action = "version", - version = f"pypdfium2 {PYPDFIUM_INFO}\n" f"pdfium {PDFIUM_INFO} at {loader_info['libpath']}" + version = f"pypdfium2 {PYPDFIUM_INFO}\n" f"pdfium {PDFIUM_INFO} at {pdfium_path}" ) subparsers = main_parser.add_subparsers(dest="subcommand")