[Python-3000-checkins] r58831 - python/branches/py3k-pep3137/Lib/test/test_asynchat.py python/branches/py3k-pep3137/Lib/test/test_asyncore.py

[christian.heimes]

Author: christian.heimes
Date: Sat Nov  3 19:30:17 2007
New Revision: 58831

Modified:
   python/branches/py3k-pep3137/Lib/test/test_asynchat.py
   python/branches/py3k-pep3137/Lib/test/test_asyncore.py
Log:
Applied patch from Adam Hupp #1380
fix for test_asynchat and test_asyncore on pep3137 branch

Modified: python/branches/py3k-pep3137/Lib/test/test_asynchat.py
==============================================================================
--- python/branches/py3k-pep3137/Lib/test/test_asynchat.py	(original)
+++ python/branches/py3k-pep3137/Lib/test/test_asynchat.py	Sat Nov  3 19:30:17 2007
@@ -105,17 +105,17 @@
     def test_line_terminator1(self):
         # test one-character terminator
         for l in (1,2,3):
-            self.line_terminator_check(b'\n', l)
+            self.line_terminator_check('\n', l)
 
     def test_line_terminator2(self):
         # test two-character terminator
         for l in (1,2,3):
-            self.line_terminator_check(b'\r\n', l)
+            self.line_terminator_check('\r\n', l)
 
     def test_line_terminator3(self):
         # test three-character terminator
         for l in (1,2,3):
-            self.line_terminator_check(b'qqq', l)
+            self.line_terminator_check('qqq', l)
 
     def numeric_terminator_check(self, termlen):
         # Try reading a fixed number of bytes

Modified: python/branches/py3k-pep3137/Lib/test/test_asyncore.py
==============================================================================
--- python/branches/py3k-pep3137/Lib/test/test_asyncore.py	(original)
+++ python/branches/py3k-pep3137/Lib/test/test_asyncore.py	Sat Nov  3 19:30:17 2007
@@ -70,7 +70,6 @@
             r, w, e = select.select([conn], [], [])
             if r:
                 data = conn.recv(10)
-                assert isinstance(data, bytes)
                 # keep everything except for the newline terminator
                 buf.write(data.replace(b'\n', b''))
                 if b'\n' in data: