- 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

61 files changed, 83 insertions, 83 deletions

diff --git a/examples/v1arch/agent/cmdrsp.py b/examples/v1arch/agent/cmdrsp.py
index 73e1413..1007a47 100644
--- a/examples/v1arch/agent/cmdrsp.py
+++ b/examples/v1arch/agent/cmdrsp.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/agent/ntforg.py b/examples/v1arch/agent/ntforg.py
index 5b79132..66c8a53 100644
--- a/examples/v1arch/agent/ntforg.py
+++ b/examples/v1arch/agent/ntforg.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/manager/bulkgen.py b/examples/v1arch/manager/bulkgen.py
index 5e37d9f..d4c7ca7 100644
--- a/examples/v1arch/manager/bulkgen.py
+++ b/examples/v1arch/manager/bulkgen.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/manager/get-v2c-spoof-source-address.py b/examples/v1arch/manager/get-v2c-spoof-source-address.py
index 28f2190..acaefac 100644
--- a/examples/v1arch/manager/get-v2c-spoof-source-address.py
+++ b/examples/v1arch/manager/get-v2c-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/manager/get-v2c-udp-broadcast-agent-discovery.py b/examples/v1arch/manager/get-v2c-udp-broadcast-agent-discovery.py
index 7bba894..2ac0f18 100644
--- a/examples/v1arch/manager/get-v2c-udp-broadcast-agent-discovery.py
+++ b/examples/v1arch/manager/get-v2c-udp-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/manager/getgen.py b/examples/v1arch/manager/getgen.py
index c5233db..a44707e 100644
--- a/examples/v1arch/manager/getgen.py
+++ b/examples/v1arch/manager/getgen.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/manager/nextgen.py b/examples/v1arch/manager/nextgen.py
index d15a4ef..d0cefc3 100644
--- a/examples/v1arch/manager/nextgen.py
+++ b/examples/v1arch/manager/nextgen.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/manager/ntfrcv.py b/examples/v1arch/manager/ntfrcv.py
index cda81a6..3a1b026 100644
--- a/examples/v1arch/manager/ntfrcv.py
+++ b/examples/v1arch/manager/ntfrcv.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)
 
diff --git a/examples/v1arch/manager/setgen.py b/examples/v1arch/manager/setgen.py
index e369a80..f7c22bb 100644
--- a/examples/v1arch/manager/setgen.py
+++ b/examples/v1arch/manager/setgen.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/v3arch/agent/cmdrsp/v1-read-and-write-communities.py b/examples/v3arch/agent/cmdrsp/v1-read-and-write-communities.py
index c8ff23c..d7e3a4d 100644
--- a/examples/v3arch/agent/cmdrsp/v1-read-and-write-communities.py
+++ b/examples/v3arch/agent/cmdrsp/v1-read-and-write-communities.py
@@ -16,7 +16,7 @@
 #
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, context
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 
 # Create SNMP engine with autogenernated engineID and pre-bound
 # to socket transport dispatcher
diff --git a/examples/v3arch/agent/cmdrsp/v2c-custom-scalar-mib-objects.py b/examples/v3arch/agent/cmdrsp/v2c-custom-scalar-mib-objects.py
index db14628..4761038 100644
--- a/examples/v3arch/agent/cmdrsp/v2c-custom-scalar-mib-objects.py
+++ b/examples/v3arch/agent/cmdrsp/v2c-custom-scalar-mib-objects.py
@@ -17,7 +17,7 @@
 import sys
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, context
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.proto.api import v2c
 
 # Create SNMP engine
diff --git a/examples/v3arch/agent/cmdrsp/v2c-custom-tabular-mib-objects.py b/examples/v3arch/agent/cmdrsp/v2c-custom-tabular-mib-objects.py
index a631493..f6381dc 100644
--- a/examples/v3arch/agent/cmdrsp/v2c-custom-tabular-mib-objects.py
+++ b/examples/v3arch/agent/cmdrsp/v2c-custom-tabular-mib-objects.py
@@ -25,7 +25,7 @@
 #
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, context
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.proto.api import v2c
 
 # Create SNMP engine
diff --git a/examples/v3arch/agent/cmdrsp/v2c-multiple-interfaces.py b/examples/v3arch/agent/cmdrsp/v2c-multiple-interfaces.py
index 91af55e..8d67802 100644
--- a/examples/v3arch/agent/cmdrsp/v2c-multiple-interfaces.py
+++ b/examples/v3arch/agent/cmdrsp/v2c-multiple-interfaces.py
@@ -16,7 +16,7 @@
 #
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, context
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 
 # Create SNMP engine with autogenernated engineID and pre-bound
 # to socket transport dispatcher
