summaryrefslogtreecommitdiffstats
path: root/Lib/asynchat.py
diff options
context:
space:
mode:
authorJosiah Carlson <josiah.carlson@gmail.com>2008-07-07 05:04:12 (GMT)
committerJosiah Carlson <josiah.carlson@gmail.com>2008-07-07 05:04:12 (GMT)
commit9f2f83338f54a769497fd122e86170aa58cf5603 (patch)
tree525f6de8d461e6fe1d7c2824e1aa08b7e8d2a285 /Lib/asynchat.py
parent35bf9bf68cf70ead3f52c95a677cb27505dec9f9 (diff)
downloadcpython-9f2f83338f54a769497fd122e86170aa58cf5603.zip
cpython-9f2f83338f54a769497fd122e86170aa58cf5603.tar.gz
cpython-9f2f83338f54a769497fd122e86170aa58cf5603.tar.bz2
Fixed bugs 760475, 953599, and 1519. This is a translation of changelist 64768
to the py3k branch.
Diffstat (limited to 'Lib/asynchat.py')
-rw-r--r--Lib/asynchat.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/asynchat.py b/Lib/asynchat.py
index ae82cfa..6558512 100644
--- a/Lib/asynchat.py
+++ b/Lib/asynchat.py
@@ -77,7 +77,7 @@ class async_chat (asyncore.dispatcher):
use_encoding = 0
encoding = 'latin1'
- def __init__ (self, conn=None):
+ def __init__ (self, sock=None, map=None):
# for string terminator matching
self.ac_in_buffer = b''
@@ -92,7 +92,7 @@ class async_chat (asyncore.dispatcher):
# 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")