summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2005-06-09 14:59:45 (GMT)
committerAndrew M. Kuchling <amk@amk.ca>2005-06-09 14:59:45 (GMT)
commitca69f0248c94a08f2077f8e17cf6ad556a2d9d16 (patch)
tree91ebad0662eeae781d046f25671776a86f2e1628
parent5ac2534bbc92b21dec5a69e78f42fe654cbc8b2b (diff)
downloadcpython-ca69f0248c94a08f2077f8e17cf6ad556a2d9d16.zip
cpython-ca69f0248c94a08f2077f8e17cf6ad556a2d9d16.tar.gz
cpython-ca69f0248c94a08f2077f8e17cf6ad556a2d9d16.tar.bz2
[Patch #1002763] Allow long ints as terminator values; also, treat a terminator of 0 like the empty string or None
-rw-r--r--Lib/asynchat.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/asynchat.py b/Lib/asynchat.py
index 28b89a2..6f99ba1 100644
--- a/Lib/asynchat.py
+++ b/Lib/asynchat.py
@@ -101,11 +101,11 @@ class async_chat (asyncore.dispatcher):
while self.ac_in_buffer:
lb = len(self.ac_in_buffer)
terminator = self.get_terminator()
- if terminator is None or terminator == '':
+ if not terminator:
# no terminator, collect it all
self.collect_incoming_data (self.ac_in_buffer)
self.ac_in_buffer = ''
- elif isinstance(terminator, int):
+ elif isinstance(terminator, int) or isinstance(terminator, long):
# numeric terminator
n = terminator
if lb < n: