load_module: Add missing parameters for ly_ctx_load_module

Author: rbu9fe

libyang/context.py

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 import os
-from typing import IO, Any, Callable, Iterator, Optional, Tuple, Union
+from typing import IO, Any, Callable, Iterator, Optional, Sequence, Tuple, Union
 
 from _libyang import ffi, lib
 from .data import (
@@ -16,7 +16,7 @@
     validation_flags,
 )
 from .schema import Module, SNode, schema_in_format
-from .util import DataType, IOType, LibyangError, c2str, data_load, str2c
+from .util import DataType, IOType, LibyangError, c2str, data_load, str2c, strlist2c
 
 
 # -------------------------------------------------------------------------------------
@@ -338,10 +338,19 @@ def parse_module_file(
     def parse_module_str(self, s: str, fmt: str = "yang", features=None) -> Module:
         return self.parse_module(s, IOType.MEMORY, fmt, features)
 
-    def load_module(self, name: str) -> Module:
+    def load_module(
+        self,
+        name: str,
+        revision: Optional[str] = None,
+        enabled_features: Sequence[str] = (),
+    ) -> Module:
         if self.cdata is None:
             raise RuntimeError("context already destroyed")
-        mod = lib.ly_ctx_load_module(self.cdata, str2c(name), ffi.NULL, ffi.NULL)
+        if enabled_features:
+            features = tuple([str2c(f) for f in enabled_features] + [ffi.NULL])
+        else:
+            features = ffi.NULL
+        mod = lib.ly_ctx_load_module(self.cdata, str2c(name), str2c(revision), features)
         if mod == ffi.NULL:
             raise self.error("cannot load module")
 

libyang/util.py

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 import enum
-from typing import Optional
+from typing import List, Optional
 import warnings
 
 from _libyang import ffi, lib
@@ -46,6 +46,15 @@ def p_str2c(s: Optional[str], encode: bool = True):
     return ffi.new("char **", s_p)
 
 
+# -------------------------------------------------------------------------------------
+def strlist2c(l: Optional[List[str]], encode: bool = True):
+    if l is None:
+        return ffi.NULL
+    items = [str2c(s, encode) for s in l] + [ffi.NULL]
+    c_strlist = ffi.new("char *[]", items)
+    return c_strlist
+
+
 # -------------------------------------------------------------------------------------
 def ly_array_count(cdata):
     if cdata == ffi.NULL: