1 files changed, 10 insertions, 18 deletions

diff --git a/pysnmp/hlapi/asyncore/_sync/cmdgen.py b/pysnmp/hlapi/asyncore/_sync/cmdgen.py
index 36da95c..5cb8ab4 100644
--- a/pysnmp/hlapi/asyncore/_sync/cmdgen.py
+++ b/pysnmp/hlapi/asyncore/_sync/cmdgen.py
@@ -1,7 +1,7 @@
-from pysnmp.hlapi.asyncore.cmdgen import *
+from pysnmp.hlapi.asyncore import cmdgen
 from pysnmp.hlapi.varbinds import *
 from pysnmp.proto.rfc1905 import endOfMibView
-from pysnmp.proto.errind import *
+from pysnmp.proto import errind
 from pyasn1.type.univ import Null
 
 __all__ = ['getCmd', 'nextCmd', 'setCmd', 'bulkCmd']
@@ -86,17 +86,15 @@ def getCmd(snmpEngine, authData, transportTarget, contextData,
 
     cbCtx = {}
 
-    cmdGen = AsyncCommandGenerator()
-   
     while True: 
         if varBinds:
-            cmdGen.getCmd(
+            cmdgen.getCmd(
                 snmpEngine,
                 authData,
                 transportTarget,
                 contextData,
                 varBinds,
-                (cbFun, cbCtx),
+                cbFun, cbCtx,
                 options.get('lookupMib', True)
             )
 
@@ -196,17 +194,15 @@ def setCmd(snmpEngine, authData, transportTarget, contextData,
 
     cbCtx = {}
 
-    cmdGen = AsyncCommandGenerator()
-   
     while True: 
         if varBinds:
-            cmdGen.setCmd(
+            cmdgen.setCmd(
                 snmpEngine,
                 authData,
                 transportTarget,
                 contextData,
                 varBinds,
-                (cbFun, cbCtx),
+                cbFun, cbCtx,
                 options.get('lookupMib', True)
             )
 
@@ -335,20 +331,18 @@ def nextCmd(snmpEngine, authData, transportTarget, contextData,
 
     vbProcessor = CommandGeneratorVarBinds()
 
-    cmdGen = AsyncCommandGenerator()
-   
     initialVars = [ x[0] for x in vbProcessor.makeVarBinds(snmpEngine, varBinds) ]
 
     totalRows = totalCalls = 0
 
     while True: 
         if varBinds:
-            cmdGen.nextCmd(snmpEngine,
+            cmdgen.nextCmd(snmpEngine,
                            authData,
                            transportTarget,
                            contextData,
                            [ (x[0], Null()) for x in varBinds ],
-                           (cbFun, cbCtx),
+                           cbFun, cbCtx,
                            lookupMib)
 
             snmpEngine.transportDispatcher.runDispatcher()
@@ -525,8 +519,6 @@ def bulkCmd(snmpEngine, authData, transportTarget, contextData,
 
     vbProcessor = CommandGeneratorVarBinds()
 
-    cmdGen = AsyncCommandGenerator()
-   
     initialVars = [ x[0] for x in vbProcessor.makeVarBinds(snmpEngine, varBinds) ]
     nullVarBinds = [ False ] * len(initialVars)
 
@@ -537,13 +529,13 @@ def bulkCmd(snmpEngine, authData, transportTarget, contextData,
         if maxRows and totalRows < maxRows:
             maxRepetitions = min(maxRepetitions, maxRows-totalRows)
 
-        cmdGen.bulkCmd(snmpEngine,
+        cmdgen.bulkCmd(snmpEngine,
                        authData,
                        transportTarget,
                        contextData,
                        nonRepeaters, maxRepetitions,
                        [ (x[0], Null()) for x in varBinds ],
-                       (cbFun, cbCtx),
+                       cbFun, cbCtx,
                        lookupMib)
 
         snmpEngine.transportDispatcher.runDispatcher()