From 05b982f4b1cfa143d6fa607a6b9b24d3a77981a1 Mon Sep 17 00:00:00 2001 From: Ilya Etingof Date: Sat, 9 Feb 2019 16:26:45 +0100 Subject: Drop Python < 2.6 kwargs expansion compatibility trick --- .../manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py | 2 +- .../cmdgen/pull-mibs-from-multiple-agents-at-once-over-ipv4-and-ipv6.py | 2 +- examples/hlapi/v1arch/asyncore/manager/cmdgen/pull-whole-mib.py | 2 +- .../manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py | 2 +- .../cmdgen/pull-mibs-from-multiple-agents-at-once-over-ipv4-and-ipv6.py | 2 +- .../manager/cmdgen/query-multiple-snmp-engines-over-ipv4-and-ipv6.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/hlapi') 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() -- cgit v1.2.1