top-level application classes renamed for clarity

12 files changed, 24 insertions, 23 deletions

diff --git a/examples/v3arch/agent/cmdrsp.py b/examples/v3arch/agent/cmdrsp.py
index c52db0f..f167ef4 100644
--- a/examples/v3arch/agent/cmdrsp.py
+++ b/examples/v3arch/agent/cmdrsp.py
@@ -11,7 +11,7 @@ snmpEngine = engine.SnmpEngine()
 config.addSocketTransport(
     snmpEngine,
     udp.domainName,
-    udp.UdpSocketTransport().openServerMode(('127.0.0.1', 1161)) # 161
+    udp.UdpSocketTransport().openServerMode(('127.0.0.1', 1161))
     )
 
 # Create and put on-line my managed object
@@ -38,8 +38,8 @@ config.addRoUser(snmpEngine, 3, 'test-user', 'authPriv', (1,3,6)) # v3
 snmpContext = context.SnmpContext(snmpEngine)
 
 # Apps registration
-getApp = cmdrsp.GetCmdRsp(snmpEngine, snmpContext)
-getApp = cmdrsp.NextCmdRsp(snmpEngine, snmpContext)
-getApp = cmdrsp.BulkCmdRsp(snmpEngine, snmpContext)
+getApp = cmdrsp.GetCommandResponder(snmpEngine, snmpContext)
+getApp = cmdrsp.NextCommandResponder(snmpEngine, snmpContext)
+getApp = cmdrsp.BulkCommandResponder(snmpEngine, snmpContext)
 
 snmpEngine.transportDispatcher.runDispatcher()
