summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-05-25 22:18:30 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-05-25 22:18:30 (GMT)
commit827bd45b12a417d107f6914e08f5e86b4d082521 (patch)
tree46ceb9f0533d65599bcd86e8b09f3cf624a88a80
parent20f4b447f5cafcfebbc785cba1a7f3b363e794af (diff)
downloadcpython-827bd45b12a417d107f6914e08f5e86b4d082521.zip
cpython-827bd45b12a417d107f6914e08f5e86b4d082521.tar.gz
cpython-827bd45b12a417d107f6914e08f5e86b4d082521.tar.bz2
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 ........
-rw-r--r--Lib/test/test_base64.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py
index 7ff0db5..49edf39 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')