diff --git a/examples/v3arch/agent/cmdrsp/v2c-multiple-transports.py b/examples/v3arch/agent/cmdrsp/v2c-multiple-transports.py
index a17c490..f9115e7 100644
--- a/examples/v3arch/agent/cmdrsp/v2c-multiple-transports.py
+++ b/examples/v3arch/agent/cmdrsp/v2c-multiple-transports.py
@@ -17,7 +17,7 @@
 #
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, context
-from pysnmp.carrier.asynsock.dgram import udp, udp6
+from pysnmp.carrier.asyncore.dgram import udp, udp6
 
 # Create SNMP engine with autogenernated engineID and pre-bound
 # to socket transport dispatcher
diff --git a/examples/v3arch/agent/cmdrsp/v3-alternative-mib-controller.py b/examples/v3arch/agent/cmdrsp/v3-alternative-mib-controller.py
index bc2d87c..5fe26a7 100644
--- a/examples/v3arch/agent/cmdrsp/v3-alternative-mib-controller.py
+++ b/examples/v3arch/agent/cmdrsp/v3-alternative-mib-controller.py
@@ -17,7 +17,7 @@
 #
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, context
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.smi import instrum
 from pysnmp.proto.api import v2c
 
diff --git a/examples/v3arch/agent/cmdrsp/v3-alternative-mib.py b/examples/v3arch/agent/cmdrsp/v3-alternative-mib.py
index 95ff5b8..eabb989 100644
--- a/examples/v3arch/agent/cmdrsp/v3-alternative-mib.py
+++ b/examples/v3arch/agent/cmdrsp/v3-alternative-mib.py
@@ -18,7 +18,7 @@
 #
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, context
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.smi import instrum, builder
 from pysnmp.proto.api import v2c
 
diff --git a/examples/v3arch/agent/cmdrsp/v3-custom-engine-id.py b/examples/v3arch/agent/cmdrsp/v3-custom-engine-id.py
index af1605e..4a58de3 100644
--- a/examples/v3arch/agent/cmdrsp/v3-custom-engine-id.py
+++ b/examples/v3arch/agent/cmdrsp/v3-custom-engine-id.py
@@ -16,7 +16,7 @@
 #
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, context
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.proto import rfc1902
 
 # Create SNMP engine
diff --git a/examples/v3arch/agent/cmdrsp/v3-multiple-snmp-engines.py b/examples/v3arch/agent/cmdrsp/v3-multiple-snmp-engines.py
index 8a13b40..870363a 100644
--- a/examples/v3arch/agent/cmdrsp/v3-multiple-snmp-engines.py
+++ b/examples/v3arch/agent/cmdrsp/v3-multiple-snmp-engines.py
@@ -26,8 +26,8 @@
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, context
 from pysnmp.proto import rfc1902
