- 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

24 files changed, 26 insertions, 26 deletions

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