context: simplify parse flag names

The flag arguments names are very long and this makes hard to read code.

Remove the parser_ and validation_ prefixes to the argument names. There
are almost no name collisions except for no_state. Since it makes no sense
to pass this flag only to validation or parser, it translates to both
validation and parser.

Author: jeanseb6wind

libyang/context.py

@@ -311,27 +311,26 @@ def parse_data(
         in_type: IOType,
         in_data: Union[str, bytes, IO],
         parent: DNode = None,
-        parser_lyb_mod_update: bool = False,
-        parser_no_state: bool = False,
-        parser_parse_only: bool = False,
-        parser_opaq: bool = False,
-        parser_ordered: bool = False,
-        parser_strict: bool = False,
-        validation_no_state: bool = False,
-        validation_validate_present: bool = False,
+        lyb_mod_update: bool = False,
+        no_state: bool = False,
+        parse_only: bool = False,
+        opaq: bool = False,
+        ordered: bool = False,
+        strict: bool = False,
+        validate_present: bool = False,
     ) -> Optional[DNode]:
         if self.cdata is None:
             raise RuntimeError("context already destroyed")
         parser_flgs = parser_flags(
-            lyb_mod_update=parser_lyb_mod_update,
-            no_state=parser_no_state,
-            parse_only=parser_parse_only,
-            opaq=parser_opaq,
-            ordered=parser_ordered,
-            strict=parser_strict,
+            lyb_mod_update=lyb_mod_update,
+            no_state=no_state,
+            parse_only=parse_only,
+            opaq=opaq,
+            ordered=ordered,
+            strict=strict,
         )
         validation_flgs = validation_flags(
-            no_state=validation_no_state, validate_present=validation_validate_present
+            no_state=no_state, validate_present=validate_present
         )
         fmt = data_format(fmt)
         encode = True
@@ -376,57 +375,53 @@ def parse_data_mem(
         data: Union[str, bytes],
         fmt: str,
         parent: DNode = None,
-        parser_lyb_mod_update: bool = False,
-        parser_no_state: bool = False,
-        parser_parse_only: bool = False,
-        parser_opaq: bool = False,
-        parser_ordered: bool = False,
-        parser_strict: bool = False,
-        validation_no_state: bool = False,
-        validation_validate_present: bool = False,
+        lyb_mod_update: bool = False,
+        no_state: bool = False,
+        parse_only: bool = False,
+        opaq: bool = False,
+        ordered: bool = False,
+        strict: bool = False,
+        validate_present: bool = False,
     ) -> Optional[DNode]:
         return self.parse_data(
             fmt,
             in_type=IOType.MEMORY,
             in_data=data,
             parent=parent,
-            parser_lyb_mod_update=parser_lyb_mod_update,
-            parser_no_state=parser_no_state,
-            parser_parse_only=parser_parse_only,
-            parser_opaq=parser_opaq,
-            parser_ordered=parser_ordered,
-            parser_strict=parser_strict,
-            validation_no_state=validation_no_state,
-            validation_validate_present=validation_validate_present,
+            lyb_mod_update=lyb_mod_update,
+            no_state=no_state,
+            parse_only=parse_only,
+            opaq=opaq,
+            ordered=ordered,
+            strict=strict,
+            validate_present=validate_present,
         )
 
     def parse_data_file(
         self,
         fileobj: IO,
         fmt: str,
         parent: DNode = None,
-        parser_lyb_mod_update: bool = False,
-        parser_no_state: bool = False,
-        parser_parse_only: bool = False,
-        parser_opaq: bool = False,
-        parser_ordered: bool = False,
-        parser_strict: bool = False,
-        validation_no_state: bool = False,
-        validation_validate_present: bool = False,
+        lyb_mod_update: bool = False,
+        no_state: bool = False,
+        parse_only: bool = False,
+        opaq: bool = False,
+        ordered: bool = False,
+        strict: bool = False,
+        validate_present: bool = False,
     ) -> Optional[DNode]:
         return self.parse_data(
             fmt,
             in_type=IOType.FD,
             in_data=fileobj,
             parent=parent,
-            parser_lyb_mod_update=parser_lyb_mod_update,
-            parser_no_state=parser_no_state,
-            parser_parse_only=parser_parse_only,
-            parser_opaq=parser_opaq,
-            parser_ordered=parser_ordered,
-            parser_strict=parser_strict,
-            validation_no_state=validation_no_state,
-            validation_validate_present=validation_validate_present,
+            lyb_mod_update=lyb_mod_update,
+            no_state=no_state,
+            parse_only=parse_only,
+            opaq=opaq,
+            ordered=ordered,
+            strict=strict,
+            validate_present=validate_present,
         )
 
     def __iter__(self) -> Iterator[Module]:

tests/test_data.py

@@ -69,9 +69,7 @@ def tearDown(self):
 """
 
     def test_data_parse_config_json(self):
-        dnode = self.ctx.parse_data_mem(
-            self.JSON_CONFIG, "json", validation_no_state=True
-        )
+        dnode = self.ctx.parse_data_mem(self.JSON_CONFIG, "json", no_state=True)
         self.assertIsInstance(dnode, DContainer)
         try:
             j = dnode.print_mem("json", with_siblings=True)
@@ -113,9 +111,7 @@ def test_data_parse_config_json(self):
 """
 
     def test_data_add_path(self):
