Commit c2faa5b3 authored by Antoine Pitrou's avatar Antoine Pitrou

Merge

parents 50750747 3f4ce635
...@@ -960,7 +960,7 @@ class BuiltinTest(unittest.TestCase): ...@@ -960,7 +960,7 @@ class BuiltinTest(unittest.TestCase):
self.assertEqual(fp.read(1000), 'YYY'*100) self.assertEqual(fp.read(1000), 'YYY'*100)
finally: finally:
fp.close() fp.close()
unlink(TESTFN) unlink(TESTFN)
def test_open_default_encoding(self): def test_open_default_encoding(self):
old_environ = dict(os.environ) old_environ = dict(os.environ)
...@@ -979,6 +979,7 @@ class BuiltinTest(unittest.TestCase): ...@@ -979,6 +979,7 @@ class BuiltinTest(unittest.TestCase):
self.assertEqual(fp.encoding, current_locale_encoding) self.assertEqual(fp.encoding, current_locale_encoding)
finally: finally:
fp.close() fp.close()
unlink(TESTFN)
finally: finally:
os.environ.clear() os.environ.clear()
os.environ.update(old_environ) os.environ.update(old_environ)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment