summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelie <elie>2005-10-26 21:14:36 +0000
committerelie <elie>2005-10-26 21:14:36 +0000
commit20652403964896fb3d6c3d9082ea659d734e7524 (patch)
treec1ef49b1a59be3673e21a6536cf0073d81b81e1e
parentd46e25e64cc3af93f9bd5fc41285391673a8209d (diff)
downloadpysnmp-20652403964896fb3d6c3d9082ea659d734e7524.tar.gz
NoSuchInstanceError -> NoSuchObjectError
-rw-r--r--examples/smi/view.py2
-rw-r--r--pysnmp/entity/rfc3413/config.py4
-rw-r--r--pysnmp/proto/acmod/rfc3415.py8
3 files changed, 7 insertions, 7 deletions
diff --git a/examples/smi/view.py b/examples/smi/view.py
index dc18eb0..3d101f2 100644
--- a/examples/smi/view.py
+++ b/examples/smi/view.py
@@ -49,7 +49,7 @@ while 1:
modName, nodeDesc, suffix = mibView.getNodeLocation(oid)
print '%s::%s == %s' % (modName, nodeDesc, oid)
oid, label, suffix = mibView.getNextNodeName(oid)
- except error.NoSuchInstanceError:
+ except error.NoSuchObjectError:
break
print 'Modules traversal'
diff --git a/pysnmp/entity/rfc3413/config.py b/pysnmp/entity/rfc3413/config.py
index 6dd1584..703f039 100644
--- a/pysnmp/entity/rfc3413/config.py
+++ b/pysnmp/entity/rfc3413/config.py
@@ -1,6 +1,6 @@
# Shortcuts to MIB instrumentation items used internally in SNMP applications
import string
-from pysnmp.smi.error import NoSuchInstanceError
+from pysnmp.smi.error import NoSuchObjectError
def getVersionSpecifics(snmpVersion): pass
@@ -90,7 +90,7 @@ def getTargetNames(snmpEngine, tag):
while 1:
try:
mibNode = snmpTargetAddrTagList.getNextNode(nextName)
- except NoSuchInstanceError:
+ except NoSuchObjectError:
break
# XXX stop on eot
if tag in string.split(str(mibNode.syntax)): # XXX add __split__()
diff --git a/pysnmp/proto/acmod/rfc3415.py b/pysnmp/proto/acmod/rfc3415.py
index 3b77783..39b1b64 100644
--- a/pysnmp/proto/acmod/rfc3415.py
+++ b/pysnmp/proto/acmod/rfc3415.py
@@ -1,5 +1,5 @@
# View-based Access Control Model
-from pysnmp.smi.error import NoSuchInstanceError
+from pysnmp.smi.error import NoSuchObjectError
from pysnmp.proto import error
accessModelID = 3
@@ -23,7 +23,7 @@ def isAccessAllowed(
vacmContextName = vacmContextEntry.getNode(
vacmContextEntry.name + (1,) + tblIdx
).syntax
- except NoSuchInstanceError:
+ except NoSuchObjectError:
raise error.StatusInformation(errorIndication='noSuchContext')
# 3.2.2
@@ -37,7 +37,7 @@ def isAccessAllowed(
vacmGroupName = vacmSecurityToGroupEntry.getNode(
vacmSecurityToGroupEntry.name + (3,) + tblIdx
).syntax
- except NoSuchInstanceError:
+ except NoSuchObjectError:
raise error.StatusInformation(errorIndication='noGroupName')
# 3.2.3
@@ -61,7 +61,7 @@ def isAccessAllowed(
try:
viewName = vacmAccessEntry.getNode(entryIdx).syntax
- except NoSuchInstanceError:
+ except NoSuchObjectError:
raise error.StatusInformation(errorIndication='noAccessEntry')
if not len(viewName):
raise error.StatusInformation(errorIndication='noSuchView')