- 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

6 files changed, 9 insertions, 9 deletions

diff --git a/pysnmp/carrier/asyncore/base.py b/pysnmp/carrier/asyncore/base.py
index 76853678..45e2fb23 100644
--- a/pysnmp/carrier/asyncore/base.py
+++ b/pysnmp/carrier/asyncore/base.py
@@ -3,11 +3,11 @@ import socket, sys
 import asyncore
 from pysnmp.carrier import error
 from pysnmp.carrier.base import AbstractTransport
-from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher
+from pysnmp.carrier.asyncore.dispatch import AsyncoreDispatcher
 from pysnmp import debug
 
 class AbstractSocketTransport(asyncore.dispatcher, AbstractTransport):
-    protoTransportDispatcher = AsynsockDispatcher
+    protoTransportDispatcher = AsyncoreDispatcher
     sockFamily = sockType = None
     retryCount = 0; retryInterval = 0
     bufferSize = 131070
@@ -36,10 +36,10 @@ class AbstractSocketTransport(asyncore.dispatcher, AbstractTransport):
             except Exception:
                 debug.logger & debug.flagIO and debug.logger('%s: socket buffer size option mangling failure for buffer %d: %s' % (self.__class__.__name__, b, sys.exc_info()[1]))
 
-        # The socket map is managed by the AsynsockDispatcher on
+        # The socket map is managed by the AsyncoreDispatcher on
         # which this transport is registered. Here we just prepare
         # socket and postpone transport registration at dispatcher
-        # till AsynsockDispatcher invokes registerSocket()
+        # till AsyncoreDispatcher invokes registerSocket()
 
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.setblocking(0)
diff --git a/pysnmp/carrier/asyncore/dgram/base.py b/pysnmp/carrier/asyncore/dgram/base.py
index 9588238e..5b87e70c 100644
--- a/pysnmp/carrier/asyncore/dgram/base.py
+++ b/pysnmp/carrier/asyncore/dgram/base.py
@@ -1,6 +1,6 @@
 # Implements asyncore-based generic DGRAM transport
 import socket, errno, sys
-from pysnmp.carrier.asynsock.base import AbstractSocketTransport
+from pysnmp.carrier.asyncore.base import AbstractSocketTransport
 from pysnmp.carrier import sockfix, sockmsg, error
 from pysnmp import debug
 
diff --git a/pysnmp/carrier/asyncore/dgram/udp.py b/pysnmp/carrier/asyncore/dgram/udp.py
index 1f605ff1..c1cf2027 100644
--- a/pysnmp/carrier/asyncore/dgram/udp.py
+++ b/pysnmp/carrier/asyncore/dgram/udp.py
@@ -1,7 +1,7 @@
 # Implements asyncore-based UDP transport domain
 from socket import AF_INET
 from pysnmp.carrier.base import AbstractTransportAddress
-from pysnmp.carrier.asynsock.dgram.base import DgramSocketTransport
+from pysnmp.carrier.asyncore.dgram.base import DgramSocketTransport
 
 domainName = snmpUDPDomain = (1, 3, 6, 1, 6, 1, 1)
 
diff --git a/pysnmp/carrier/asyncore/dgram/udp6.py b/pysnmp/carrier/asyncore/dgram/udp6.py
index ec30569e..73d0d663 100644
--- a/pysnmp/carrier/asyncore/dgram/udp6.py
+++ b/pysnmp/carrier/asyncore/dgram/udp6.py
@@ -1,7 +1,7 @@
 # Implements asyncore-based UDP6 transport domain
 from pysnmp.carrier import sockfix
 from pysnmp.carrier.base import AbstractTransportAddress
-from pysnmp.carrier.asynsock.dgram.base import DgramSocketTransport
+from pysnmp.carrier.asyncore.dgram.base import DgramSocketTransport
 import socket
 
 domainName = snmpUDP6Domain = (1, 3, 6, 1, 2, 1, 100, 1, 2)
diff --git a/pysnmp/carrier/asyncore/dgram/unix.py b/pysnmp/carrier/asyncore/dgram/unix.py
index adfc7ecf..de53d441 100644
--- a/pysnmp/carrier/asyncore/dgram/unix.py
+++ b/pysnmp/carrier/asyncore/dgram/unix.py
@@ -6,7 +6,7 @@ try:
 except ImportError:
     AF_UNIX = None
 from pysnmp.carrier.base import AbstractTransportAddress
-from pysnmp.carrier.asynsock.dgram.base import DgramSocketTransport
+from pysnmp.carrier.asyncore.dgram.base import DgramSocketTransport
 
 domainName = snmpLocalDomain = (1, 3, 6, 1, 2, 1, 100, 1, 13)
 
diff --git a/pysnmp/carrier/asyncore/dispatch.py b/pysnmp/carrier/asyncore/dispatch.py
index d232f87a..790152d0 100644
--- a/pysnmp/carrier/asyncore/dispatch.py
+++ b/pysnmp/carrier/asyncore/dispatch.py
@@ -7,7 +7,7 @@ from asyncore import loop
 from pysnmp.carrier.base import AbstractTransportDispatcher
 from pysnmp.error import PySnmpError
 
-class AsynsockDispatcher(AbstractTransportDispatcher):
+class AsyncoreDispatcher(AbstractTransportDispatcher):
     def __init__(self):
         self.__sockMap = {} # use own map for MT safety
         self.timeout = 0.5