commit 847f30e2bc83a35ff1d15e5409004dcaff7c88b4
author R. David Murray <rdmurray@bitdance.com> Mon Apr 13 01:22:04 2009 +0000
committer R. David Murray <rdmurray@bitdance.com> Mon Apr 13 01:22:04 2009 +0000
tree 2e6c658b494514c08006ab9a6055077bbb6e0a2d
parent f64bce8ea726020152d655dc78df94b79da0ad4d

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.
........

Lib/test/test_asyncore.py

diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
index 6837602..ba89f12 100644
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -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)