diff options
12 files changed, 64 insertions, 64 deletions
diff --git a/examples/hlapi/v1arch/asyncore/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py b/examples/hlapi/v1arch/asyncore/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py index 7c282a81..beeb1785 100644 --- a/examples/hlapi/v1arch/asyncore/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py +++ b/examples/hlapi/v1arch/asyncore/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py @@ -58,6 +58,6 @@ snmpDispatcher = SnmpDispatcher() # Submit a bunch of initial GET requests for authData, transportTarget, varBinds in targets: getCmd(snmpDispatcher, authData, transportTarget, *varBinds, - **dict(cbFun=cbFun, lookupMib=True)) + cbFun=cbFun, lookupMib=True) snmpDispatcher.transportDispatcher.runDispatcher() diff --git a/examples/hlapi/v1arch/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once-over-ipv4-and-ipv6.py b/examples/hlapi/v1arch/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once-over-ipv4-and-ipv6.py index eaf1755d..b3af60a4 100644 --- a/examples/hlapi/v1arch/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once-over-ipv4-and-ipv6.py +++ b/examples/hlapi/v1arch/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once-over-ipv4-and-ipv6.py @@ -58,6 +58,6 @@ snmpDispatcher = SnmpDispatcher() # Submit a bunch of initial GETNEXT requests for authData, transportTarget, varBinds in targets: nextCmd(snmpDispatcher, authData, transportTarget, *varBinds, - **dict(cbFun=cbFun, lookupMib=True)) + cbFun=cbFun, lookupMib=True) snmpDispatcher.transportDispatcher.runDispatcher() diff --git a/examples/hlapi/v1arch/asyncore/manager/cmdgen/pull-whole-mib.py b/examples/hlapi/v1arch/asyncore/manager/cmdgen/pull-whole-mib.py index c5731570..09113fd1 100644 --- a/examples/hlapi/v1arch/asyncore/manager/cmdgen/pull-whole-mib.py +++ b/examples/hlapi/v1arch/asyncore/manager/cmdgen/pull-whole-mib.py @@ -39,6 +39,6 @@ bulkCmd(snmpDispatcher, UdpTransportTarget(('demo.snmplabs.com', 161)), 0, 25, ('1.3.6.1.4.1', None), - **dict(cbFun=cbFun)) + cbFun=cbFun) snmpDispatcher.transportDispatcher.runDispatcher() diff --git a/examples/hlapi/v3arch/asyncore/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py b/examples/hlapi/v3arch/asyncore/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py index c6132711..ba9ffed3 100644 --- a/examples/hlapi/v3arch/asyncore/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py +++ b/examples/hlapi/v3arch/asyncore/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py @@ -75,6 +75,6 @@ snmpEngine = SnmpEngine() # Submit GET requests for authData, transportTarget, varNames in targets: getCmd(snmpEngine, authData, transportTarget, ContextData(), *varNames, - **dict(cbFun=cbFun, cbCtx=(authData, transportTarget))) + cbFun=cbFun, cbCtx=(authData, transportTarget)) snmpEngine.transportDispatcher.runDispatcher() diff --git a/examples/hlapi/v3arch/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once-over-ipv4-and-ipv6.py b/examples/hlapi/v3arch/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once-over-ipv4-and-ipv6.py index eef035d1..38e96f45 100644 --- a/examples/hlapi/v3arch/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once-over-ipv4-and-ipv6.py +++ b/examples/hlapi/v3arch/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once-over-ipv4-and-ipv6.py @@ -68,6 +68,6 @@ snmpEngine = SnmpEngine() # Submit initial GETNEXT requests and wait for responses for authData, transportTarget, varBinds in targets: nextCmd(snmpEngine, authData, transportTarget, ContextData(), - *varBinds, **dict(cbFun=cbFun, cbCtx=(authData, transportTarget))) + *varBinds, cbFun=cbFun, cbCtx=(authData, transportTarget)) snmpEngine.transportDispatcher.runDispatcher() diff --git a/examples/hlapi/v3arch/asyncore/manager/cmdgen/query-multiple-snmp-engines-over-ipv4-and-ipv6.py b/examples/hlapi/v3arch/asyncore/manager/cmdgen/query-multiple-snmp-engines-over-ipv4-and-ipv6.py index 87591b4e..ad6e838f 100644 --- a/examples/hlapi/v3arch/asyncore/manager/cmdgen/query-multiple-snmp-engines-over-ipv4-and-ipv6.py +++ b/examples/hlapi/v3arch/asyncore/manager/cmdgen/query-multiple-snmp-engines-over-ipv4-and-ipv6.py @@ -90,6 +90,6 @@ for authData, transportTarget, varBinds in targets: snmpEngine = transportTarget.getTransportInfo()[1][1] % 3 and \ snmpEngineA or snmpEngineB getCmd(snmpEngine, authData, transportTarget, ContextData(), *varBinds, - **dict(cbFun=cbFun, cbCtx=(snmpEngine, authData, transportTarget))) + cbFun=cbFun, cbCtx=(snmpEngine, authData, transportTarget)) transportDispatcher.runDispatcher() diff --git a/pysnmp/entity/config.py b/pysnmp/entity/config.py index 4b285538..2ea0ea59 100644 --- a/pysnmp/entity/config.py +++ b/pysnmp/entity/config.py @@ -89,7 +89,7 @@ def addV1System(snmpEngine, communityIndex, communityName, snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpCommunityEntry.name + (8,) + tblIdx, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpCommunityEntry.name + (1,) + tblIdx, communityIndex), @@ -100,7 +100,7 @@ def addV1System(snmpEngine, communityIndex, communityName, (snmpCommunityEntry.name + (6,) + tblIdx, transportTag), (snmpCommunityEntry.name + (7,) + tblIdx, 'nonVolatile'), (snmpCommunityEntry.name + (8,) + tblIdx, 'createAndGo'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -109,7 +109,7 @@ def delV1System(snmpEngine, communityIndex): snmpEngineID) = __cookV1SystemInfo(snmpEngine, communityIndex) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpCommunityEntry.name + (8,) + tblIdx, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -153,7 +153,7 @@ def addV3User(snmpEngine, userName, snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (usmUserEntry.name + (13,) + tblIdx1, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (usmUserEntry.name + (2,) + tblIdx1, userName), @@ -162,7 +162,7 @@ def addV3User(snmpEngine, userName, (usmUserEntry.name + (5,) + tblIdx1, authProtocol), (usmUserEntry.name + (8,) + tblIdx1, privProtocol), (usmUserEntry.name + (13,) + tblIdx1, 'createAndGo'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) # Localize keys @@ -192,21 +192,21 @@ def addV3User(snmpEngine, userName, (pysnmpUsmKeyEntry.name + (2,) + tblIdx1, localPrivKey), (pysnmpUsmKeyEntry.name + (3,) + tblIdx1, hashedAuthPassphrase), (pysnmpUsmKeyEntry.name + (4,) + tblIdx1, hashedPrivPassphrase), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) # Commit passphrases snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (pysnmpUsmSecretEntry.name + (4,) + tblIdx2, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (pysnmpUsmSecretEntry.name + (1,) + tblIdx2, userName), (pysnmpUsmSecretEntry.name + (2,) + tblIdx2, authKey), (pysnmpUsmSecretEntry.name + (3,) + tblIdx2, privKey), (pysnmpUsmSecretEntry.name + (4,) + tblIdx2, 'createAndGo'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -217,11 +217,11 @@ def delV3User(snmpEngine, tblIdx2) = __cookV3UserInfo(snmpEngine, userName, securityEngineId) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (usmUserEntry.name + (13,) + tblIdx1, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (pysnmpUsmSecretEntry.name + (4,) + tblIdx2, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) # Drop all derived rows @@ -253,7 +253,7 @@ def delV3User(snmpEngine, while user['varBinds']: snmpEngine.msgAndPduDsp.mibInstrumController.readNextMibObjects( - *user['varBinds'], **dict(snmpEngine=snmpEngine, user=user, cbFun=_cbFun) + *user['varBinds'], snmpEngine=snmpEngine, user=user, cbFun=_cbFun ) @@ -280,7 +280,7 @@ def addTargetParams(snmpEngine, name, securityName, securityLevel, mpModel=3): snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpTargetParamsEntry.name + (7,) + tblIdx, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpTargetParamsEntry.name + (1,) + tblIdx, name), @@ -289,7 +289,7 @@ def addTargetParams(snmpEngine, name, securityName, securityLevel, mpModel=3): (snmpTargetParamsEntry.name + (4,) + tblIdx, securityName), (snmpTargetParamsEntry.name + (5,) + tblIdx, securityLevel), (snmpTargetParamsEntry.name + (7,) + tblIdx, 'createAndGo'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -297,7 +297,7 @@ def delTargetParams(snmpEngine, name): snmpTargetParamsEntry, tblIdx = __cookTargetParamsInfo(snmpEngine, name) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpTargetParamsEntry.name + (7,) + tblIdx, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -333,7 +333,7 @@ def addTargetAddr(snmpEngine, addrName, transportDomain, transportAddress, snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpTargetAddrEntry.name + (9,) + tblIdx, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpTargetAddrEntry.name + (1,) + tblIdx, addrName), @@ -345,7 +345,7 @@ def addTargetAddr(snmpEngine, addrName, transportDomain, transportAddress, (snmpTargetAddrEntry.name + (7,) + tblIdx, params), (snmpSourceAddrEntry.name + (1,) + tblIdx, sourceAddress), (snmpTargetAddrEntry.name + (9,) + tblIdx, 'createAndGo'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -354,7 +354,7 @@ def delTargetAddr(snmpEngine, addrName): tblIdx) = __cookTargetAddrInfo(snmpEngine, addrName) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpTargetAddrEntry.name + (9,) + tblIdx, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -428,12 +428,12 @@ def addContext(snmpEngine, contextName): snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (vacmContextEntry.name + (2,) + tblIdx, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (vacmContextEntry.name + (1,) + tblIdx, contextName), (vacmContextEntry.name + (2,) + tblIdx, 'createAndGo'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -442,7 +442,7 @@ def delContext(snmpEngine, contextName): snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (vacmContextEntry.name + (2,) + tblIdx, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -461,14 +461,14 @@ def addVacmGroup(snmpEngine, groupName, securityModel, securityName): tblIdx) = __cookVacmGroupInfo(snmpEngine, securityModel, securityName) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (vacmSecurityToGroupEntry.name + (5,) + tblIdx, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (vacmSecurityToGroupEntry.name + (1,) + tblIdx, securityModel), (vacmSecurityToGroupEntry.name + (2,) + tblIdx, securityName), (vacmSecurityToGroupEntry.name + (3,) + tblIdx, groupName), (vacmSecurityToGroupEntry.name + (5,) + tblIdx, 'createAndGo'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -478,7 +478,7 @@ def delVacmGroup(snmpEngine, securityModel, securityName): ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (vacmSecurityToGroupEntry.name + (5,) + tblIdx, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -502,7 +502,7 @@ def addVacmAccess(snmpEngine, groupName, contextName, securityModel, snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (vacmAccessEntry.name + (9,) + tblIdx, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (vacmAccessEntry.name + (1,) + tblIdx, contextName), @@ -513,7 +513,7 @@ def addVacmAccess(snmpEngine, groupName, contextName, securityModel, (vacmAccessEntry.name + (6,) + tblIdx, writeView), (vacmAccessEntry.name + (7,) + tblIdx, notifyView), (vacmAccessEntry.name + (9,) + tblIdx, 'createAndGo'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -527,7 +527,7 @@ def delVacmAccess(snmpEngine, groupName, contextName, securityModel, snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (vacmAccessEntry.name + (9,) + tblIdx, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -546,7 +546,7 @@ def addVacmView(snmpEngine, viewName, viewType, subTree, mask): subTree) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (vacmViewTreeFamilyEntry.name + (6,) + tblIdx, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (vacmViewTreeFamilyEntry.name + (1,) + tblIdx, viewName), @@ -554,7 +554,7 @@ def addVacmView(snmpEngine, viewName, viewType, subTree, mask): (vacmViewTreeFamilyEntry.name + (3,) + tblIdx, mask), (vacmViewTreeFamilyEntry.name + (4,) + tblIdx, viewType), (vacmViewTreeFamilyEntry.name + (6,) + tblIdx, 'createAndGo'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -563,7 +563,7 @@ def delVacmView(snmpEngine, viewName, subTree): subTree) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (vacmViewTreeFamilyEntry.name + (6,) + tblIdx, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -655,23 +655,23 @@ def addNotificationTarget(snmpEngine, notificationName, paramsName, snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpNotifyEntry.name + (5,) + tblIdx1, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpNotifyEntry.name + (2,) + tblIdx1, transportTag), (snmpNotifyEntry.name + (3,) + tblIdx1, notifyType), (snmpNotifyEntry.name + (5,) + tblIdx1, 'createAndGo'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpNotifyFilterProfileEntry.name + (3,) + tblIdx2, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpNotifyFilterProfileEntry.name + (1,) + tblIdx2, profileName), (snmpNotifyFilterProfileEntry.name + (3,) + tblIdx2, 'createAndGo'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) if not snmpNotifyFilterEntry: @@ -679,14 +679,14 @@ def addNotificationTarget(snmpEngine, notificationName, paramsName, snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpNotifyFilterEntry.name + (5,) + tblIdx3, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpNotifyFilterEntry.name + (1,) + tblIdx3, filterSubtree), (snmpNotifyFilterEntry.name + (2,) + tblIdx3, filterMask), (snmpNotifyFilterEntry.name + (3,) + tblIdx3, filterType), (snmpNotifyFilterEntry.name + (5,) + tblIdx3, 'createAndGo'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) @@ -699,12 +699,12 @@ def delNotificationTarget(snmpEngine, notificationName, paramsName, snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpNotifyEntry.name + (5,) + tblIdx1, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpNotifyFilterProfileEntry.name + (3,) + tblIdx2, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) if not snmpNotifyFilterEntry: @@ -712,7 +712,7 @@ def delNotificationTarget(snmpEngine, notificationName, paramsName, snmpEngine.msgAndPduDsp.mibInstrumController.writeMibObjects( (snmpNotifyFilterEntry.name + (5,) + tblIdx3, 'destroy'), - **dict(snmpEngine=snmpEngine) + snmpEngine=snmpEngine ) diff --git a/pysnmp/hlapi/v3arch/asyncore/sync/cmdgen.py b/pysnmp/hlapi/v3arch/asyncore/sync/cmdgen.py index a2c0efc2..d8bb8e34 100644 --- a/pysnmp/hlapi/v3arch/asyncore/sync/cmdgen.py +++ b/pysnmp/hlapi/v3arch/asyncore/sync/cmdgen.py @@ -107,8 +107,8 @@ def getCmd(snmpEngine, authData, transportTarget, contextData, if varBinds: cmdgen.getCmd(snmpEngine, authData, transportTarget, contextData, *varBinds, - **dict(cbFun=cbFun, cbCtx=cbCtx, - lookupMib=options.get('lookupMib', True))) + cbFun=cbFun, cbCtx=cbCtx, + lookupMib=options.get('lookupMib', True)) snmpEngine.transportDispatcher.runDispatcher() @@ -213,8 +213,8 @@ def setCmd(snmpEngine, authData, transportTarget, contextData, if varBinds: cmdgen.setCmd(snmpEngine, authData, transportTarget, contextData, *varBinds, - **dict(cbFun=cbFun, cbCtx=cbCtx, - lookupMib=options.get('lookupMib', True))) + cbFun=cbFun, cbCtx=cbCtx, + lookupMib=options.get('lookupMib', True)) snmpEngine.transportDispatcher.runDispatcher() @@ -356,8 +356,8 @@ def nextCmd(snmpEngine, authData, transportTarget, contextData, if varBinds: cmdgen.nextCmd(snmpEngine, authData, transportTarget, contextData, *[(x[0], Null('')) for x in varBinds], - **dict(cbFun=cbFun, cbCtx=cbCtx, - lookupMib=options.get('lookupMib', True))) + cbFun=cbFun, cbCtx=cbCtx, + lookupMib=options.get('lookupMib', True)) snmpEngine.transportDispatcher.runDispatcher() @@ -561,8 +561,8 @@ def bulkCmd(snmpEngine, authData, transportTarget, contextData, cmdgen.bulkCmd(snmpEngine, authData, transportTarget, contextData, nonRepeaters, maxRepetitions, *[(x[0], Null('')) for x in varBinds], - **dict(cbFun=cbFun, cbCtx=cbCtx, - lookupMib=options.get('lookupMib', True))) + cbFun=cbFun, cbCtx=cbCtx, + lookupMib=options.get('lookupMib', True)) snmpEngine.transportDispatcher.runDispatcher() diff --git a/pysnmp/hlapi/v3arch/asyncore/sync/compat/cmdgen.py b/pysnmp/hlapi/v3arch/asyncore/sync/compat/cmdgen.py index 8fa5784d..f2230826 100644 --- a/pysnmp/hlapi/v3arch/asyncore/sync/compat/cmdgen.py +++ b/pysnmp/hlapi/v3arch/asyncore/sync/compat/cmdgen.py @@ -35,8 +35,8 @@ def getCmd(snmpEngine, authData, transportTarget, contextData, if varBinds: cmdgen.getCmd(snmpEngine, authData, transportTarget, contextData, *varBinds, - **dict(cbFun=cbFun, cbCtx=cbCtx, - lookupMib=options.get('lookupMib', True))) + cbFun=cbFun, cbCtx=cbCtx, + lookupMib=options.get('lookupMib', True)) snmpEngine.transportDispatcher.runDispatcher() @@ -67,8 +67,8 @@ def setCmd(snmpEngine, authData, transportTarget, contextData, while True: cmdgen.setCmd(snmpEngine, authData, transportTarget, contextData, *varBinds, - **dict(cbFun=cbFun, cbCtx=cbCtx, - lookupMib=options.get('lookupMib', True))) + cbFun=cbFun, cbCtx=cbCtx, + lookupMib=options.get('lookupMib', True)) snmpEngine.transportDispatcher.runDispatcher() @@ -107,8 +107,8 @@ def nextCmd(snmpEngine, authData, transportTarget, contextData, while True: cmdgen.nextCmd(snmpEngine, authData, transportTarget, contextData, *[(x[0], Null('')) for x in varBinds], - **dict(cbFun=cbFun, cbCtx=cbCtx, - lookupMib=options.get('lookupMib', True))) + cbFun=cbFun, cbCtx=cbCtx, + lookupMib=options.get('lookupMib', True)) snmpEngine.transportDispatcher.runDispatcher() @@ -185,8 +185,8 @@ def bulkCmd(snmpEngine, authData, transportTarget, contextData, cmdgen.bulkCmd(snmpEngine, authData, transportTarget, contextData, nonRepeaters, maxRepetitions, *[(x[0], Null('')) for x in varBinds], - **dict(cbFun=cbFun, cbCtx=cbCtx, - lookupMib=options.get('lookupMib', True))) + cbFun=cbFun, cbCtx=cbCtx, + lookupMib=options.get('lookupMib', True)) snmpEngine.transportDispatcher.runDispatcher() diff --git a/pysnmp/proto/rfc1902.py b/pysnmp/proto/rfc1902.py index 60dd6a84..6c569a12 100644 --- a/pysnmp/proto/rfc1902.py +++ b/pysnmp/proto/rfc1902.py @@ -630,7 +630,7 @@ class Bits(OctetString): def __new__(cls, *args, **kwargs): if 'namedValues' in kwargs: - Bits = cls.withNamedBits(**dict(kwargs.pop('namedValues'))) + Bits = cls.withNamedBits(**kwargs.pop('namedValues')) return Bits(*args, **kwargs) return OctetString.__new__(cls) diff --git a/pysnmp/proto/secmod/rfc3414/service.py b/pysnmp/proto/secmod/rfc3414/service.py index fee06894..a999b027 100644 --- a/pysnmp/proto/secmod/rfc3414/service.py +++ b/pysnmp/proto/secmod/rfc3414/service.py @@ -170,7 +170,7 @@ class SnmpUSMSecurityModel(AbstractSecurityModel): # New inactive row mibInstrumController.writeMibObjects( - (usmUserEntry.name + (13,) + tblIdx2, 5), **dict(snmpEngine=snmpEngine) + (usmUserEntry.name + (13,) + tblIdx2, 5), snmpEngine=snmpEngine ) # Set user&securityNames @@ -186,7 +186,7 @@ class SnmpUSMSecurityModel(AbstractSecurityModel): # Activate row mibInstrumController.writeMibObjects( - (usmUserEntry.name + (13,) + tblIdx2, 1), **dict(snmpEngine=snmpEngine) + (usmUserEntry.name + (13,) + tblIdx2, 1), snmpEngine=snmpEngine ) # Localize and set keys diff --git a/pysnmp/smi/compiler.py b/pysnmp/smi/compiler.py index 57ba9bd7..b53d10e5 100644 --- a/pysnmp/smi/compiler.py +++ b/pysnmp/smi/compiler.py @@ -58,7 +58,7 @@ else: compiler.addSearchers(*[PyPackageSearcher(x.fullPath()) for x in mibBuilder.getMibSources()]) compiler.addBorrowers(*[PyFileBorrower(x, genTexts=mibBuilder.loadTexts) for x in getReadersFromUrls(*kwargs.get('borrowers') or defaultBorrowers, - **dict(lowcaseMatching=False))]) + lowcaseMatching=False)]) mibBuilder.setMibCompiler( compiler, kwargs.get('destination') or defaultDest |