netcmd: models: Model.from_message should be internal

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/model.py b/python/samba/netcmd/domain/models/model.py
index b9b5b9c2a94e518885eb26b0837e19e12faad812..b4f34ce75e44505e4c7a96388cbb9f7d9f22605d 100644 (file)
--- a/python/samba/netcmd/domain/models/model.py
+++ b/python/samba/netcmd/domain/models/model.py
@@ -141,7 +141,7 @@ class Model(metaclass=ModelMeta):
         return "top"
 
     @classmethod
-    def from_message(cls, ldb, message):
+    def _from_message(cls, ldb, message):
         """Create a new model instance from the Ldb Message object.
 
         :param ldb: Ldb connection
@@ -280,7 +280,7 @@ class Model(metaclass=ModelMeta):
                 else:
                     raise
 
-            return cls.from_message(ldb, res[0])
+            return cls._from_message(ldb, res[0])
         else:
             return cls.query(ldb, **kwargs).get()
 
@@ -360,7 +360,7 @@ class Model(metaclass=ModelMeta):
             self._apply(ldb, res[0])
         else:
             # Existing Message was stored to work out what fields changed.
-            existing_obj = self.from_message(ldb, self._message)
+            existing_obj = self._from_message(ldb, self._message)
 
             # Only modify replace or modify fields that have changed.
             # Any fields that are set to None or an empty list get unset.

diff --git a/python/samba/netcmd/domain/models/query.py b/python/samba/netcmd/domain/models/query.py
index 2856a50f825812e0c9af06810cac52cb74bb50c7..9363b267b7af17062a5e8c2ca41da2fdaf5073f9 100644 (file)
--- a/python/samba/netcmd/domain/models/query.py
+++ b/python/samba/netcmd/domain/models/query.py
@@ -58,7 +58,7 @@ class Query:
         else:
             model = self.model
 
-        return model.from_message(self.ldb, message)
+        return model._from_message(self.ldb, message)
 
     def first(self):
         """Returns the first item in the Query or None for no results."""