obsolete __init__.MajorVersionId replaced with __init__.__version__

which is now in-sync with distutils

4 files changed, 9 insertions, 6 deletions

diff --git a/CHANGES b/CHANGES
index 84d06ec..f4ab8bb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,8 @@ Revision 4.2.3
   operations analysis.
 - SnmpEngineId autogeneration does not call DNS resolver but uses
   local hostname not to depend upon local IP availability and performance.
+- Obsolete __init__.MajorVersionId replaced with __init__.__version__
+  which is now in-sync with distutils.
 - Package meta-information updated.
 - Multiple fixes to UNIX domain socket transport to make it fully
   operational again.
diff --git a/pysnmp/__init__.py b/pysnmp/__init__.py
index 134516f..152278a 100644
--- a/pysnmp/__init__.py
+++ b/pysnmp/__init__.py
@@ -1,3 +1,4 @@
-# PySNMP, version 4
-majorVersionId = '4'
-version = (4, 2, 1)
+# http://www.python.org/dev/peps/pep-0396/
+__version__ = '4.2.3'
+# backward compatibility
+version = tuple(__version__.split('.'))
diff --git a/pysnmp/smi/mibs/instances/__SNMPv2-MIB.py b/pysnmp/smi/mibs/instances/__SNMPv2-MIB.py
index ea7f20f..aaee940 100644
--- a/pysnmp/smi/mibs/instances/__SNMPv2-MIB.py
+++ b/pysnmp/smi/mibs/instances/__SNMPv2-MIB.py
@@ -1,6 +1,6 @@
 from sys import version
 from time import time
-from pysnmp import majorVersionId
+from pysnmp import __version__
 
 ( MibScalarInstance,
   TimeTicks) = mibBuilder.importSymbols(
@@ -90,7 +90,7 @@ from pysnmp import majorVersionId
     'snmpSetSerialNo'
     )
 
-__sysDescr = MibScalarInstance(sysDescr.name, (0,), sysDescr.syntax.clone("PySNMP engine version %s, Python %s" % (majorVersionId, version)))
+__sysDescr = MibScalarInstance(sysDescr.name, (0,), sysDescr.syntax.clone("PySNMP engine version %s, Python %s" % (__version__, version)))
 __sysObjectID = MibScalarInstance(sysObjectID.name, (0,), sysObjectID.syntax.clone((1,3,6,1,4,1,20408)))
 
 class SysUpTime(TimeTicks):
diff --git a/setup.py b/setup.py
index eff0606..ef578ec 100644
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,7 @@ doclines = [ x.strip() for x in __doc__.split('\n') if x ]
  
 params.update( {
     'name': 'pysnmp',
-    'version': '4.2.3',
+    'version': open('pysnmp/__init__.py').read().split('\'')[1],
     'description': doclines[0],
     'long_description': ' '.join(doclines[1:]),
     'maintainer': 'Ilya Etingof <ilya@glas.net>',