diff options
author | Ilya Etingof <etingof@gmail.com> | 2016-06-12 14:07:24 +0200 |
---|---|---|
committer | Ilya Etingof <etingof@gmail.com> | 2016-06-12 14:07:24 +0200 |
commit | 91a1292067bfda55320f188eb1c8cce4af7a3266 (patch) | |
tree | c73fd39bf0eaf76207efdc6ed4ed191e50f31bf9 /pysnmp/smi | |
parent | 912517cb2d79fddc512a1304c18a9b20cb20cf80 (diff) | |
download | pysnmp-git-91a1292067bfda55320f188eb1c8cce4af7a3266.tar.gz |
converted to new-style classes
Diffstat (limited to 'pysnmp/smi')
-rw-r--r-- | pysnmp/smi/builder.py | 4 | ||||
-rw-r--r-- | pysnmp/smi/instrum.py | 2 | ||||
-rw-r--r-- | pysnmp/smi/mibs/SNMPv2-SMI.py | 2 | ||||
-rw-r--r-- | pysnmp/smi/mibs/SNMPv2-TC.py | 2 | ||||
-rw-r--r-- | pysnmp/smi/rfc1902.py | 12 | ||||
-rw-r--r-- | pysnmp/smi/view.py | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/pysnmp/smi/builder.py b/pysnmp/smi/builder.py index 29b9859e..bee2bcfc 100644 --- a/pysnmp/smi/builder.py +++ b/pysnmp/smi/builder.py @@ -27,7 +27,7 @@ else: classTypes = (type,) -class __AbstractMibSource: +class __AbstractMibSource(object): def __init__(self, srcName): self._srcName = srcName self.__magic = imp.get_magic() @@ -233,7 +233,7 @@ class DirMibSource(__AbstractMibSource): raise IOError(ENOENT, 'No such file: %s' % sys.exc_info()[1], p) -class MibBuilder: +class MibBuilder(object): loadTexts = 0 defaultCoreMibs = os.pathsep.join( ('pysnmp.smi.mibs.instances', 'pysnmp.smi.mibs') diff --git a/pysnmp/smi/instrum.py b/pysnmp/smi/instrum.py index 9df7b988..c2d5cd87 100644 --- a/pysnmp/smi/instrum.py +++ b/pysnmp/smi/instrum.py @@ -12,7 +12,7 @@ from pysnmp import debug __all__ = ['AbstractMibInstrumController', 'MibInstrumController'] -class AbstractMibInstrumController: +class AbstractMibInstrumController(object): def readVars(self, varBinds, acInfo=(None, None)): raise error.NoSuchInstanceError(idx=0) diff --git a/pysnmp/smi/mibs/SNMPv2-SMI.py b/pysnmp/smi/mibs/SNMPv2-SMI.py index 39ae6fd9..b3ec8889 100644 --- a/pysnmp/smi/mibs/SNMPv2-SMI.py +++ b/pysnmp/smi/mibs/SNMPv2-SMI.py @@ -42,7 +42,7 @@ class ExtUTCTime(OctetString): # MIB tree foundation class -class MibNode: +class MibNode(object): label = '' def __init__(self, name): diff --git a/pysnmp/smi/mibs/SNMPv2-TC.py b/pysnmp/smi/mibs/SNMPv2-TC.py index 8c7e3118..2fa486e4 100644 --- a/pysnmp/smi/mibs/SNMPv2-TC.py +++ b/pysnmp/smi/mibs/SNMPv2-TC.py @@ -26,7 +26,7 @@ Counter32, Unsigned32, TimeTicks, Counter64 = mibBuilder.importSymbols( ) -class TextualConvention: +class TextualConvention(object): displayHint = '' status = 'current' description = '' diff --git a/pysnmp/smi/rfc1902.py b/pysnmp/smi/rfc1902.py index ce6de571..bcc78f7a 100644 --- a/pysnmp/smi/rfc1902.py +++ b/pysnmp/smi/rfc1902.py @@ -17,7 +17,7 @@ from pysnmp import debug __all__ = ['ObjectIdentity', 'ObjectType', 'NotificationType'] -class ObjectIdentity: +class ObjectIdentity(object): """Create an object representing MIB variable ID. At the protocol level, MIB variable is only identified by an OID. @@ -51,7 +51,7 @@ class ObjectIdentity: Other parameters ---------------- kwargs - MIB resolution options: + MIB resolution options(object): * whenever only MIB name is given, resolve into last variable defined in MIB if last=True. Otherwise resolves to first variable (default). @@ -635,11 +635,11 @@ class ObjectIdentity: # A two-element sequence of ObjectIdentity and SNMP data type object -class ObjectType: +class ObjectType(object): """Create an object representing MIB variable. Instances of :py:class:`~pysnmp.smi.rfc1902.ObjectType` class are - containters incorporating :py:class:`~pysnmp.smi.rfc1902.ObjectIdentity` + containers incorporating :py:class:`~pysnmp.smi.rfc1902.ObjectIdentity` class instance (identifying MIB variable) and optional value belonging to one of SNMP types (:RFC:`1902`). @@ -885,11 +885,11 @@ class ObjectType: raise SmiError('%s object not fully initialized' % self.__class__.__name__) -class NotificationType: +class NotificationType(object): """Create an object representing SNMP Notification. Instances of :py:class:`~pysnmp.smi.rfc1902.NotificationType` class are - containters incorporating :py:class:`~pysnmp.smi.rfc1902.ObjectIdentity` + containers incorporating :py:class:`~pysnmp.smi.rfc1902.ObjectIdentity` class instance (identifying particular notification) and a collection of MIB variables IDs that :py:class:`~pysnmp.entity.rfc3413.oneliner.cmdgen.NotificationOriginator` diff --git a/pysnmp/smi/view.py b/pysnmp/smi/view.py index 849bc329..f8a38f88 100644 --- a/pysnmp/smi/view.py +++ b/pysnmp/smi/view.py @@ -21,7 +21,7 @@ else: instanceTypes = (object,) -class MibViewController: +class MibViewController(object): def __init__(self, mibBuilder): self.mibBuilder = mibBuilder self.lastBuildId = -1 |