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

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')