From: R. David Murray <rdmurray@bitdance.com>
Date: Mon, 13 Apr 2009 01:22:04 +0000 (+0000)
Subject: Merged revisions 71553 via svnmerge from
X-Git-Tag: v3.1b1~292
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=847f30e2bc83a35ff1d15e5409004dcaff7c88b4;p=python

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

diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
index 6837602edd..ba89f125db 100644
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -273,10 +273,7 @@ class DispatcherTests(unittest.TestCase):
             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)