diff --git a/examples/v3arch/manager/bulkgen.py b/examples/v3arch/manager/bulkgen.py
index fbaa9b1..ccbb1da 100644
--- a/examples/v3arch/manager/bulkgen.py
+++ b/examples/v3arch/manager/bulkgen.py
@@ -44,7 +44,7 @@ def cbFun(sendRequesthandle, errorIndication, errorStatus, errorIndex,
     else:
         raise error.ApplicationReturn()
 
-cmdgen.BulkCmdGen().sendReq(
+cmdgen.BulkCommandGenerator().sendReq(
     snmpEngine, 'myRouter', 0, 25, (((1,3,6,1,2,1,1), None),), cbFun
     )
 
diff --git a/examples/v3arch/manager/getgen.py b/examples/v3arch/manager/getgen.py
index da51a95..623eebf 100644
--- a/examples/v3arch/manager/getgen.py
+++ b/examples/v3arch/manager/getgen.py
@@ -36,7 +36,7 @@ def cbFun(sendRequestHandle, errorIndication, errorStatus, errorIndex,
         varBinds=varBinds
         )
     
-cmdgen.GetCmdGen().sendReq(
+cmdgen.GetCommandGenerator().sendReq(
     snmpEngine, 'myRouter', (((1,3,6,1,2,1,1,1,0), None),), cbFun
     )
 
diff --git a/examples/v3arch/manager/nextgen.py b/examples/v3arch/manager/nextgen.py
index 106522f..7263843 100644
--- a/examples/v3arch/manager/nextgen.py
+++ b/examples/v3arch/manager/nextgen.py
@@ -44,7 +44,7 @@ def cbFun(sendRequestHandle, errorIndication, errorStatus, errorIndex,
     else:
         raise error.ApplicationReturn()
 
-cmdgen.NextCmdGen().sendReq(
+cmdgen.NextCommandGenerator().sendReq(
     snmpEngine, 'myRouter', (((1,3,6,1,2,1,1), None),), cbFun
     )
 
diff --git a/examples/v3arch/manager/setgen.py b/examples/v3arch/manager/setgen.py
index 9f8a15b..b82d373 100644
--- a/examples/v3arch/manager/setgen.py
+++ b/examples/v3arch/manager/setgen.py
@@ -37,7 +37,7 @@ def cbFun(sendRequestHandle, errorIndication, errorStatus, errorIndex,
         varBinds=varBinds
         )
     
-cmdgen.SetCmdGen().sendReq(
+cmdgen.SetCommandGenerator().sendReq(
     snmpEngine, 'myRouter',
     (((1,3,6,1,2,1,1,1,0), rfc1902.OctetString('Grinch')),), cbFun
     )
diff --git a/examples/v3arch/oneliner/manager/bulkgen.py b/examples/v3arch/oneliner/manager/bulkgen.py
index 045f398..86a0620 100644
--- a/examples/v3arch/oneliner/manager/bulkgen.py
+++ b/examples/v3arch/oneliner/manager/bulkgen.py
@@ -1,7 +1,7 @@
 from pysnmp.entity.rfc3413.oneliner import cmdgen
 
 errorIndication, errorStatus, errorIndex, \
-                 varBinds, varBindTable = cmdgen.CmdGen().bulkCmd(
+                 varBinds, varBindTable = cmdgen.CommandGenerator().bulkCmd(
     # SNMP v2
 #    cmdgen.CommunityData('test-agent', 'public'),
     # SNMP v3
diff --git a/examples/v3arch/oneliner/manager/getgen.py b/examples/v3arch/oneliner/manager/getgen.py
index d176e88..c6e3f43 100644
--- a/examples/v3arch/oneliner/manager/getgen.py
+++ b/examples/v3arch/oneliner/manager/getgen.py
@@ -1,6 +1,7 @@
 from pysnmp.entity.rfc3413.oneliner import cmdgen
 
-errorIndication, errorStatus, errorIndex, varBinds = cmdgen.CmdGen().getCmd(
+errorIndication, errorStatus, \
+                 errorIndex, varBinds = cmdgen.CommandGenerator().getCmd(
     # SNMP v2
     cmdgen.CommunityData('test-agent', 'public'),
     # SNMP v3
diff --git a/examples/v3arch/oneliner/manager/nextgen.py b/examples/v3arch/oneliner/manager/nextgen.py
index 8ba61a9..22e6330 100644
--- a/examples/v3arch/oneliner/manager/nextgen.py
+++ b/examples/v3arch/oneliner/manager/nextgen.py
@@ -1,7 +1,7 @@
 from pysnmp.entity.rfc3413.oneliner import cmdgen
 
 errorIndication, errorStatus, errorIndex, \
-                 varBinds, varBindTable = cmdgen.CmdGen().nextCmd(
+                 varBinds, varBindTable = cmdgen.CommandGenerator().nextCmd(
     # SNMP v2
     cmdgen.CommunityData('test-agent', 'public'),
     # SNMP v3
diff --git a/examples/v3arch/oneliner/manager/withmib/nextgen.py b/examples/v3arch/oneliner/manager/withmib/nextgen.py
index e5a0d1b..f0f3d2b 100644
--- a/examples/v3arch/oneliner/manager/withmib/nextgen.py
+++ b/examples/v3arch/oneliner/manager/withmib/nextgen.py
@@ -2,7 +2,7 @@
 import string
 from pysnmp.entity.rfc3413.oneliner import cmdgen
 
-cmdGen = cmdgen.CmdGen()
+cmdGen = cmdgen.CommandGenerator()
 
 errorIndication, errorStatus, errorIndex, \
                  varBinds, varBindTable = cmdGen.nextCmd(
diff --git a/pysnmp/entity/rfc3413/cmdgen.py b/pysnmp/entity/rfc3413/cmdgen.py
index 7f75311..fed108b 100644
--- a/pysnmp/entity/rfc3413/cmdgen.py
+++ b/pysnmp/entity/rfc3413/cmdgen.py
@@ -65,7 +65,7 @@ def getTargetInfo(snmpEngine, snmpTargetAddrName):
              snmpTargetParamsSecurityName.syntax,
              snmpTargetParamsSecurityLevel.syntax )
 
-class CmdGenBase:
+class CommandGeneratorBase:
     def __init__(self):
         self.__pendingReqs = {}
         self._sendRequestHandleSource = 0L
@@ -232,7 +232,7 @@ class CmdGenBase:
             sendRequestHandle,
             )
 
-class GetCmdGen(CmdGenBase):
+class GetCommandGenerator(CommandGeneratorBase):
     def sendReq(
         self,
         snmpEngine,
@@ -309,7 +309,7 @@ class GetCmdGen(CmdGenBase):
               pMod.apiPDU.getVarBinds(rspPDU),
               cbCtx)
 
-class SetCmdGen(CmdGenBase):
+class SetCommandGenerator(CommandGeneratorBase):
     def sendReq(
         self,
         snmpEngine,
@@ -390,7 +390,7 @@ class SetCmdGen(CmdGenBase):
               pMod.apiPDU.getVarBinds(rspPDU),
               cbCtx)
 
-class NextCmdGen(CmdGenBase):
+class NextCommandGenerator(CommandGeneratorBase):
     def sendReq(
         self,
         snmpEngine,
@@ -493,7 +493,7 @@ class NextCmdGen(CmdGenBase):
             (self.processResponsePdu, (cbFun, cbCtx))            
             )
 
-class BulkCmdGen(CmdGenBase):
+class BulkCommandGenerator(CommandGeneratorBase):
     def sendReq(
         self,
         snmpEngine,
diff --git a/pysnmp/entity/rfc3413/cmdrsp.py b/pysnmp/entity/rfc3413/cmdrsp.py
index fe47fc2..ec9e08e 100644
--- a/pysnmp/entity/rfc3413/cmdrsp.py
+++ b/pysnmp/entity/rfc3413/cmdrsp.py
@@ -6,7 +6,7 @@ import pysnmp.smi.error
 vacmID = 3
 
 # 3.2
-class CmdRspBase:
+class CommandResponderBase:
     pduTypes = ()
 
     def __init__(self, snmpEngine, snmpContext):
@@ -205,7 +205,7 @@ class CmdRspBase:
                     'Unknown ACM error %s' % errorIndication
                     )
         
-class GetCmdRsp(CmdRspBase):
+class GetCommandResponder(CommandResponderBase):
     pduTypes = ( rfc1905.GetRequestPDU.tagSet, )
 
     # rfc1905: 4.2.1
@@ -217,7 +217,7 @@ class GetCmdRsp(CmdRspBase):
             v2c.apiPDU.getVarBinds(PDU), (acFun, acCtx)
             )
 
-class NextCmdRsp(CmdRspBase):
+class NextCommandResponder(CommandResponderBase):
     pduTypes = ( rfc1905.GetNextRequestPDU.tagSet, )
 
     # rfc1905: 4.2.2
@@ -228,7 +228,7 @@ class NextCmdRsp(CmdRspBase):
             v2c.apiPDU.getVarBinds(PDU), (acFun, acCtx)
             )
 
-class BulkCmdRsp(CmdRspBase):
+class BulkCommandResponder(CommandResponderBase):
     pduTypes = ( rfc1905.GetBulkRequestPDU.tagSet, )
     maxVarBinds = 64
     
diff --git a/pysnmp/entity/rfc3413/oneliner/cmdgen.py b/pysnmp/entity/rfc3413/oneliner/cmdgen.py
index 904dfd3..5f32362 100644
--- a/pysnmp/entity/rfc3413/oneliner/cmdgen.py
+++ b/pysnmp/entity/rfc3413/oneliner/cmdgen.py
@@ -44,7 +44,7 @@ class UdpTransportTarget:
             socket.gethostbyname(transportAddr[0]), transportAddr[1]
             )
 
-class AsynCmdGen:
+class AsynCommandGenerator:
     _null = univ.Null()
     def __init__(self, snmpEngine=None):
         if snmpEngine is None:
@@ -157,7 +157,7 @@ class AsynCmdGen:
 
     def asyncSetCmd(self): pass
 
-class CmdGen(AsynCmdGen):
+class CommandGenerator(AsynCommandGenerator):
     def __cbFun(
         self, sendRequestHandle, errorIndication, errorStatus, errorIndex,
         varBinds, cbCtx