Fixed bugs 760475, 953599, and 1519.
diff --git a/Lib/asynchat.py b/Lib/asynchat.py
index 1d5fb7f..8a7176d 100644
--- a/Lib/asynchat.py
+++ b/Lib/asynchat.py
@@ -59,7 +59,7 @@
     ac_in_buffer_size       = 4096
     ac_out_buffer_size      = 4096
 
-    def __init__ (self, conn=None):
+    def __init__ (self, sock=None, map=None):
         # for string terminator matching
         self.ac_in_buffer = ''
 
@@ -74,7 +74,7 @@
         # we toss the use of the "simple producer" and replace it with
         # a pure deque, which the original fifo was a wrapping of
         self.producer_fifo = deque()
-        asyncore.dispatcher.__init__ (self, conn)
+        asyncore.dispatcher.__init__ (self, sock, map)
 
     def collect_incoming_data(self, data):
         raise NotImplementedError("must be implemented in subclass")