summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Etingof <etingof@gmail.com>2016-06-12 14:07:24 +0200
committerIlya Etingof <etingof@gmail.com>2016-06-12 14:07:24 +0200
commit91a1292067bfda55320f188eb1c8cce4af7a3266 (patch)
treec73fd39bf0eaf76207efdc6ed4ed191e50f31bf9
parent912517cb2d79fddc512a1304c18a9b20cb20cf80 (diff)
downloadpysnmp-git-91a1292067bfda55320f188eb1c8cce4af7a3266.tar.gz
converted to new-style classes
-rw-r--r--CHANGES.txt1
-rw-r--r--examples/hlapi/asyncore/sync/manager/cmdgen/query-agents-from-multuple-threads.py2
-rw-r--r--examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py4
-rw-r--r--pysnmp/cache.py2
-rw-r--r--pysnmp/carrier/base.py8
-rw-r--r--pysnmp/debug.py4
-rw-r--r--pysnmp/entity/engine.py2
-rw-r--r--pysnmp/entity/observer.py4
-rw-r--r--pysnmp/entity/rfc3413/cmdgen.py2
-rw-r--r--pysnmp/entity/rfc3413/cmdrsp.py2
-rw-r--r--pysnmp/entity/rfc3413/context.py2
-rw-r--r--pysnmp/entity/rfc3413/ntforg.py2
-rw-r--r--pysnmp/entity/rfc3413/ntfrcv.py2
-rw-r--r--pysnmp/entity/rfc3413/oneliner/cmdgen.py4
-rw-r--r--pysnmp/entity/rfc3413/oneliner/ntforg.py6
-rw-r--r--pysnmp/hlapi/auth.py4
-rw-r--r--pysnmp/hlapi/context.py2
-rw-r--r--pysnmp/hlapi/lcd.py2
-rw-r--r--pysnmp/hlapi/transport.py2
-rw-r--r--pysnmp/hlapi/varbinds.py2
-rw-r--r--pysnmp/nextid.py2
-rw-r--r--pysnmp/proto/acmod/rfc3415.py2
-rw-r--r--pysnmp/proto/acmod/void.py2
-rw-r--r--pysnmp/proto/api/v1.py8
-rw-r--r--pysnmp/proto/cache.py2
-rw-r--r--pysnmp/proto/errind.py2
-rw-r--r--pysnmp/proto/mpmod/base.py2
-rw-r--r--pysnmp/proto/mpmod/cache.py2
-rw-r--r--pysnmp/proto/rfc1155.py2
-rw-r--r--pysnmp/proto/rfc3412.py2
-rw-r--r--pysnmp/proto/secmod/base.py2
-rw-r--r--pysnmp/proto/secmod/cache.py2
-rw-r--r--pysnmp/proto/secmod/rfc3414/auth/base.py2
-rw-r--r--pysnmp/proto/secmod/rfc3414/priv/base.py2
-rw-r--r--pysnmp/smi/builder.py4
-rw-r--r--pysnmp/smi/instrum.py2
-rw-r--r--pysnmp/smi/mibs/SNMPv2-SMI.py2
-rw-r--r--pysnmp/smi/mibs/SNMPv2-TC.py2
-rw-r--r--pysnmp/smi/rfc1902.py12
-rw-r--r--pysnmp/smi/view.py2
40 files changed, 59 insertions, 58 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 458a5431..f648f374 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@ Revision 4.3.3, work in progress
Github `repo <https://github.com/etingof/pysnmp>`_
+- Switched to new-style classes.
- NotificationType now allows additional var-binds specified as
MIB objects. A side effect of this change is that additional
var-binds can only be added prior to .resolveMibObjects() is
diff --git a/examples/hlapi/asyncore/sync/manager/cmdgen/query-agents-from-multuple-threads.py b/examples/hlapi/asyncore/sync/manager/cmdgen/query-agents-from-multuple-threads.py
index d289982e..f5fe5fdf 100644
--- a/examples/hlapi/asyncore/sync/manager/cmdgen/query-agents-from-multuple-threads.py
+++ b/examples/hlapi/asyncore/sync/manager/cmdgen/query-agents-from-multuple-threads.py
@@ -79,7 +79,7 @@ class Worker(Thread):
self.requests.task_done()
-class ThreadPool:
+class ThreadPool(object):
def __init__(self, num_threads):
self.requests = Queue(num_threads)
self.responses = []
diff --git a/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py b/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py
index 25a396c6..328e5d28 100644
--- a/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py
+++ b/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py
@@ -26,7 +26,7 @@ from pysnmp.proto import api
import time, bisect
-class SysDescr:
+class SysDescr(object):
name = (1, 3, 6, 1, 2, 1, 1, 1, 0)
def __eq__(self, other): return self.name == other
@@ -47,7 +47,7 @@ class SysDescr:
)
-class Uptime:
+class Uptime(object):
name = (1, 3, 6, 1, 2, 1, 1, 3, 0)
birthday = time.time()
diff --git a/pysnmp/cache.py b/pysnmp/cache.py
index 12910d41..57f7da52 100644
--- a/pysnmp/cache.py
+++ b/pysnmp/cache.py
@@ -8,7 +8,7 @@
#
-class Cache:
+class Cache(object):
def __init__(self, maxSize=256):
self.__maxSize = maxSize
self.__size = 0
diff --git a/pysnmp/carrier/base.py b/pysnmp/carrier/base.py
index 653ea3fe..59cfe48a 100644
--- a/pysnmp/carrier/base.py
+++ b/pysnmp/carrier/base.py
@@ -7,7 +7,7 @@
from pysnmp.carrier import error
-class TimerCallable:
+class TimerCallable(object):
def __init__(self, cbFun, callInterval):
self.__cbFun = cbFun
self.__callInterval = callInterval
@@ -37,7 +37,7 @@ class TimerCallable:
return self.__cbFun >= cbFun
-class AbstractTransportDispatcher:
+class AbstractTransportDispatcher(object):
def __init__(self):
self.__transports = {}
self.__transportDomainMap = {}
@@ -196,7 +196,7 @@ class AbstractTransportDispatcher:
self.unregisterTimerCbFun()
-class AbstractTransportAddress:
+class AbstractTransportAddress(object):
_localAddress = None
def setLocalAddress(self, s):
@@ -210,7 +210,7 @@ class AbstractTransportAddress:
return self.__class__(self).setLocalAddress(localAddress is None and self.getLocalAddress() or localAddress)
-class AbstractTransport:
+class AbstractTransport(object):
protoTransportDispatcher = None
addressType = AbstractTransportAddress
_cbFun = None
diff --git a/pysnmp/debug.py b/pysnmp/debug.py
index 80d7d6ec..2fa8679b 100644
--- a/pysnmp/debug.py
+++ b/pysnmp/debug.py
@@ -35,7 +35,7 @@ flagMap = {'io': flagIO,
'all': flagAll}
-class Printer:
+class Printer(object):
def __init__(self, logger=None, handler=None, formatter=None):
if logger is None:
logger = logging.getLogger('pysnmp')
@@ -65,7 +65,7 @@ else:
pass
-class Debug:
+class Debug(object):
defaultPrinter = None
def __init__(self, *flags, **options):
diff --git a/pysnmp/entity/engine.py b/pysnmp/entity/engine.py
index 96646286..531b235b 100644
--- a/pysnmp/entity/engine.py
+++ b/pysnmp/entity/engine.py
@@ -23,7 +23,7 @@ from pysnmp import error
__all__ = ['SnmpEngine']
-class SnmpEngine:
+class SnmpEngine(object):
"""Creates SNMP engine object.
SNMP engine object is central in SNMP v3 architecture. It is an umbrella
diff --git a/pysnmp/entity/observer.py b/pysnmp/entity/observer.py
index 2e137129..d0f853f1 100644
--- a/pysnmp/entity/observer.py
+++ b/pysnmp/entity/observer.py
@@ -7,12 +7,12 @@
from pysnmp import error
-class MetaObserver:
+class MetaObserver(object):
"""This is a simple facility for exposing internal SNMP Engine
working details to pysnmp applications. These details are
basically local scope variables at a fixed point of execution.
- Two modes of operations are offered:
+ Two modes of operations are offered(object):
1. App can request an execution point context by execution point ID.
2. App can register its callback function (and context) to be invoked
once execution reaches specified point. All local scope variables
diff --git a/pysnmp/entity/rfc3413/cmdgen.py b/pysnmp/entity/rfc3413/cmdgen.py
index e174c379..8af6a644 100644
--- a/pysnmp/entity/rfc3413/cmdgen.py
+++ b/pysnmp/entity/rfc3413/cmdgen.py
@@ -40,7 +40,7 @@ def getNextVarBinds(varBinds, origVarBinds=None):
return errorIndication, rspVarBinds
-class CommandGenerator:
+class CommandGenerator(object):
_null = univ.Null('')
def __init__(self):
diff --git a/pysnmp/entity/rfc3413/cmdrsp.py b/pysnmp/entity/rfc3413/cmdrsp.py
index 60c64ad3..456d81bd 100644
--- a/pysnmp/entity/rfc3413/cmdrsp.py
+++ b/pysnmp/entity/rfc3413/cmdrsp.py
@@ -13,7 +13,7 @@ from pysnmp import debug
# 3.2
-class CommandResponderBase:
+class CommandResponderBase(object):
acmID = 3 # default MIB access control method to use
pduTypes = ()
diff --git a/pysnmp/entity/rfc3413/context.py b/pysnmp/entity/rfc3413/context.py
index e0b73ef4..09039b04 100644
--- a/pysnmp/entity/rfc3413/context.py
+++ b/pysnmp/entity/rfc3413/context.py
@@ -10,7 +10,7 @@ from pysnmp import error
from pysnmp import debug
-class SnmpContext:
+class SnmpContext(object):
def __init__(self, snmpEngine, contextEngineId=None):
snmpEngineId, = snmpEngine.msgAndPduDsp.mibInstrumController.mibBuilder.importSymbols('__SNMP-FRAMEWORK-MIB',
'snmpEngineID')
diff --git a/pysnmp/entity/rfc3413/ntforg.py b/pysnmp/entity/rfc3413/ntforg.py
index c9bd69c4..3001d207 100644
--- a/pysnmp/entity/rfc3413/ntforg.py
+++ b/pysnmp/entity/rfc3413/ntforg.py
@@ -18,7 +18,7 @@ from pysnmp import debug
getNextHandle = nextid.Integer(0x7fffffff)
-class NotificationOriginator:
+class NotificationOriginator(object):
acmID = 3 # default MIB access control method to use
def __init__(self, snmpContext=None):
diff --git a/pysnmp/entity/rfc3413/ntfrcv.py b/pysnmp/entity/rfc3413/ntfrcv.py
index 55b2841c..1c9f2d41 100644
--- a/pysnmp/entity/rfc3413/ntfrcv.py
+++ b/pysnmp/entity/rfc3413/ntfrcv.py
@@ -13,7 +13,7 @@ from pysnmp import debug
# 3.4
-class NotificationReceiver:
+class NotificationReceiver(object):
pduTypes = (v1.TrapPDU.tagSet, v2c.SNMPv2TrapPDU.tagSet,
v2c.InformRequestPDU.tagSet)
diff --git a/pysnmp/entity/rfc3413/oneliner/cmdgen.py b/pysnmp/entity/rfc3413/oneliner/cmdgen.py
index 411fc40c..791c185d 100644
--- a/pysnmp/entity/rfc3413/oneliner/cmdgen.py
+++ b/pysnmp/entity/rfc3413/oneliner/cmdgen.py
@@ -19,7 +19,7 @@ __all__ = ['AsynCommandGenerator', 'CommandGenerator', 'MibVariable']
MibVariable = ObjectIdentity
-class AsynCommandGenerator:
+class AsynCommandGenerator(object):
_null = univ.Null('')
vbProcessor = CommandGeneratorVarBinds()
@@ -160,7 +160,7 @@ class AsynCommandGenerator:
asyncBulkCmd = bulkCmd
-class CommandGenerator:
+class CommandGenerator(object):
_null = univ.Null('')
def __init__(self, snmpEngine=None, asynCmdGen=None):
diff --git a/pysnmp/entity/rfc3413/oneliner/ntforg.py b/pysnmp/entity/rfc3413/oneliner/ntforg.py
index 2436b5ba..c6a140bb 100644
--- a/pysnmp/entity/rfc3413/oneliner/ntforg.py
+++ b/pysnmp/entity/rfc3413/oneliner/ntforg.py
@@ -22,7 +22,7 @@ __all__ = ['AsynNotificationOriginator',
MibVariable = ObjectIdentity
-class ErrorIndicationReturn:
+class ErrorIndicationReturn(object):
def __init__(self, *vars):
self.__vars = vars
@@ -39,7 +39,7 @@ class ErrorIndicationReturn:
return str(self.__vars[0])
-class AsynNotificationOriginator:
+class AsynNotificationOriginator(object):
vbProcessor = NotificationOriginatorVarBinds()
lcd = NotificationOriginatorLcdConfigurator()
@@ -137,7 +137,7 @@ class AsynNotificationOriginator:
asyncSendNotification = sendNotification
-class NotificationOriginator:
+class NotificationOriginator(object):
vbProcessor = NotificationOriginatorVarBinds()
def __init__(self, snmpEngine=None, snmpContext=None, asynNtfOrg=None):
diff --git a/pysnmp/hlapi/auth.py b/pysnmp/hlapi/auth.py
index 821c0c3a..baacb00a 100644
--- a/pysnmp/hlapi/auth.py
+++ b/pysnmp/hlapi/auth.py
@@ -16,7 +16,7 @@ __all__ = ['CommunityData', 'UsmUserData',
'usmNoPrivProtocol']
-class CommunityData:
+class CommunityData(object):
"""Creates SNMP v1/v2c configuration entry.
This object can be used by
@@ -143,7 +143,7 @@ usmAesCfb192Protocol = config.usmAesCfb192Protocol
usmAesCfb256Protocol = config.usmAesCfb256Protocol
-class UsmUserData:
+class UsmUserData(object):
"""Creates SNMP v3 User Security Model (USM) configuration entry.
This object can be used by
diff --git a/pysnmp/hlapi/context.py b/pysnmp/hlapi/context.py
index 363efeac..2c377dc5 100644
--- a/pysnmp/hlapi/context.py
+++ b/pysnmp/hlapi/context.py
@@ -9,7 +9,7 @@ from pyasn1.compat.octets import null
__all__ = ['ContextData']
-class ContextData:
+class ContextData(object):
"""Creates UDP/IPv6 configuration entry and initialize socket API if needed.
This object can be used by
diff --git a/pysnmp/hlapi/lcd.py b/pysnmp/hlapi/lcd.py
index f96b695b..91042645 100644
--- a/pysnmp/hlapi/lcd.py
+++ b/pysnmp/hlapi/lcd.py
@@ -12,7 +12,7 @@ __all__ = ['CommandGeneratorLcdConfigurator',
'NotificationOriginatorLcdConfigurator']
-class AbstractLcdConfigurator:
+class AbstractLcdConfigurator(object):
nextID = nextid.Integer(0xffffffff)
cacheKeys = []
diff --git a/pysnmp/hlapi/transport.py b/pysnmp/hlapi/transport.py
index 45807f2e..30578836 100644
--- a/pysnmp/hlapi/transport.py
+++ b/pysnmp/hlapi/transport.py
@@ -11,7 +11,7 @@ from pysnmp import error
__all__ = []
-class AbstractTransportTarget:
+class AbstractTransportTarget(object):
transportDomain = None
protoTransport = AbstractTransport
diff --git a/pysnmp/hlapi/varbinds.py b/pysnmp/hlapi/varbinds.py
index b5617113..c72872b5 100644
--- a/pysnmp/hlapi/varbinds.py
+++ b/pysnmp/hlapi/varbinds.py
@@ -10,7 +10,7 @@ from pysnmp.smi.rfc1902 import *
__all__ = ['CommandGeneratorVarBinds', 'NotificationOriginatorVarBinds']
-class AbstractVarBinds:
+class AbstractVarBinds(object):
@staticmethod
def getMibViewController(snmpEngine):
mibViewController = snmpEngine.getUserContext('mibViewController')
diff --git a/pysnmp/nextid.py b/pysnmp/nextid.py
index cd2fe20b..775106d5 100644
--- a/pysnmp/nextid.py
+++ b/pysnmp/nextid.py
@@ -9,7 +9,7 @@ import random
random.seed()
-class Integer:
+class Integer(object):
"""Return a next value in a reasonably MT-safe manner"""
def __init__(self, maximum, increment=256):
diff --git a/pysnmp/proto/acmod/rfc3415.py b/pysnmp/proto/acmod/rfc3415.py
index 3c6be611..5783f237 100644
--- a/pysnmp/proto/acmod/rfc3415.py
+++ b/pysnmp/proto/acmod/rfc3415.py
@@ -12,7 +12,7 @@ __powOfTwoSeq = [128, 64, 32, 16, 8, 4, 2, 1]
# 3.2
-class Vacm:
+class Vacm(object):
"""View-based Access Control Model"""
accessModelID = 3
diff --git a/pysnmp/proto/acmod/void.py b/pysnmp/proto/acmod/void.py
index 71471f26..f57a3c40 100644
--- a/pysnmp/proto/acmod/void.py
+++ b/pysnmp/proto/acmod/void.py
@@ -10,7 +10,7 @@ from pysnmp import debug
# rfc3415 3.2
# noinspection PyUnusedLocal
-class Vacm:
+class Vacm(object):
"""Void Access Control Model"""
accessModelID = 0
diff --git a/pysnmp/proto/api/v1.py b/pysnmp/proto/api/v1.py
index 9bab214e..1c39ae34 100644
--- a/pysnmp/proto/api/v1.py
+++ b/pysnmp/proto/api/v1.py
@@ -32,7 +32,7 @@ TrapPDU = rfc1157.TrapPDU
Message = rfc1157.Message
-class VarBindAPI:
+class VarBindAPI(object):
@staticmethod
def setOIDVal(varBind, oidVal):
(oid, val) = oidVal
@@ -53,7 +53,7 @@ apiVarBind = VarBindAPI()
getNextRequestID = nextid.Integer(0xffffff)
-class PDUAPI:
+class PDUAPI(object):
_errorStatus = rfc1157.errorStatus.clone(0)
_errorIndex = Integer(0)
@@ -156,7 +156,7 @@ class PDUAPI:
apiPDU = PDUAPI()
-class TrapPDUAPI:
+class TrapPDUAPI(object):
_networkAddress = None
_entOid = ObjectIdentifier((1, 3, 6, 1, 4, 1, 20408))
_genericTrap = rfc1157.genericTrap.clone('coldStart')
@@ -252,7 +252,7 @@ class TrapPDUAPI:
apiTrapPDU = TrapPDUAPI()
-class MessageAPI:
+class MessageAPI(object):
_version = rfc1157.version.clone(0)
_community = univ.OctetString('public')
diff --git a/pysnmp/proto/cache.py b/pysnmp/proto/cache.py
index a86b991c..45eb5da9 100644
--- a/pysnmp/proto/cache.py
+++ b/pysnmp/proto/cache.py
@@ -7,7 +7,7 @@
from pysnmp.proto import error
-class Cache:
+class Cache(object):
def __init__(self):
self.__cacheRepository = {}
diff --git a/pysnmp/proto/errind.py b/pysnmp/proto/errind.py
index 12402ea1..3c347543 100644
--- a/pysnmp/proto/errind.py
+++ b/pysnmp/proto/errind.py
@@ -6,7 +6,7 @@
#
-class ErrorIndication:
+class ErrorIndication(object):
"""SNMPv3 error-indication values"""
def __init__(self, descr=None):
diff --git a/pysnmp/proto/mpmod/base.py b/pysnmp/proto/mpmod/base.py
index b9d5820a..b236f68d 100644
--- a/pysnmp/proto/mpmod/base.py
+++ b/pysnmp/proto/mpmod/base.py
@@ -8,7 +8,7 @@ from pysnmp.proto.mpmod import cache
from pysnmp.proto import error
-class AbstractMessageProcessingModel:
+class AbstractMessageProcessingModel(object):
snmpMsgSpec = NotImplementedError
def __init__(self):
diff --git a/pysnmp/proto/mpmod/cache.py b/pysnmp/proto/mpmod/cache.py
index 43027d5c..e8454b2a 100644
--- a/pysnmp/proto/mpmod/cache.py
+++ b/pysnmp/proto/mpmod/cache.py
@@ -8,7 +8,7 @@ from pysnmp.proto import error
from pysnmp import nextid
-class Cache:
+class Cache(object):
__stateReference = nextid.Integer(0xffffff)
__msgID = nextid.Integer(0xffffff)
diff --git a/pysnmp/proto/rfc1155.py b/pysnmp/proto/rfc1155.py
index fa7ab552..14f8745f 100644
--- a/pysnmp/proto/rfc1155.py
+++ b/pysnmp/proto/rfc1155.py
@@ -80,7 +80,7 @@ class ObjectName(univ.ObjectIdentifier):
pass
-class TypeCoercionHackMixIn: # XXX
+class TypeCoercionHackMixIn(object): # XXX
# Reduce ASN1 type check to simple tag check as SMIv2 objects may
# not be constraints-compatible with those used in SNMP PDU.
def _verifyComponent(self, idx, value, **kwargs):
diff --git a/pysnmp/proto/rfc3412.py b/pysnmp/proto/rfc3412.py
index 9feab6e3..43dffdf1 100644
--- a/pysnmp/proto/rfc3412.py
+++ b/pysnmp/proto/rfc3412.py
@@ -13,7 +13,7 @@ from pysnmp.error import PySnmpError
from pysnmp import nextid, debug
-class MsgAndPduDispatcher:
+class MsgAndPduDispatcher(object):
"""SNMP engine PDU & message dispatcher. Exchanges SNMP PDU's with
applications and serialized messages with transport level.
"""
diff --git a/pysnmp/proto/secmod/base.py b/pysnmp/proto/secmod/base.py
index af5ddb23..edd251d6 100644
--- a/pysnmp/proto/secmod/base.py
+++ b/pysnmp/proto/secmod/base.py
@@ -8,7 +8,7 @@ from pysnmp.proto.secmod import cache
from pysnmp.proto import error
-class AbstractSecurityModel:
+class AbstractSecurityModel(object):
securityModelID = None
def __init__(self):
diff --git a/pysnmp/proto/secmod/cache.py b/pysnmp/proto/secmod/cache.py
index 7e6fa6df..4f9a2db5 100644
--- a/pysnmp/proto/secmod/cache.py
+++ b/pysnmp/proto/secmod/cache.py
@@ -8,7 +8,7 @@ from pysnmp import nextid
from pysnmp.proto import error
-class Cache:
+class Cache(object):
__stateReference = nextid.Integer(0xffffff)
def __init__(self):
diff --git a/pysnmp/proto/secmod/rfc3414/auth/base.py b/pysnmp/proto/secmod/rfc3414/auth/base.py
index 9f842fe5..ba2d0c23 100644
--- a/pysnmp/proto/secmod/rfc3414/auth/base.py
+++ b/pysnmp/proto/secmod/rfc3414/auth/base.py
@@ -7,7 +7,7 @@
from pysnmp.proto import errind, error
-class AbstractAuthenticationService:
+class AbstractAuthenticationService(object):
serviceID = None
def hashPassphrase(self, authKey):
diff --git a/pysnmp/proto/secmod/rfc3414/priv/base.py b/pysnmp/proto/secmod/rfc3414/priv/base.py
index 224e19aa..d683ef98 100644
--- a/pysnmp/proto/secmod/rfc3414/priv/base.py
+++ b/pysnmp/proto/secmod/rfc3414/priv/base.py
@@ -7,7 +7,7 @@
from pysnmp.proto import error
-class AbstractEncryptionService:
+class AbstractEncryptionService(object):
serviceID = None
def hashPassphrase(self, authProtocol, privKey):
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