From: Rob van der Linde <rob@catalyst.net.nz>
Date: Mon, 26 Feb 2024 23:49:51 +0000 (+1300)
Subject: netcmd: models: Rename method to Query._from_message for consistency
X-Git-Tag: tdb-1.4.11~1554
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d3670790811600a06348ce48abce4e7f05c444c;p=thirdparty%2Fsamba.git

netcmd: models: Rename method to Query._from_message for consistency

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/python/samba/netcmd/domain/models/query.py b/python/samba/netcmd/domain/models/query.py
index 9363b267b7a..3207208d249 100644
--- a/python/samba/netcmd/domain/models/query.py
+++ b/python/samba/netcmd/domain/models/query.py
@@ -42,9 +42,9 @@ class Query:
     def __iter__(self):
         """Loop over Query class yields Model instances."""
         for message in self.result:
-            yield self._model_from_message(message)
+            yield self._from_message(message)
 
-    def _model_from_message(self, message):
+    def _from_message(self, message):
         """Returns the model class to use to construct instances.
 
         If polymorphic query is enabled it will use the last item from
@@ -63,12 +63,12 @@ class Query:
     def first(self):
         """Returns the first item in the Query or None for no results."""
         if self.count:
-            return self._model_from_message(self.result[0])
+            return self._from_message(self.result[0])
 
     def last(self):
         """Returns the last item in the Query or None for no results."""
         if self.count:
-            return self._model_from_message(self.result[-1])
+            return self._from_message(self.result[-1])
 
     def get(self):
         """Returns one item or None if no results were found.
@@ -80,7 +80,7 @@ class Query:
             raise MultipleObjectsReturned(
                 f"More than one {self.name} objects returned (got {self.count}).")
         elif self.count:
-            return self._model_from_message(self.result[0])
+            return self._from_message(self.result[0])
 
     def one(self):
         """Must return EXACTLY one item or raise an exception.
@@ -96,4 +96,4 @@ class Query:
             raise MultipleObjectsReturned(
                 f"More than one {self.name} objects returned (got {self.count}).")
         else:
-            return self._model_from_message(self.result[0])
+            return self._from_message(self.result[0])