major overhawl aimed at Python 2.4 through 3.2 compatibility

3 files changed, 43 insertions, 43 deletions

diff --git a/examples/smi/agent/custom-managed-object.py b/examples/smi/agent/custom-managed-object.py
index 836a41e1..a5abda7c 100644
--- a/examples/smi/agent/custom-managed-object.py
+++ b/examples/smi/agent/custom-managed-object.py
@@ -41,10 +41,10 @@ if __name__ == '__main__':
 
     mibInstrum = instrum.MibInstrumController(mibBuilder)
 
-    print 'Remote manager read access to MIB instrumentation (table walk)'
+    print('Remote manager read access to MIB instrumentation (table walk)')
     oid, val = (), None
     while 1:
         oid, val = mibInstrum.readNextVars(((oid, val),))[0]
         if exval.endOfMib.isSameTypeWith(val):
             break
-        print oid, val.prettyPrint()
+        print(oid, val.prettyPrint())
diff --git a/examples/smi/agent/operations-on-managed-objects.py b/examples/smi/agent/operations-on-managed-objects.py
index 3260a5e6..91a0eba9 100644
--- a/examples/smi/agent/operations-on-managed-objects.py
+++ b/examples/smi/agent/operations-on-managed-objects.py
@@ -1,31 +1,31 @@
 # SNMP agent backend e.g. Agent access to Managed Objects
 from pysnmp.smi import builder, instrum, exval
 
-print 'Loading MIB modules...',
+print('Loading MIB modules...'),
 mibBuilder = builder.MibBuilder().loadModules(
     'SNMPv2-MIB', 'SNMP-FRAMEWORK-MIB', 'SNMP-COMMUNITY-MIB'
     )
-print 'done'
+print('done')
 
-print 'Building MIB tree...',
+print('Building MIB tree...'),
 mibInstrum = instrum.MibInstrumController(mibBuilder)
-print 'done'
+print('done')
 
-print 'Remote manager write/create access to MIB instrumentation: ',
-print mibInstrum.writeVars(
-    (((1,3,6,1,6,3,18,1,1,1,2,109,121,110,109,115), 'mycomm'),
-     ((1,3,6,1,6,3,18,1,1,1,3,109,121,110,109,115), 'mynmsname'),
-     ((1,3,6,1,6,3,18,1,1,1,7,109,121,110,109,115), 'volatile'))
-    )
+print('Remote manager write/create access to MIB instrumentation: '),
+print(mibInstrum.writeVars(
+    ( ((1,3,6,1,6,3,18,1,1,1,2,109,121,110,109,115), 'mycomm'),
+      ((1,3,6,1,6,3,18,1,1,1,3,109,121,110,109,115), 'mynmsname'),
+      ((1,3,6,1,6,3,18,1,1,1,7,109,121,110,109,115), 'volatile')) )
+)
 
-print 'Remote manager read access to MIB instrumentation (table walk)'
+print('Remote manager read access to MIB instrumentation (table walk)')
 oid, val = (), None
 while 1:
     oid, val = mibInstrum.readNextVars(((oid, val),))[0]
     if exval.endOfMib.isSameTypeWith(val):
         break
-    print oid, val.prettyPrint()
+    print(oid, val.prettyPrint())
 
-print 'Unloading MIB modules...',
+print('Unloading MIB modules...'),
 mibBuilder.unloadModules()
-print 'done'
+print('done')
diff --git a/examples/smi/manager/mib-tree-inspection.py b/examples/smi/manager/mib-tree-inspection.py
index 38ad236d..e0134c21 100644
--- a/examples/smi/manager/mib-tree-inspection.py
+++ b/examples/smi/manager/mib-tree-inspection.py
@@ -5,69 +5,69 @@ from pysnmp.smi import builder, view, error
 mibBuilder = builder.MibBuilder()
 
 # Optionally set an alternative path to compiled MIBs
-#print 'Setting MIB sources...'
+#print('Setting MIB sources...')
 #mibSources = mibBuilder.getMibSources() + (
 #    builder.DirMibSource('/opt/pysnmp_mibs'),
 #    )
 #mibBuilder.setMibSources(*mibSources)
-#print mibBuilder.getMibSources()
-#print 'done'
+#print(mibBuilder.getMibSources())
+#print('done')
 
-print 'Loading MIB modules...',
+print('Loading MIB modules...'),
 mibBuilder.loadModules(
     'SNMPv2-MIB', 'SNMP-FRAMEWORK-MIB', 'SNMP-COMMUNITY-MIB'
     )
-print 'done'
+print('done')
 
-print 'Indexing MIB objects...',
+print('Indexing MIB objects...'),
 mibView = view.MibViewController(mibBuilder)
-print 'done'
+print('done')
 
-print 'MIB symbol name lookup by OID: ',
+print('MIB symbol name lookup by OID: '),
 oid, label, suffix = mibView.getNodeName((1,3,6,1,2,1,1,1))
-print oid, label, suffix
+print(oid, label, suffix)
 
-print 'MIB symbol name lookup by label: ',
+print('MIB symbol name lookup by label: '),
 oid, label, suffix = mibView.getNodeName((1,3,6,1,2,'mib-2',1,'sysDescr'))
-print oid, label, suffix
+print(oid, label, suffix)
 
-print 'MIB symbol name lookup by symbol description: ',
+print('MIB symbol name lookup by symbol description: '),
 oid, label, suffix = mibView.getNodeName(('sysDescr',))
 oid, label, suffix = mibView.getNodeName(('snmpEngineID',), 'SNMP-FRAMEWORK-MIB')
-print oid, label, suffix
+print(oid, label, suffix)
 
-print 'MIB object value pretty print: ',
+print('MIB object value pretty print: '),
 mibNode, = mibBuilder.importSymbols('SNMP-FRAMEWORK-MIB', 'snmpEngineID')
-print mibNode.syntax
+print(mibNode.syntax.prettyPrint())
 
-print 'MIB symbol location lookup by name: ',
+print('MIB symbol location lookup by name: '),
 modName, symName, suffix = mibView.getNodeLocation(('snmpCommunityEntry',))
-print symName, modName
+print(symName, modName)
 
-print 'MIB node lookup by location: ',
+print('MIB node lookup by location: '),
 rowNode, = mibBuilder.importSymbols(modName, symName)
-print rowNode
+print(rowNode)
 
-print 'Conceptual table index value to oid convertion: ',
+print('Conceptual table index value to oid convertion: '),
 oid = rowNode.getInstIdFromIndices('router')
-print oid
-print 'Conceptual table index oid to value convertion: ',
-print rowNode.getIndicesFromInstId(oid)
+print(oid)
+print('Conceptual table index oid to value convertion: '),
+print(rowNode.getIndicesFromInstId(oid))
 
-print 'MIB tree traversal'   
+print('MIB tree traversal')
 oid, label, suffix = mibView.getFirstNodeName()
 while 1:
     try:
         modName, nodeDesc, suffix = mibView.getNodeLocation(oid)
-        print '%s::%s == %s' % (modName, nodeDesc, oid)
+        print('%s::%s == %s' % (modName, nodeDesc, oid))
         oid, label, suffix = mibView.getNextNodeName(oid)
     except error.NoSuchObjectError:
         break
 
-print 'Modules traversal'
+print('Modules traversal')
 modName = mibView.getFirstModuleName()
 while 1:
-    if modName: print modName
+    if modName: print(modName)
     try:
         modName = mibView.getNextModuleName(modName)
     except error.SmiError: