From 6c880efcce0538303765e4267fb8718e49512f69 Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Thu, 14 Nov 2024 10:41:17 +0100 Subject: papi: remove deprecated pkg_resources Replace use of pkg_resources with new supported APIs under importlib. Type: fix Change-Id: I67a7d936c634107c1ae87c0a06bea2355d906739 Signed-off-by: Ole Troan --- src/vpp-api/python/vpp_papi/vpp_papi.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/vpp-api/python/vpp_papi/vpp_papi.py') diff --git a/src/vpp-api/python/vpp_papi/vpp_papi.py b/src/vpp-api/python/vpp_papi/vpp_papi.py index 30c00cd8dd3..61e67d162be 100644 --- a/src/vpp-api/python/vpp_papi/vpp_papi.py +++ b/src/vpp-api/python/vpp_papi/vpp_papi.py @@ -29,7 +29,8 @@ import fnmatch import weakref import atexit import time -import pkg_resources +import importlib.resources as resources + from .vpp_format import verify_enum_hint from .vpp_serializer import VPPType, VPPEnumType, VPPEnumFlagType, VPPUnionType from .vpp_serializer import VPPMessage, vpp_get_type, VPPTypeAlias @@ -502,10 +503,10 @@ class VPPApiClient: raise e else: # Bootstrap the API (memclnt.api bundled with VPP PAPI) - resource_path = "/".join(("data", "memclnt.api.json")) - file_content = pkg_resources.resource_string(__name__, resource_path) + with resources.open_text("vpp_papi.data", "memclnt.api.json") as f: + resource_content = f.read() self.messages, self.services = VPPApiJSONFiles.process_json_str( - file_content + resource_content ) # Basic sanity check -- cgit