-        dnode = self.ctx.parse_data_mem(
-            self.JSON_CONFIG, "json", validation_no_state=True
-        )
+        dnode = self.ctx.parse_data_mem(self.JSON_CONFIG, "json", no_state=True)
         dnode.new_path(
             '/yolo-system:conf/url[host="barfoo.com"][proto="http"]/path',
             "/barfoo/index.html",
@@ -131,13 +127,13 @@ def test_data_add_path(self):
 
     def test_data_parse_config_json_file(self):
         with open(self.JSON_CONFIG_FILE, encoding="utf-8") as f:
-            dnode = self.ctx.parse_data_file(f, "json", validation_no_state=True)
+            dnode = self.ctx.parse_data_file(f, "json", no_state=True)
         self.assertIsInstance(dnode, DContainer)
         dnode.free()
 
         with open(self.JSON_CONFIG_FILE, encoding="utf-8") as f:
             dnode = self.ctx.parse_data(
-                "json", in_data=f, in_type=IOType.FILE, validation_no_state=True
+                "json", in_data=f, in_type=IOType.FILE, no_state=True
             )
         self.assertIsInstance(dnode, DContainer)
         dnode.free()
@@ -146,7 +142,7 @@ def test_data_parse_config_json_file(self):
             "json",
             in_data=self.JSON_CONFIG_FILE,
             in_type=IOType.FILEPATH,
-            validation_no_state=True,
+            no_state=True,
         )
         self.assertIsInstance(dnode, DContainer)
         dnode.free()
@@ -180,9 +176,7 @@ def test_data_parse_config_json_file(self):
 """
 
     def test_data_parse_state_json(self):
-        dnode = self.ctx.parse_data_mem(
-            self.JSON_STATE, "json", validation_validate_present=True
-        )
+        dnode = self.ctx.parse_data_mem(self.JSON_STATE, "json", validate_present=True)
         self.assertIsInstance(dnode, DContainer)
         try:
             j = dnode.print_mem("json", with_siblings=True)
@@ -213,9 +207,7 @@ def test_data_parse_state_json(self):
 """
 
     def test_data_parse_config_xml(self):
-        dnode = self.ctx.parse_data_mem(
-            self.XML_CONFIG, "xml", validation_validate_present=True
-        )
+        dnode = self.ctx.parse_data_mem(self.XML_CONFIG, "xml", validate_present=True)
         self.assertIsInstance(dnode, DContainer)
         try:
             xml = dnode.print_mem("xml", with_siblings=True)
@@ -246,9 +238,7 @@ def test_data_parse_config_xml(self):
 """
 
     def test_data_parse_data_xml(self):
-        dnode = self.ctx.parse_data_mem(
-            self.XML_STATE, "xml", validation_validate_present=True
-        )
+        dnode = self.ctx.parse_data_mem(self.XML_STATE, "xml", validate_present=True)
         self.assertIsInstance(dnode, DContainer)
         try:
             xml = dnode.print("xml", out_type=IOType.MEMORY, with_siblings=True)
@@ -363,9 +353,7 @@ def test_data_create_invalid_regexp(self):
     }
 
     def test_data_to_dict_config(self):
-        dnode = self.ctx.parse_data_mem(
-            self.JSON_CONFIG, "json", validation_validate_present=True
-        )
+        dnode = self.ctx.parse_data_mem(self.JSON_CONFIG, "json", validate_present=True)
         self.assertIsInstance(dnode, DContainer)
         try:
             dic = dnode.print_dict()
@@ -747,11 +735,11 @@ def test_notification_from_dict_module(self):
 
     def test_data_diff(self):
         dnode1 = self.ctx.parse_data_mem(
-            self.XML_DIFF_STATE1, "xml", validation_validate_present=True
+            self.XML_DIFF_STATE1, "xml", validate_present=True
         )
         self.assertIsInstance(dnode1, DContainer)
         dnode2 = self.ctx.parse_data_mem(
-            self.XML_DIFF_STATE2, "xml", validation_validate_present=True
+            self.XML_DIFF_STATE2, "xml", validate_present=True
         )
         self.assertIsInstance(dnode2, DContainer)
 
@@ -761,9 +749,7 @@ def test_data_diff(self):
         dnode2.free()
 
     def test_find_one(self):
-        dnode = self.ctx.parse_data_mem(
-            self.JSON_CONFIG, "json", validation_validate_present=True
-        )
+        dnode = self.ctx.parse_data_mem(self.JSON_CONFIG, "json", validate_present=True)
         self.assertIsInstance(dnode, DContainer)
         try:
             hostname = dnode.find_one("hostname")
@@ -773,9 +759,7 @@ def test_find_one(self):
             dnode.free()
 
     def test_find_all(self):
-        dnode = self.ctx.parse_data_mem(
-            self.JSON_CONFIG, "json", validation_validate_present=True
-        )
+        dnode = self.ctx.parse_data_mem(self.JSON_CONFIG, "json", validate_present=True)
         self.assertIsInstance(dnode, DContainer)
         try:
             urls = dnode.find_all("url")