From 7e2076a1e0f8f6dc24cee52b067d2cd18fdde1c4 Mon Sep 17 00:00:00 2001 From: elie Date: Sun, 5 Jul 2015 14:22:26 +0000 Subject: - original asynsock transport and AsyncsockDispatcher renamed into asyncore and AsyncoreDispatcher respectively to provide better hint to fellow devs on the underlying transport being used - backward compatibility preserved through dummy asynsock symbols --- .../v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py | 6 +++--- .../v1arch/asyncore/agent/ntforg/send-trap-over-ipv4-and-ipv6.py | 6 +++--- .../v1arch/asyncore/manager/cmdgen/broadcast-agent-discovery.py | 6 +++--- examples/v1arch/asyncore/manager/cmdgen/fetch-scalar-value.py | 6 +++--- examples/v1arch/asyncore/manager/cmdgen/getbulk-pull-whole-mib.py | 6 +++--- examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py | 6 +++--- examples/v1arch/asyncore/manager/cmdgen/spoof-source-address.py | 6 +++--- examples/v1arch/asyncore/manager/cmdgen/v2c-set.py | 6 +++--- .../asyncore/manager/ntfrcv/listen-on-ipv4-and-ipv6-interfaces.py | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) (limited to 'examples/v1arch') diff --git a/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py b/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py index 73e14137..1007a475 100644 --- a/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py +++ b/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py @@ -1,6 +1,6 @@ # Command Responder Application (GET/GETNEXT) -from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher -from pysnmp.carrier.asynsock.dgram import udp, udp6, unix +from pysnmp.carrier.asyncore.dispatch import AsyncoreDispatcher +from pysnmp.carrier.asyncore.dgram import udp, udp6, unix from pyasn1.codec.ber import encoder, decoder from pysnmp.proto import api import time, bisect @@ -97,7 +97,7 @@ def cbFun(transportDispatcher, transportDomain, transportAddress, wholeMsg): ) return wholeMsg -transportDispatcher = AsynsockDispatcher() +transportDispatcher = AsyncoreDispatcher() transportDispatcher.registerRecvCbFun(cbFun) # UDP/IPv4 diff --git a/examples/v1arch/asyncore/agent/ntforg/send-trap-over-ipv4-and-ipv6.py b/examples/v1arch/asyncore/agent/ntforg/send-trap-over-ipv4-and-ipv6.py index 5b791328..66c8a53f 100644 --- a/examples/v1arch/asyncore/agent/ntforg/send-trap-over-ipv4-and-ipv6.py +++ b/examples/v1arch/asyncore/agent/ntforg/send-trap-over-ipv4-and-ipv6.py @@ -1,6 +1,6 @@ # Notification Originator Application (TRAP) -from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher -from pysnmp.carrier.asynsock.dgram import udp, udp6, unix +from pysnmp.carrier.asyncore.dispatch import AsyncoreDispatcher +from pysnmp.carrier.asyncore.dgram import udp, udp6, unix from pyasn1.codec.ber import encoder from pysnmp.proto import api @@ -23,7 +23,7 @@ pMod.apiMessage.setDefaults(trapMsg) pMod.apiMessage.setCommunity(trapMsg, 'public') pMod.apiMessage.setPDU(trapMsg, trapPDU) -transportDispatcher = AsynsockDispatcher() +transportDispatcher = AsyncoreDispatcher() # UDP/IPv4 transportDispatcher.registerTransport( diff --git a/examples/v1arch/asyncore/manager/cmdgen/broadcast-agent-discovery.py b/examples/v1arch/asyncore/manager/cmdgen/broadcast-agent-discovery.py index 7bba8947..2ac0f181 100644 --- a/examples/v1arch/asyncore/manager/cmdgen/broadcast-agent-discovery.py +++ b/examples/v1arch/asyncore/manager/cmdgen/broadcast-agent-discovery.py @@ -1,5 +1,5 @@ -from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher -from pysnmp.carrier.asynsock.dgram import udp +from pysnmp.carrier.asyncore.dispatch import AsyncoreDispatcher +from pysnmp.carrier.asyncore.dgram import udp from pyasn1.codec.ber import encoder, decoder from pysnmp.proto import api from time import time @@ -51,7 +51,7 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress, transportDispatcher.jobFinished(1) return wholeMsg -transportDispatcher = AsynsockDispatcher() +transportDispatcher = AsyncoreDispatcher() transportDispatcher.registerRecvCbFun(cbRecvFun) transportDispatcher.registerTimerCbFun(cbTimerFun) diff --git a/examples/v1arch/asyncore/manager/cmdgen/fetch-scalar-value.py b/examples/v1arch/asyncore/manager/cmdgen/fetch-scalar-value.py index c5233db4..a44707ea 100644 --- a/examples/v1arch/asyncore/manager/cmdgen/fetch-scalar-value.py +++ b/examples/v1arch/asyncore/manager/cmdgen/fetch-scalar-value.py @@ -1,6 +1,6 @@ # GET Command Generator -from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher -from pysnmp.carrier.asynsock.dgram import udp, udp6, unix +from pysnmp.carrier.asyncore.dispatch import AsyncoreDispatcher +from pysnmp.carrier.asyncore.dgram import udp, udp6, unix from pyasn1.codec.ber import encoder, decoder from pysnmp.proto import api from time import time @@ -46,7 +46,7 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress, transportDispatcher.jobFinished(1) return wholeMsg -transportDispatcher = AsynsockDispatcher() +transportDispatcher = AsyncoreDispatcher() transportDispatcher.registerRecvCbFun(cbRecvFun) transportDispatcher.registerTimerCbFun(cbTimerFun) diff --git a/examples/v1arch/asyncore/manager/cmdgen/getbulk-pull-whole-mib.py b/examples/v1arch/asyncore/manager/cmdgen/getbulk-pull-whole-mib.py index 5e37d9f4..d4c7ca75 100644 --- a/examples/v1arch/asyncore/manager/cmdgen/getbulk-pull-whole-mib.py +++ b/examples/v1arch/asyncore/manager/cmdgen/getbulk-pull-whole-mib.py @@ -1,6 +1,6 @@ # GETBULK Command Generator (SNMPv2c only) -from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher -from pysnmp.carrier.asynsock.dgram import udp +from pysnmp.carrier.asyncore.dispatch import AsyncoreDispatcher +from pysnmp.carrier.asyncore.dgram import udp from pyasn1.codec.ber import encoder, decoder from pysnmp.proto.api import v2c from time import time @@ -77,7 +77,7 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress, startedAt = time() return wholeMsg -transportDispatcher = AsynsockDispatcher() +transportDispatcher = AsyncoreDispatcher() transportDispatcher.registerRecvCbFun(cbRecvFun) transportDispatcher.registerTimerCbFun(cbTimerFun) diff --git a/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py b/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py index d15a4ef9..d0cefc37 100644 --- a/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py +++ b/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py @@ -1,6 +1,6 @@ # GETNEXT Command Generator -from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher -from pysnmp.carrier.asynsock.dgram import udp +from pysnmp.carrier.asyncore.dispatch import AsyncoreDispatcher +from pysnmp.carrier.asyncore.dgram import udp from pyasn1.codec.ber import encoder, decoder from pysnmp.proto import api from time import time @@ -70,7 +70,7 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress, startedAt = time() return wholeMsg -transportDispatcher = AsynsockDispatcher() +transportDispatcher = AsyncoreDispatcher() transportDispatcher.registerRecvCbFun(cbRecvFun) transportDispatcher.registerTimerCbFun(cbTimerFun) diff --git a/examples/v1arch/asyncore/manager/cmdgen/spoof-source-address.py b/examples/v1arch/asyncore/manager/cmdgen/spoof-source-address.py index 28f2190e..acaefacb 100644 --- a/examples/v1arch/asyncore/manager/cmdgen/spoof-source-address.py +++ b/examples/v1arch/asyncore/manager/cmdgen/spoof-source-address.py @@ -1,5 +1,5 @@ -from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher -from pysnmp.carrier.asynsock.dgram import udp +from pysnmp.carrier.asyncore.dispatch import AsyncoreDispatcher +from pysnmp.carrier.asyncore.dgram import udp from pysnmp.proto import api from pyasn1.codec.ber import encoder, decoder from time import time @@ -53,7 +53,7 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress, transportDispatcher.jobFinished(1) return wholeMsg -transportDispatcher = AsynsockDispatcher() +transportDispatcher = AsyncoreDispatcher() transportDispatcher.registerRecvCbFun(cbRecvFun) transportDispatcher.registerTimerCbFun(cbTimerFun) diff --git a/examples/v1arch/asyncore/manager/cmdgen/v2c-set.py b/examples/v1arch/asyncore/manager/cmdgen/v2c-set.py index e369a809..f7c22bbd 100644 --- a/examples/v1arch/asyncore/manager/cmdgen/v2c-set.py +++ b/examples/v1arch/asyncore/manager/cmdgen/v2c-set.py @@ -1,6 +1,6 @@ # SET Command Generator -from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher -from pysnmp.carrier.asynsock.dgram import udp +from pysnmp.carrier.asyncore.dispatch import AsyncoreDispatcher +from pysnmp.carrier.asyncore.dgram import udp from pyasn1.codec.ber import encoder, decoder from pysnmp.proto import api from time import time @@ -48,7 +48,7 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress, transportDispatcher.jobFinished(1) return wholeMsg -transportDispatcher = AsynsockDispatcher() +transportDispatcher = AsyncoreDispatcher() transportDispatcher.registerRecvCbFun(cbRecvFun) transportDispatcher.registerTimerCbFun(cbTimerFun) diff --git a/examples/v1arch/asyncore/manager/ntfrcv/listen-on-ipv4-and-ipv6-interfaces.py b/examples/v1arch/asyncore/manager/ntfrcv/listen-on-ipv4-and-ipv6-interfaces.py index cda81a66..3a1b0266 100644 --- a/examples/v1arch/asyncore/manager/ntfrcv/listen-on-ipv4-and-ipv6-interfaces.py +++ b/examples/v1arch/asyncore/manager/ntfrcv/listen-on-ipv4-and-ipv6-interfaces.py @@ -1,6 +1,6 @@ # Notification Receiver (TRAP PDU) -from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher -from pysnmp.carrier.asynsock.dgram import udp, udp6, unix +from pysnmp.carrier.asyncore.dispatch import AsyncoreDispatcher +from pysnmp.carrier.asyncore.dgram import udp, udp6, unix from pyasn1.codec.ber import decoder from pysnmp.proto import api @@ -50,7 +50,7 @@ def cbFun(transportDispatcher, transportDomain, transportAddress, wholeMsg): print('%s = %s' % (oid.prettyPrint(), val.prettyPrint())) return wholeMsg -transportDispatcher = AsynsockDispatcher() +transportDispatcher = AsyncoreDispatcher() transportDispatcher.registerRecvCbFun(cbFun) -- cgit v1.2.1