explicitly override tree walking methods of MibTree derivatives

to handle and emit either NoSuchInstanceError or NoSuchObjectError
depending of the role of the object

1 files changed, 24 insertions, 12 deletions

diff --git a/pysnmp/smi/mibs/SNMPv2-SMI.py b/pysnmp/smi/mibs/SNMPv2-SMI.py
index 95ecbc6..045ec8b 100644
--- a/pysnmp/smi/mibs/SNMPv2-SMI.py
+++ b/pysnmp/smi/mibs/SNMPv2-SMI.py
@@ -429,6 +429,18 @@ class MibScalar(MibTree):
     # Missing branches are indicated by the NoSuchInstanceError exception.
     #
 
+    def getBranch(self, name, idx):
+        try:
+            return MibTree.getBranch(self, name, idx)
+        except (error.NoSuchInstanceError, error.NoSuchObjectError):
+            raise error.NoSuchInstanceError(idx=idx, name=name)
+
+    def getNextBranch(self, name, idx=None):
+        try:
+            return MibTree.getNextBranch(self, name, idx)
+        except (error.NoSuchInstanceError, error.NoSuchObjectError):
+            raise error.NoSuchInstanceError(idx=idx, name=name)
+
     def getNode(self, name, idx=None):
         try:
             return MibTree.getNode(self, name, idx)
@@ -511,6 +523,18 @@ class MibScalarInstance(MibTree):
     # Missing branches are indicated by the NoSuchInstanceError exception.
     #
 
+    def getBranch(self, name, idx):
+        try:
+            return MibTree.getBranch(self, name, idx)
+        except (error.NoSuchInstanceError, error.NoSuchObjectError):
+            raise error.NoSuchInstanceError(idx=idx, name=name)
+
+    def getNextBranch(self, name, idx=None):
+        try:
+            return MibTree.getNextBranch(self, name, idx)
+        except (error.NoSuchInstanceError, error.NoSuchObjectError):
+            raise error.NoSuchInstanceError(idx=idx, name=name)
+
     def getNode(self, name, idx=None):
         # Recursion terminator
         if name == self.name:
@@ -650,18 +674,6 @@ class MibTableColumn(MibScalar):
             return self._vars[name]
         raise error.NoSuchInstanceError(name=name, idx=idx)
 
-    def getNode(self, name, idx=None):
-        try:
-            return MibScalar.getNode(self, name, idx)
-        except error.NoSuchInstanceError:
-            raise error.NoSuchInstanceError(idx=idx, name=name)
-
-    def getNextNode(self, name, idx=None):
-        try:
-            return MibScalar.getNextNode(self, name, idx)
-        except error.NoSuchInstanceError:
-            raise error.NoSuchInstanceError(idx=idx, name=name)
-
     def setProtoInstance(self, protoInstance):
         self.protoInstance = protoInstance