[Python-checkins] cpython (merge 3.5 -> default): Issue #24838: Merge test_tarfile.py fix from 3.5.

Tue Apr 19 06:01:39 EDT 2016

https://hg.python.org/cpython/rev/08835d1e7a50
changeset: 101057:08835d1e7a50
parent: 101055:e281a57d5b29
parent: 101056:78ede2baa146
user: Lars Gustäbel <lars at gustaebel.de>
date: Tue Apr 19 11:59:39 2016 +0200
summary:
 Issue #24838: Merge test_tarfile.py fix from 3.5.
files:
 Lib/test/test_tarfile.py | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -1795,7 +1795,7 @@
 self.assertRaises(exc, tar.addfile, t)
 
 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:
 self.assertEqual(name, t.name)
 break
@@ -1821,7 +1821,7 @@
 self.assertRaises(exc, tar.addfile, t)
 
 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:
 self.assertEqual(name, t.linkname)
 break
-- 
Repository URL: https://hg.python.org/cpython
