diff options
| author | elie <elie> | 2004-11-12 16:15:12 +0000 |
|---|---|---|
| committer | elie <elie> | 2004-11-12 16:15:12 +0000 |
| commit | 39dea5c2270f4479ecb200472e11ac6a002f5e3e (patch) | |
| tree | fd1bf7e76ec549155e5c6602ff0ee2d5eec67df8 | |
| parent | 4d90fb2b921bf5f5dbfb3ea03146cf73c1a8ece7 (diff) | |
| download | pysnmp-39dea5c2270f4479ecb200472e11ac6a002f5e3e.tar.gz | |
pysnmp.getVersion() -> pysnmp.majorVersionId
| -rw-r--r-- | pysnmp/__init__.py | 1 | ||||
| -rw-r--r-- | pysnmp/smi/mibs/SNMPv2-MIB.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pysnmp/__init__.py b/pysnmp/__init__.py index 863e007..e8dd900 100644 --- a/pysnmp/__init__.py +++ b/pysnmp/__init__.py @@ -1 +1,2 @@ # PySNMP, version 4 +majorVersionId = '4' diff --git a/pysnmp/smi/mibs/SNMPv2-MIB.py b/pysnmp/smi/mibs/SNMPv2-MIB.py index 41a007b..f013453 100644 --- a/pysnmp/smi/mibs/SNMPv2-MIB.py +++ b/pysnmp/smi/mibs/SNMPv2-MIB.py @@ -4,7 +4,7 @@ except: gethostname = lambda x="": x from time import time from sys import version -from pysnmp.version import getVersion +from pysnmp import majorVersionId from pysnmp.asn1 import subtypes Integer, ObjectIdentifier, = mibBuilder.importSymbols( @@ -28,7 +28,7 @@ snmpMIB = ModuleIdentity(snmpModules.name + (1,)) snmpMIBObjects = MibIdentifier(snmpMIB.name + (1,)) system = MibIdentifier(mib_2.name + (1,)) -sysDescr = MibVariable(system.name + (1,), DisplayString("PySNMP engine version %s.%s.%s, Python %s" % (getVersion() + (version,))).addConstraints(subtypes.ValueSizeConstraint(0, 255))).setMaxAccess('readonly') +sysDescr = MibVariable(system.name + (1,), DisplayString("PySNMP engine version %s, Python %s" % (majorVersionId, version)).addConstraints(subtypes.ValueSizeConstraint(0, 255))).setMaxAccess('readonly') sysObjectID = MibVariable(system.name + (2,), ObjectIdentifier((1,3,6,1,4,1,20408))).setMaxAccess('readonly') |