[Python-checkins] r71556 - in python/branches/py3k: Lib/test/test_asyncore.py

[r.david.murray]

Author: r.david.murray
Date: Mon Apr 13 03:22:04 2009
New Revision: 71556

Log:
Merged revisions 71553 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71553 | r.david.murray | 2009-04-12 21:06:46 -0400 (Sun, 12 Apr 2009) | 3 lines
  
  Adjust test_asyncore to account for intentional asyncore behavior change
  introduced by r70934 that was causing a test failure when run under -O.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_asyncore.py

Modified: python/branches/py3k/Lib/test/test_asyncore.py
==============================================================================
--- python/branches/py3k/Lib/test/test_asyncore.py	(original)
+++ python/branches/py3k/Lib/test/test_asyncore.py	Mon Apr 13 03:22:04 2009
@@ -273,10 +273,7 @@
             sys.stdout = stdout
 
         lines = fp.getvalue().splitlines()
-        if __debug__:
-            expected = ['EGGS: %s' % l1, 'info: %s' % l2, 'SPAM: %s' % l3]
-        else:
-            expected = ['EGGS: %s' % l1, 'SPAM: %s' % l3]
+        expected = ['EGGS: %s' % l1, 'info: %s' % l2, 'SPAM: %s' % l3]
 
         self.assertEquals(lines, expected)