-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
 
 # Configuration parameters for each of SNMP Engines
 snmpEngineInfo = (
@@ -36,7 +36,7 @@ snmpEngineInfo = (
 )
 
 # Instantiate the single transport dispatcher object
-transportDispatcher = AsynsockDispatcher()
+transportDispatcher = AsyncoreDispatcher()
 
 # Setup a custom data routing function to select snmpEngine by transportDomain
 transportDispatcher.registerRoutingCbFun(lambda td,t,d: td)
diff --git a/examples/v3arch/agent/cmdrsp/v3-multiple-users.py b/examples/v3arch/agent/cmdrsp/v3-multiple-users.py
index b89567e..1f11a58 100644
--- a/examples/v3arch/agent/cmdrsp/v3-multiple-users.py
+++ b/examples/v3arch/agent/cmdrsp/v3-multiple-users.py
@@ -19,7 +19,7 @@
 #
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, context
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 
 # Create SNMP engine
 snmpEngine = engine.SnmpEngine()
diff --git a/examples/v3arch/agent/cmdrsp/v3-observe-request-processing.py b/examples/v3arch/agent/cmdrsp/v3-observe-request-processing.py
index 842f1d7..53dad9a 100644
--- a/examples/v3arch/agent/cmdrsp/v3-observe-request-processing.py
+++ b/examples/v3arch/agent/cmdrsp/v3-observe-request-processing.py
@@ -20,7 +20,7 @@
 #
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, context
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 
 # Create SNMP engine
 snmpEngine = engine.SnmpEngine()
diff --git a/examples/v3arch/agent/cmdrsp/v3-preserve-original-destination-address.py b/examples/v3arch/agent/cmdrsp/v3-preserve-original-destination-address.py
index a371cd6..55e282f 100644
--- a/examples/v3arch/agent/cmdrsp/v3-preserve-original-destination-address.py
+++ b/examples/v3arch/agent/cmdrsp/v3-preserve-original-destination-address.py
@@ -32,7 +32,7 @@
 # 
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, context
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 
 # Create SNMP engine
 snmpEngine = engine.SnmpEngine()
diff --git a/examples/v3arch/agent/ntforg/inform-multiple-protocols.py b/examples/v3arch/agent/ntforg/inform-multiple-protocols.py
index 8f70ef9..d8093ad 100644
--- a/examples/v3arch/agent/ntforg/inform-multiple-protocols.py
+++ b/examples/v3arch/agent/ntforg/inform-multiple-protocols.py
@@ -17,7 +17,7 @@
 #   1.3.6.1.2.1.1.1.0 = 'Example Notificator'
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import ntforg
 from pysnmp.proto.api import v2c
 
diff --git a/examples/v3arch/agent/ntforg/inform-v2c.py b/examples/v3arch/agent/ntforg/inform-v2c.py
index 9c52655..dd10f85 100644
--- a/examples/v3arch/agent/ntforg/inform-v2c.py
+++ b/examples/v3arch/agent/ntforg/inform-v2c.py
@@ -14,7 +14,7 @@
 #   1.3.6.1.2.1.1.5.0 = 'Notificator Example'
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import ntforg
 from pysnmp.proto.api import v2c
 
diff --git a/examples/v3arch/agent/ntforg/inform-v3.py b/examples/v3arch/agent/ntforg/inform-v3.py
index ef5355a..6a888df 100644
--- a/examples/v3arch/agent/ntforg/inform-v3.py
+++ b/examples/v3arch/agent/ntforg/inform-v3.py
@@ -12,7 +12,7 @@
 # * include managed object information 1.3.6.1.2.1.1.5.0 = 'system name'
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import ntforg
 from pysnmp.proto.api import v2c
 
diff --git a/examples/v3arch/agent/ntforg/trap-v1-from-specific-address.py b/examples/v3arch/agent/ntforg/trap-v1-from-specific-address.py
index 04dcd56..b99389a 100644
--- a/examples/v3arch/agent/ntforg/trap-v1-from-specific-address.py
+++ b/examples/v3arch/agent/ntforg/trap-v1-from-specific-address.py
@@ -12,7 +12,7 @@
 # * with TRAP ID 'coldStart' specified as an OID
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import ntforg
 from pysnmp.proto.api import v2c
 
diff --git a/examples/v3arch/agent/ntforg/trap-v1.py b/examples/v3arch/agent/ntforg/trap-v1.py
index 2ac5071..83500f2 100644
--- a/examples/v3arch/agent/ntforg/trap-v1.py
+++ b/examples/v3arch/agent/ntforg/trap-v1.py
@@ -16,7 +16,7 @@
 # * include managed object information '1.3.6.1.2.1.1.1.0' = 'my system'
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import ntforg
 from pysnmp.proto.api import v2c
 #from pysnmp import debug
diff --git a/examples/v3arch/agent/ntforg/trap-v2c-custom-pdu.py b/examples/v3arch/agent/ntforg/trap-v2c-custom-pdu.py
index 8dd1275..f1e67e8 100644
--- a/examples/v3arch/agent/ntforg/trap-v2c-custom-pdu.py
+++ b/examples/v3arch/agent/ntforg/trap-v2c-custom-pdu.py
@@ -13,7 +13,7 @@
 #   1.3.6.1.6.3.1.1.4.1.0 = 1.3.6.1.6.3.1.1.5.1
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import ntforg
 from pysnmp.proto.api import v2c
 
diff --git a/examples/v3arch/agent/ntforg/trap-v2c-multiple-addresses.py b/examples/v3arch/agent/ntforg/trap-v2c-multiple-addresses.py
index 709e972..5b994cf 100644
--- a/examples/v3arch/agent/ntforg/trap-v2c-multiple-addresses.py
+++ b/examples/v3arch/agent/ntforg/trap-v2c-multiple-addresses.py
@@ -15,7 +15,7 @@
 #   1.3.6.1.2.1.1.5.0 = 'Notificator Example'
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import ntforg
 from pysnmp.proto.api import v2c
 
diff --git a/examples/v3arch/agent/ntforg/trap-v2c-multiple-targets.py b/examples/v3arch/agent/ntforg/trap-v2c-multiple-targets.py
index cd6432b..65bb20d 100644
--- a/examples/v3arch/agent/ntforg/trap-v2c-multiple-targets.py
+++ b/examples/v3arch/agent/ntforg/trap-v2c-multiple-targets.py
@@ -15,7 +15,7 @@
 #   1.3.6.1.2.1.1.5.0 = 'Notificator Example'
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import ntforg
 from pysnmp.proto.api import v2c
 
diff --git a/examples/v3arch/agent/ntforg/trap-v2c-multiple-transports.py b/examples/v3arch/agent/ntforg/trap-v2c-multiple-transports.py
index e2589da..e8b674d 100644
--- a/examples/v3arch/agent/ntforg/trap-v2c-multiple-transports.py
+++ b/examples/v3arch/agent/ntforg/trap-v2c-multiple-transports.py
@@ -14,7 +14,7 @@
 #   1.3.6.1.2.1.1.5.0 = 'Notificator Example'
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp, udp6
+from pysnmp.carrier.asyncore.dgram import udp, udp6
 from pysnmp.entity.rfc3413 import ntforg
 from pysnmp.proto.api import v2c
 
diff --git a/examples/v3arch/agent/ntforg/trap-v2c-with-objects.py b/examples/v3arch/agent/ntforg/trap-v2c-with-objects.py
index ad17348..4124a39 100644
--- a/examples/v3arch/agent/ntforg/trap-v2c-with-objects.py
+++ b/examples/v3arch/agent/ntforg/trap-v2c-with-objects.py
@@ -23,7 +23,7 @@
 # To run this example make sure to have IF-MIB.py in search path.
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import ntforg
 from pysnmp.smi import rfc1902, view
 
diff --git a/examples/v3arch/agent/ntforg/trap-v2c.py b/examples/v3arch/agent/ntforg/trap-v2c.py
index d63a371..1ada77b 100644
--- a/examples/v3arch/agent/ntforg/trap-v2c.py
+++ b/examples/v3arch/agent/ntforg/trap-v2c.py
@@ -14,7 +14,7 @@
 #   1.3.6.1.2.1.1.5.0 = 'Notificator Example'
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import ntforg
 from pysnmp.proto.api import v2c
 
diff --git a/examples/v3arch/agent/ntforg/trap-v3.py b/examples/v3arch/agent/ntforg/trap-v3.py
index 266d91e..db2c965 100644
--- a/examples/v3arch/agent/ntforg/trap-v3.py
+++ b/examples/v3arch/agent/ntforg/trap-v3.py
@@ -12,7 +12,7 @@
 # * include managed object information 1.3.6.1.2.1.1.5.0 = 'system name'
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import ntforg
 from pysnmp.proto.api import v2c
 
diff --git a/examples/v3arch/manager/cmdgen/get-v1.py b/examples/v3arch/manager/cmdgen/get-v1.py
index 4fbfb8b..af54eb8 100644
--- a/examples/v3arch/manager/cmdgen/get-v1.py
+++ b/examples/v3arch/manager/cmdgen/get-v1.py
@@ -12,7 +12,7 @@
 # $ snmpget -v1 -c public -ObentU 195.218.195.228 1.3.6.1.2.1.1.1.0
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import cmdgen
 
 # Create SNMP engine instance
diff --git a/examples/v3arch/manager/cmdgen/get-v2c-custom-timeout.py b/examples/v3arch/manager/cmdgen/get-v2c-custom-timeout.py
index 5ea17a4..5fbd3eb 100644
--- a/examples/v3arch/manager/cmdgen/get-v2c-custom-timeout.py
+++ b/examples/v3arch/manager/cmdgen/get-v2c-custom-timeout.py
@@ -13,7 +13,7 @@
 # $ snmpget -v2c -c public -ObentU -r 5 -t 1 195.218.195.228 1.3.6.1.2.1.1.1.0
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import cmdgen
 
 # Create SNMP engine instance
diff --git a/examples/v3arch/manager/cmdgen/get-v2c-spoof-source-address.py b/examples/v3arch/manager/cmdgen/get-v2c-spoof-source-address.py
index 036cf3f..cab2912 100644
--- a/examples/v3arch/manager/cmdgen/get-v2c-spoof-source-address.py
+++ b/examples/v3arch/manager/cmdgen/get-v2c-spoof-source-address.py
@@ -23,7 +23,7 @@
 # 
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import cmdgen
 
 # Create SNMP engine instance
diff --git a/examples/v3arch/manager/cmdgen/get-v3-custom-context.py b/examples/v3arch/manager/cmdgen/get-v3-custom-context.py
index 0be8da9..01fd25d 100644
--- a/examples/v3arch/manager/cmdgen/get-v3-custom-context.py
+++ b/examples/v3arch/manager/cmdgen/get-v3-custom-context.py
@@ -15,7 +15,7 @@
 # $ snmpget -v3 -l authNoPriv -u usr-md5-none -A authkey1 -E 80004fb805636c6f75644dab22cc -n da761cfc8c94d3aceef4f60f049105ba -ObentU 195.218.195.228:161  1.3.6.1.2.1.1.1.0
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import cmdgen
 from pysnmp.proto import rfc1902
 
diff --git a/examples/v3arch/manager/cmdgen/get-v3-observe-request-processing.py b/examples/v3arch/manager/cmdgen/get-v3-observe-request-processing.py
index 09c543b..d05be2d 100644
--- a/examples/v3arch/manager/cmdgen/get-v3-observe-request-processing.py
+++ b/examples/v3arch/manager/cmdgen/get-v3-observe-request-processing.py
@@ -16,7 +16,7 @@
 # $ snmpget -v3 -l authPriv -u usr-sha-aes -a SHA -A authkey1 -x AES -X privkey1 -ObentU 195.218.195.228:161  1.3.6.1.2.1.1.1.0
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import cmdgen
 
 # Create SNMP engine instance
diff --git a/examples/v3arch/manager/cmdgen/get-v3.py b/examples/v3arch/manager/cmdgen/get-v3.py
index 68a6106..9820543 100644
--- a/examples/v3arch/manager/cmdgen/get-v3.py
+++ b/examples/v3arch/manager/cmdgen/get-v3.py
@@ -12,7 +12,7 @@
 # $ snmpget -v3 -l authPriv -u usr-sha-aes -a SHA -A authkey1 -x AES -X privkey1 -ObentU 195.218.195.228:161  1.3.6.1.2.1.1.1.0
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import cmdgen
 
 # Create SNMP engine instance
diff --git a/examples/v3arch/manager/cmdgen/getbulk-v2c.py b/examples/v3arch/manager/cmdgen/getbulk-v2c.py
index 697c4cd..6c451a3 100644
--- a/examples/v3arch/manager/cmdgen/getbulk-v2c.py
+++ b/examples/v3arch/manager/cmdgen/getbulk-v2c.py
@@ -15,7 +15,7 @@
 #
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdgen
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 
 # Create SNMP engine instance
 snmpEngine = engine.SnmpEngine()
diff --git a/examples/v3arch/manager/cmdgen/getbulk-v3.py b/examples/v3arch/manager/cmdgen/getbulk-v3.py
index 660dcb2..934fcd6 100644
--- a/examples/v3arch/manager/cmdgen/getbulk-v3.py
+++ b/examples/v3arch/manager/cmdgen/getbulk-v3.py
@@ -15,7 +15,7 @@
 #
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdgen
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 
 # Create SNMP engine instance
 snmpEngine = engine.SnmpEngine()
diff --git a/examples/v3arch/manager/cmdgen/getnext-v1.py b/examples/v3arch/manager/cmdgen/getnext-v1.py
index a5a17b4..5d4420c 100644
--- a/examples/v3arch/manager/cmdgen/getnext-v1.py
+++ b/examples/v3arch/manager/cmdgen/getnext-v1.py
@@ -13,7 +13,7 @@
 # $ snmpwalk -v1 -c public -ObentU 195.218.195.228 1.3.6.1.2.1.1 1.3.6.1.4.1.1
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import cmdgen
 
 # Create SNMP engine instance
diff --git a/examples/v3arch/manager/cmdgen/getnext-v2c-from-specific-address.py b/examples/v3arch/manager/cmdgen/getnext-v2c-from-specific-address.py
index dd8e4fd..4ce9877 100644
--- a/examples/v3arch/manager/cmdgen/getnext-v2c-from-specific-address.py
+++ b/examples/v3arch/manager/cmdgen/getnext-v2c-from-specific-address.py
@@ -14,7 +14,7 @@
 # $ snmpwalk -v2c -c public -ObentU 195.218.195.228 1.3.6.1.2.1.1 1.3.6.1.4.1.1
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import cmdgen
 
 # Create SNMP engine instance
diff --git a/examples/v3arch/manager/cmdgen/getnext-v2c-with-mib-compilation-and-lookup.py b/examples/v3arch/manager/cmdgen/getnext-v2c-with-mib-compilation-and-lookup.py
index eab7906..59e0bba 100644
--- a/examples/v3arch/manager/cmdgen/getnext-v2c-with-mib-compilation-and-lookup.py
+++ b/examples/v3arch/manager/cmdgen/getnext-v2c-with-mib-compilation-and-lookup.py
@@ -13,7 +13,7 @@
 # $ snmpwalk -v1 -c public -ObentU 195.218.195.228 1.3.6.1.2.1.1 1.3.6.1.4.1.1
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import cmdgen
 from pysnmp.smi import compiler, view, rfc1902
 
diff --git a/examples/v3arch/manager/cmdgen/getnext-v3-over-ipv6.py b/examples/v3arch/manager/cmdgen/getnext-v3-over-ipv6.py
index 2a9e93a..ebdcb8a 100644
--- a/examples/v3arch/manager/cmdgen/getnext-v3-over-ipv6.py
+++ b/examples/v3arch/manager/cmdgen/getnext-v3-over-ipv6.py
@@ -13,7 +13,7 @@
 # $ snmpwalk -v3 -l authNoPriv -u usr-md5-none -A authkey1 -ObentU udp6:[::1]:161 1.3.6.1.2.1.1 1.3.6.1.4.1.1
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp6
+from pysnmp.carrier.asyncore.dgram import udp6
 from pysnmp.entity.rfc3413 import cmdgen
 
 # Create SNMP engine instance
diff --git a/examples/v3arch/manager/cmdgen/getnext-v3-pull-subtree.py b/examples/v3arch/manager/cmdgen/getnext-v3-pull-subtree.py
index 0c870a7..abf3bab 100644
--- a/examples/v3arch/manager/cmdgen/getnext-v3-pull-subtree.py
+++ b/examples/v3arch/manager/cmdgen/getnext-v3-pull-subtree.py
@@ -13,7 +13,7 @@
 # $ snmpwalk -v3 -l noAuthNoPriv -u usr-none-none -ObentU 195.218.195.228:161  1.3.6.1.2.1.1 
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import cmdgen
 from pysnmp.proto import rfc1902
 
diff --git a/examples/v3arch/manager/cmdgen/set-v1.py b/examples/v3arch/manager/cmdgen/set-v1.py
index ba94a3b..05e8292 100644
--- a/examples/v3arch/manager/cmdgen/set-v1.py
+++ b/examples/v3arch/manager/cmdgen/set-v1.py
@@ -12,7 +12,7 @@
 # $ snmpset -v1 -c private -ObentU 195.218.195.228:161 1.3.6.1.2.1.1.9.1.3.1 s 'my value'  1.3.6.1.2.1.1.9.1.4.1 t 123 
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import cmdgen
 from pysnmp.proto import rfc1902
 
diff --git a/examples/v3arch/manager/cmdgen/set-v2c.py b/examples/v3arch/manager/cmdgen/set-v2c.py
index 00db8a0..620eded 100644
--- a/examples/v3arch/manager/cmdgen/set-v2c.py
+++ b/examples/v3arch/manager/cmdgen/set-v2c.py
@@ -12,7 +12,7 @@
 # $ snmpset -v2c -c private -ObentU 195.218.195.228:161 1.3.6.1.2.1.1.9.1.4.1 t 123
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import cmdgen
 from pysnmp.proto import rfc1902
 
diff --git a/examples/v3arch/manager/cmdgen/set-v3.py b/examples/v3arch/manager/cmdgen/set-v3.py
index fd48438..790fb3f 100644
--- a/examples/v3arch/manager/cmdgen/set-v3.py
+++ b/examples/v3arch/manager/cmdgen/set-v3.py
@@ -12,7 +12,7 @@
 # $ snmpset -v3 -l authNoPriv -u usr-sha-none -a SHA -A authkey1 -ObentU 195.218.195.228:161 1.3.6.1.2.1.1.9.1.3.1 s 'my new value'
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import cmdgen
 from pysnmp.proto import rfc1902
 
diff --git a/examples/v3arch/manager/ntfrcv/v2c-multiple-interfaces.py b/examples/v3arch/manager/ntfrcv/v2c-multiple-interfaces.py
index 182338b..c4dbae8 100644
--- a/examples/v3arch/manager/ntfrcv/v2c-multiple-interfaces.py
+++ b/examples/v3arch/manager/ntfrcv/v2c-multiple-interfaces.py
@@ -16,7 +16,7 @@
 # $ snmpinform -v2c -c public 127.0.0.1:2162 123 1.3.6.1.6.3.1.1.5.1
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import ntfrcv
 
 # Create SNMP engine with autogenernated engineID and pre-bound
diff --git a/examples/v3arch/manager/ntfrcv/v2c-multiple-transports.py b/examples/v3arch/manager/ntfrcv/v2c-multiple-transports.py
index 1f9c739..2b54998 100644
--- a/examples/v3arch/manager/ntfrcv/v2c-multiple-transports.py
+++ b/examples/v3arch/manager/ntfrcv/v2c-multiple-transports.py
@@ -17,7 +17,7 @@
 # $ snmpinform -v2c -c public 127.0.0.1 123 1.3.6.1.6.3.1.1.5.1
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp, udp6
+from pysnmp.carrier.asyncore.dgram import udp, udp6
 from pysnmp.entity.rfc3413 import ntfrcv
 
 # Create SNMP engine with autogenernated engineID and pre-bound
diff --git a/examples/v3arch/manager/ntfrcv/v2c-observe-request-processing.py b/examples/v3arch/manager/ntfrcv/v2c-observe-request-processing.py
index 41796dd..5651a6f 100644
--- a/examples/v3arch/manager/ntfrcv/v2c-observe-request-processing.py
+++ b/examples/v3arch/manager/ntfrcv/v2c-observe-request-processing.py
@@ -18,7 +18,7 @@
 # $ snmpinform -v2c -c public 127.0.0.1 123 1.3.6.1.6.3.1.1.5.1
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp, udp6
+from pysnmp.carrier.asyncore.dgram import udp, udp6
 from pysnmp.entity.rfc3413 import ntfrcv
 
 # Create SNMP engine with autogenernated engineID and pre-bound
diff --git a/examples/v3arch/manager/ntfrcv/v2c-with-regexp-community-name.py b/examples/v3arch/manager/ntfrcv/v2c-with-regexp-community-name.py
index 61507a4..57a7030 100644
--- a/examples/v3arch/manager/ntfrcv/v2c-with-regexp-community-name.py
+++ b/examples/v3arch/manager/ntfrcv/v2c-with-regexp-community-name.py
@@ -24,7 +24,7 @@
 # CommunityName's, not explicitly configured to local SNMP Engine.
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import ntfrcv
 from pysnmp.proto.api import v2c
 import re
diff --git a/examples/v3arch/manager/ntfrcv/v2c-with-request-details.py b/examples/v3arch/manager/ntfrcv/v2c-with-request-details.py
index e7f1301..ea3aafb 100644
--- a/examples/v3arch/manager/ntfrcv/v2c-with-request-details.py
+++ b/examples/v3arch/manager/ntfrcv/v2c-with-request-details.py
@@ -15,7 +15,7 @@
 # $ snmptrap -v2c -c public 127.0.0.1:162 123 1.3.6.1.6.3.1.1.5.1 1.3.6.1.2.1.1.5.0 s test
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import ntfrcv
 
 # Create SNMP engine with autogenernated engineID and pre-bound
diff --git a/examples/v3arch/manager/ntfrcv/v3-multiple-users.py b/examples/v3arch/manager/ntfrcv/v3-multiple-users.py
index 9f26839..f78d11c 100644
--- a/examples/v3arch/manager/ntfrcv/v3-multiple-users.py
+++ b/examples/v3arch/manager/ntfrcv/v3-multiple-users.py
@@ -19,7 +19,7 @@
 # $ snmpinform -v3 -u usr-sha-aes128 -l authPriv -a SHA -A authkey1 -x AES -X privkey1 127.0.0.1 123 1.3.6.1.6.3.1.1.5.1
 #
 from pysnmp.entity import engine, config
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity.rfc3413 import ntfrcv
 from pysnmp.proto.api import v2c
 
diff --git a/examples/v3arch/oneliner/agent/ntforg/inform-async-multiple-snmp-engines.py b/examples/v3arch/oneliner/agent/ntforg/inform-async-multiple-snmp-engines.py
index 2dfbc55..fcceaf0 100644
--- a/examples/v3arch/oneliner/agent/ntforg/inform-async-multiple-snmp-engines.py
+++ b/examples/v3arch/oneliner/agent/ntforg/inform-async-multiple-snmp-engines.py
@@ -26,7 +26,7 @@
 # 
 from pysnmp.entity.rfc3413.oneliner import ntforg
 from pysnmp.entity import engine
-from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher
+from pysnmp.carrier.asyncore.dispatch import AsyncoreDispatcher
 
 # List of targets in the following format:
 # ( ( authData, transportTarget ), ... )
@@ -54,7 +54,7 @@ def cbFun(snmpEngine, sendRequestHandle, errorIndication,
             print('%s = %s' % (name.prettyPrint(), val.prettyPrint()))
 
 # Instantiate the single transport dispatcher object
-transportDispatcher = AsynsockDispatcher()
+transportDispatcher = AsyncoreDispatcher()
 
 # Setup a custom data routing function to select snmpEngine by transportDomain
 transportDispatcher.registerRoutingCbFun(
diff --git a/examples/v3arch/oneliner/manager/cmdgen/get-async-multiple-snmp-engines.py b/examples/v3arch/oneliner/manager/cmdgen/get-async-multiple-snmp-engines.py
index 94c1f54..45ae42b 100644
--- a/examples/v3arch/oneliner/manager/cmdgen/get-async-multiple-snmp-engines.py
+++ b/examples/v3arch/oneliner/manager/cmdgen/get-async-multiple-snmp-engines.py
@@ -27,7 +27,7 @@
 #
 from pysnmp.entity.rfc3413.oneliner import cmdgen
 from pysnmp.entity import engine
-from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher
+from pysnmp.carrier.asyncore.dispatch import AsyncoreDispatcher
 
 # List of targets in the followin format:
 # ( ( authData, transportTarget, varNames ), ... )
@@ -77,7 +77,7 @@ def cbFun(snmpEngine, sendRequestHandle, errorIndication,
 
 
 # Instantiate the single transport dispatcher object
-transportDispatcher = AsynsockDispatcher()
+transportDispatcher = AsyncoreDispatcher()
 
 # Setup a custom data routing function to select snmpEngine by transportDomain
 transportDispatcher.registerRoutingCbFun(
diff --git a/examples/v3arch/proxy/cmd/udp6-to-udp4-conversion.py b/examples/v3arch/proxy/cmd/udp6-to-udp4-conversion.py
index 96947c7..07497b4 100644
--- a/examples/v3arch/proxy/cmd/udp6-to-udp4-conversion.py
+++ b/examples/v3arch/proxy/cmd/udp6-to-udp4-conversion.py
@@ -21,7 +21,7 @@
 # initial request PDUs from different Managers, into unique values to
 # avoid sending duplicate request-IDs to Agents.
 #
-from pysnmp.carrier.asynsock.dgram import udp, udp6
+from pysnmp.carrier.asyncore.dgram import udp, udp6
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, cmdgen, context
 from pysnmp.proto.api import v2c
diff --git a/examples/v3arch/proxy/cmd/v2c-to-v1-conversion.py b/examples/v3arch/proxy/cmd/v2c-to-v1-conversion.py
index c2b54e0..e6a805c 100644
--- a/examples/v3arch/proxy/cmd/v2c-to-v1-conversion.py
+++ b/examples/v3arch/proxy/cmd/v2c-to-v1-conversion.py
@@ -21,7 +21,7 @@
 # initial request PDUs from different Managers, into unique values to
 # avoid sending duplicate request-IDs to Agents.
 #
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, cmdgen, context
 from pysnmp.proto.api import v2c
diff --git a/examples/v3arch/proxy/cmd/v2c-to-v3-conversion.py b/examples/v3arch/proxy/cmd/v2c-to-v3-conversion.py
index dae1e6b..453d8bb 100644
--- a/examples/v3arch/proxy/cmd/v2c-to-v3-conversion.py
+++ b/examples/v3arch/proxy/cmd/v2c-to-v3-conversion.py
@@ -21,7 +21,7 @@
 # initial request PDUs from different Managers, into unique values to
 # avoid sending duplicate request-IDs to Agents.
 #
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, cmdgen, context
 from pysnmp.proto.api import v2c
diff --git a/examples/v3arch/proxy/cmd/v3-to-v2c-conversion.py b/examples/v3arch/proxy/cmd/v3-to-v2c-conversion.py
index a0d8671..992ff7f 100644
--- a/examples/v3arch/proxy/cmd/v3-to-v2c-conversion.py
+++ b/examples/v3arch/proxy/cmd/v3-to-v2c-conversion.py
@@ -21,7 +21,7 @@
 # initial request PDUs from different Managers, into unique values to
 # avoid sending duplicate request-IDs to Agents.
 #
-from pysnmp.carrier.asynsock.dgram import udp
+from pysnmp.carrier.asyncore.dgram import udp
 from pysnmp.entity import engine, config
 from pysnmp.entity.rfc3413 import cmdrsp, cmdgen, context
 from pysnmp.proto.api import v2c