Issue #24838: Merge test_tarfile.py fix from 3.5.

This commit is contained in:
Lars Gustäbel 2016-04-19 11:59:39 +02:00
commit daac5f9f92

View file

@ -1795,7 +1795,7 @@ class UstarUnicodeTest(UnicodeTest, unittest.TestCase):
self.assertRaises(exc, tar.addfile, t) self.assertRaises(exc, tar.addfile, t)
if exc is None: if exc is None:
with tarfile.open(tmpname, "r") as tar: with tarfile.open(tmpname, "r", encoding="utf-8") as tar:
for t in tar: for t in tar:
self.assertEqual(name, t.name) self.assertEqual(name, t.name)
break break
@ -1821,7 +1821,7 @@ class UstarUnicodeTest(UnicodeTest, unittest.TestCase):
self.assertRaises(exc, tar.addfile, t) self.assertRaises(exc, tar.addfile, t)
if exc is None: if exc is None:
with tarfile.open(tmpname, "r") as tar: with tarfile.open(tmpname, "r", encoding="utf-8") as tar:
for t in tar: for t in tar:
self.assertEqual(name, t.linkname) self.assertEqual(name, t.linkname)
break break