From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 25 May 2010 22:18:30 +0000 (+0000)
Subject: Merged revisions 81535 via svnmerge from
X-Git-Tag: v3.1.3rc1~706
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=827bd45b12a417d107f6914e08f5e86b4d082521;p=python

Merged revisions 81535 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r81535 | victor.stinner | 2010-05-26 00:17:22 +0200 (mer., 26 mai 2010) | 2 lines

  Fix the new TestMain.test_decode() of test_base64 for Windows
........
---

diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py
index 7ff0db5cd0..49edf395f1 100644
--- a/Lib/test/test_base64.py
+++ b/Lib/test/test_base64.py
@@ -238,7 +238,7 @@ class TestMain(unittest.TestCase):
         with open(support.TESTFN, 'wb') as fp:
             fp.write(b'Yf9iCg==')
         output = self.get_output('-d', support.TESTFN)
-        self.assertEquals(output, b'a\xffb\n')
+        self.assertEquals(output.rstrip(), b'a\xffb')