[Python-checkins] bpo-40275: Use new test.support helper submodules in tests (GH-21314)
Hai Shi
webhook-mailer at python.org
Mon Jul 6 05:12:55 EDT 2020
https://github.com/python/cpython/commit/883bc638335a57a6e6a6344c2fc132c4f9a0ec42
commit: 883bc638335a57a6e6a6344c2fc132c4f9a0ec42
branch: master
author: Hai Shi <shihai1992 at gmail.com>
committer: GitHub <noreply at github.com>
date: 2020-07-06T11:12:49+02:00
summary:
bpo-40275: Use new test.support helper submodules in tests (GH-21314)
files:
M Lib/test/pickletester.py
M Lib/test/test_binhex.py
M Lib/test/test_bufio.py
M Lib/test/test_capi.py
M Lib/test/test_compileall.py
M Lib/test/test_fileio.py
M Lib/test/test_heapq.py
M Lib/test/test_httplib.py
M Lib/test/test_importlib/util.py
M Lib/test/test_io.py
M Lib/test/test_json/__init__.py
M Lib/test/test_json/test_tool.py
M Lib/test/test_netrc.py
M Lib/test/test_nis.py
M Lib/test/test_pickle.py
M Lib/test/test_py_compile.py
M Lib/test/test_sqlite.py
M Lib/test/test_univnewlines.py
M Lib/test/test_uuid.py
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index a34505aab51c1..afbc2b3bf0a79 100644
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -22,10 +22,13 @@
_testbuffer = None
from test import support
+from test.support import os_helper
from test.support import (
- TestFailed, TESTFN, run_with_locale, no_tracing,
- _2G, _4G, bigmemtest, forget,
+ TestFailed, run_with_locale, no_tracing,
+ _2G, _4G, bigmemtest
)
+from test.support.import_helper import forget
+from test.support.os_helper import TESTFN
from test.support import threading_helper
from test.support.warnings_helper import save_restore_warnings_filters
@@ -3100,7 +3103,7 @@ def test_dump_closed_file(self):
f.close()
self.assertRaises(ValueError, self.dump, 123, f)
finally:
- support.unlink(TESTFN)
+ os_helper.unlink(TESTFN)
def test_load_closed_file(self):
f = open(TESTFN, "wb")
@@ -3108,7 +3111,7 @@ def test_load_closed_file(self):
f.close()
self.assertRaises(ValueError, self.dump, 123, f)
finally:
- support.unlink(TESTFN)
+ os_helper.unlink(TESTFN)
def test_load_from_and_dump_to_file(self):
stream = io.BytesIO()
@@ -3139,7 +3142,7 @@ def test_dump_text_file(self):
self.assertRaises(TypeError, self.dump, 123, f, proto)
finally:
f.close()
- support.unlink(TESTFN)
+ os_helper.unlink(TESTFN)
def test_incomplete_input(self):
s = io.BytesIO(b"X''.")
diff --git a/Lib/test/test_binhex.py b/Lib/test/test_binhex.py
index 591f32a4f0f7f..5e59f5761514c 100644
--- a/Lib/test/test_binhex.py
+++ b/Lib/test/test_binhex.py
@@ -5,23 +5,27 @@
"""
import unittest
from test import support
+from test.support import import_helper
+from test.support import os_helper
+from test.support import warnings_helper
-with support.check_warnings(('', DeprecationWarning)):
- binhex = support.import_fresh_module('binhex')
+
+with warnings_helper.check_warnings(('', DeprecationWarning)):
+ binhex = import_helper.import_fresh_module('binhex')
class BinHexTestCase(unittest.TestCase):
def setUp(self):
# binhex supports only file names encodable to Latin1
- self.fname1 = support.TESTFN_ASCII + "1"
- self.fname2 = support.TESTFN_ASCII + "2"
- self.fname3 = support.TESTFN_ASCII + "very_long_filename__very_long_filename__very_long_filename__very_long_filename__"
+ self.fname1 = os_helper.TESTFN_ASCII + "1"
+ self.fname2 = os_helper.TESTFN_ASCII + "2"
+ self.fname3 = os_helper.TESTFN_ASCII + "very_long_filename__very_long_filename__very_long_filename__very_long_filename__"
def tearDown(self):
- support.unlink(self.fname1)
- support.unlink(self.fname2)
- support.unlink(self.fname3)
+ os_helper.unlink(self.fname1)
+ os_helper.unlink(self.fname2)
+ os_helper.unlink(self.fname3)
DATA = b'Jack is my hero'
diff --git a/Lib/test/test_bufio.py b/Lib/test/test_bufio.py
index fea6da491e491..17151b13615e9 100644
--- a/Lib/test/test_bufio.py
+++ b/Lib/test/test_bufio.py
@@ -1,5 +1,6 @@
import unittest
from test import support
+from test.support import os_helper
import io # C implementation.
import _pyio as pyio # Python implementation.
@@ -17,18 +18,18 @@ def try_one(self, s):
# .readline()s deliver what we wrote.
# Ensure we can open TESTFN for writing.
- support.unlink(support.TESTFN)
+ os_helper.unlink(os_helper.TESTFN)
# Since C doesn't guarantee we can write/read arbitrary bytes in text
# files, use binary mode.
- f = self.open(support.TESTFN, "wb")
+ f = self.open(os_helper.TESTFN, "wb")
try:
# write once with \n and once without
f.write(s)
f.write(b"\n")
f.write(s)
f.close()
- f = open(support.TESTFN, "rb")
+ f = open(os_helper.TESTFN, "rb")
line = f.readline()
self.assertEqual(line, s + b"\n")
line = f.readline()
@@ -37,7 +38,7 @@ def try_one(self, s):
self.assertFalse(line) # Must be at EOF
f.close()
finally:
- support.unlink(support.TESTFN)
+ os_helper.unlink(os_helper.TESTFN)
def drive_one(self, pattern):
for length in lengths:
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
index 3e7afd5a2a1e4..55027c9cbcd43 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -17,6 +17,7 @@
import importlib.util
from test import support
from test.support import MISSING_C_DOCSTRINGS
+from test.support import import_helper
from test.support import threading_helper
from test.support.script_helper import assert_python_failure, assert_python_ok
try:
@@ -25,7 +26,7 @@
_posixsubprocess = None
# Skip this test if the _testcapi module isn't available.
-_testcapi = support.import_module('_testcapi')
+_testcapi = import_helper.import_module('_testcapi')
import _testinternalcapi
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
index 3bbc6817f8d56..be1149a87faef 100644
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@ -23,6 +23,7 @@
_have_multiprocessing = False
from test import support
+from test.support import os_helper
from test.support import script_helper
from .test_py_compile import without_source_date_epoch
@@ -356,7 +357,7 @@ def test_multiple_optimization_levels(self):
except Exception:
pass
- @support.skip_unless_symlink
+ @os_helper.skip_unless_symlink
def test_ignore_symlink_destination(self):
# Create folders for allowed files, symlinks and prohibited area
allowed_path = os.path.join(self.directory, "test", "dir", "allowed")
@@ -438,7 +439,7 @@ def setUpClass(cls):
sys_path_writable = False
break
finally:
- support.unlink(str(path))
+ os_helper.unlink(str(path))
if directory_created:
directory.rmdir()
else:
@@ -477,7 +478,7 @@ def assertNotCompiled(self, fn):
def setUp(self):
self.directory = tempfile.mkdtemp()
- self.addCleanup(support.rmtree, self.directory)
+ self.addCleanup(os_helper.rmtree, self.directory)
self.pkgdir = os.path.join(self.directory, 'foo')
os.mkdir(self.pkgdir)
self.pkgdir_cachedir = os.path.join(self.pkgdir, '__pycache__')
@@ -625,7 +626,7 @@ def test_recursion_limit(self):
self.assertCompiled(spamfn)
self.assertCompiled(eggfn)
- @support.skip_unless_symlink
+ @os_helper.skip_unless_symlink
def test_symlink_loop(self):
# Currently, compileall ignores symlinks to directories.
# If that limitation is ever lifted, it should protect against
@@ -823,7 +824,7 @@ def test_multiple_optimization_levels(self):
except Exception:
pass
- @support.skip_unless_symlink
+ @os_helper.skip_unless_symlink
def test_ignore_symlink_destination(self):
# Create folders for allowed files, symlinks and prohibited area
allowed_path = os.path.join(self.directory, "test", "dir", "allowed")
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
index 26e4500ae8cfc..ff611a90eede3 100644
--- a/Lib/test/test_fileio.py
+++ b/Lib/test/test_fileio.py
@@ -9,8 +9,9 @@
from weakref import proxy
from functools import wraps
-from test.support import (TESTFN, TESTFN_UNICODE, check_warnings, run_unittest,
- make_bad_fd, cpython_only, swap_attr)
+from test.support import (run_unittest, cpython_only, swap_attr)
+from test.support.os_helper import (TESTFN, TESTFN_UNICODE, make_bad_fd)
+from test.support.warnings_helper import check_warnings
from collections import UserList
import _io # C implementation of io
diff --git a/Lib/test/test_heapq.py b/Lib/test/test_heapq.py
index 6902573e8fa85..ebbc62745707c 100644
--- a/Lib/test/test_heapq.py
+++ b/Lib/test/test_heapq.py
@@ -5,11 +5,12 @@
import doctest
from test import support
+from test.support import import_helper
from unittest import TestCase, skipUnless
from operator import itemgetter
-py_heapq = support.import_fresh_module('heapq', blocked=['_heapq'])
-c_heapq = support.import_fresh_module('heapq', fresh=['_heapq'])
+py_heapq = import_helper.import_fresh_module('heapq', blocked=['_heapq'])
+c_heapq = import_helper.import_fresh_module('heapq', fresh=['_heapq'])
# _heapq.nlargest/nsmallest are saved in heapq._nlargest/_smallest when
# _heapq is imported, so check them there
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index e909980d23aac..1ac31bf2a8e7f 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -13,7 +13,10 @@
TestCase = unittest.TestCase
from test import support
+from test.support import os_helper
from test.support import socket_helper
+from test.support import warnings_helper
+
here = os.path.dirname(__file__)
# Self-signed cert file for 'localhost'
@@ -1766,14 +1769,14 @@ def test_local_bad_hostname(self):
with self.assertRaises(ssl.CertificateError):
h.request('GET', '/')
# Same with explicit check_hostname=True
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
h = client.HTTPSConnection('localhost', server.port,
context=context, check_hostname=True)
with self.assertRaises(ssl.CertificateError):
h.request('GET', '/')
# With check_hostname=False, the mismatching is ignored
context.check_hostname = False
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
h = client.HTTPSConnection('localhost', server.port,
context=context, check_hostname=False)
h.request('GET', '/nonexistent')
@@ -1792,7 +1795,7 @@ def test_local_bad_hostname(self):
h.close()
# Passing check_hostname to HTTPSConnection should override the
# context's setting.
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
h = client.HTTPSConnection('localhost', server.port,
context=context, check_hostname=True)
with self.assertRaises(ssl.CertificateError):
@@ -1908,10 +1911,10 @@ def test_bytes_body(self):
self.assertEqual(b'body\xc1', f.read())
def test_text_file_body(self):
- self.addCleanup(support.unlink, support.TESTFN)
- with open(support.TESTFN, "w") as f:
+ self.addCleanup(os_helper.unlink, os_helper.TESTFN)
+ with open(os_helper.TESTFN, "w") as f:
f.write("body")
- with open(support.TESTFN) as f:
+ with open(os_helper.TESTFN) as f:
self.conn.request("PUT", "/url", f)
message, f = self.get_headers_and_fp()
self.assertEqual("text/plain", message.get_content_type())
@@ -1923,10 +1926,10 @@ def test_text_file_body(self):
self.assertEqual(b'4\r\nbody\r\n0\r\n\r\n', f.read())
def test_binary_file_body(self):
- self.addCleanup(support.unlink, support.TESTFN)
- with open(support.TESTFN, "wb") as f:
+ self.addCleanup(os_helper.unlink, os_helper.TESTFN)
+ with open(os_helper.TESTFN, "wb") as f:
f.write(b"body\xc1")
- with open(support.TESTFN, "rb") as f:
+ with open(os_helper.TESTFN, "rb") as f:
self.conn.request("PUT", "/url", f)
message, f = self.get_headers_and_fp()
self.assertEqual("text/plain", message.get_content_type())
diff --git a/Lib/test/test_importlib/util.py b/Lib/test/test_importlib/util.py
index de6e0b0256018..2745c9b7e3c3b 100644
--- a/Lib/test/test_importlib/util.py
+++ b/Lib/test/test_importlib/util.py
@@ -12,6 +12,7 @@
import os.path
from pathlib import Path, PurePath
from test import support
+from test.support import import_helper
import unittest
import sys
import tempfile
@@ -55,8 +56,8 @@ def _extension_details():
def import_importlib(module_name):
"""Import a module from importlib both w/ and w/o _frozen_importlib."""
fresh = ('importlib',) if '.' in module_name else ()
- frozen = support.import_fresh_module(module_name)
- source = support.import_fresh_module(module_name, fresh=fresh,
+ frozen = import_helper.import_fresh_module(module_name)
+ source = import_helper.import_fresh_module(module_name, fresh=fresh,
blocked=('_frozen_importlib', '_frozen_importlib_external'))
return {'Frozen': frozen, 'Source': source}
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index c0d67a17d8c6f..18b8a7941668f 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -40,8 +40,11 @@
from test import support
from test.support.script_helper import (
assert_python_ok, assert_python_failure, run_python_until_end)
+from test.support import import_helper
+from test.support import os_helper
from test.support import threading_helper
-from test.support import FakePath
+from test.support import warnings_helper
+from test.support.os_helper import FakePath
import codecs
import io # C implementation of io
@@ -317,10 +320,10 @@ class PyMockNonBlockWriterIO(MockNonBlockWriterIO, pyio.RawIOBase):
class IOTest(unittest.TestCase):
def setUp(self):
- support.unlink(support.TESTFN)
+ os_helper.unlink(os_helper.TESTFN)
def tearDown(self):
- support.unlink(support.TESTFN)
+ os_helper.unlink(os_helper.TESTFN)
def write_ops(self, f):
self.assertEqual(f.write(b"blah."), 5)
@@ -405,19 +408,19 @@ def test_invalid_operations(self):
# Try writing on a file opened in read mode and vice-versa.
exc = self.UnsupportedOperation
for mode in ("w", "wb"):
- with self.open(support.TESTFN, mode) as fp:
+ with self.open(os_helper.TESTFN, mode) as fp:
self.assertRaises(exc, fp.read)
self.assertRaises(exc, fp.readline)
- with self.open(support.TESTFN, "wb", buffering=0) as fp:
+ with self.open(os_helper.TESTFN, "wb", buffering=0) as fp:
self.assertRaises(exc, fp.read)
self.assertRaises(exc, fp.readline)
- with self.open(support.TESTFN, "rb", buffering=0) as fp:
+ with self.open(os_helper.TESTFN, "rb", buffering=0) as fp:
self.assertRaises(exc, fp.write, b"blah")
self.assertRaises(exc, fp.writelines, [b"blah\n"])
- with self.open(support.TESTFN, "rb") as fp:
+ with self.open(os_helper.TESTFN, "rb") as fp:
self.assertRaises(exc, fp.write, b"blah")
self.assertRaises(exc, fp.writelines, [b"blah\n"])
- with self.open(support.TESTFN, "r") as fp:
+ with self.open(os_helper.TESTFN, "r") as fp:
self.assertRaises(exc, fp.write, "blah")
self.assertRaises(exc, fp.writelines, ["blah\n"])
# Non-zero seeking from current or end pos
@@ -538,33 +541,33 @@ def test_open_handles_NUL_chars(self):
self.assertRaises(ValueError, self.open, bytes_fn, 'w')
def test_raw_file_io(self):
- with self.open(support.TESTFN, "wb", buffering=0) as f:
+ with self.open(os_helper.TESTFN, "wb", buffering=0) as f:
self.assertEqual(f.readable(), False)
self.assertEqual(f.writable(), True)
self.assertEqual(f.seekable(), True)
self.write_ops(f)
- with self.open(support.TESTFN, "rb", buffering=0) as f:
+ with self.open(os_helper.TESTFN, "rb", buffering=0) as f:
self.assertEqual(f.readable(), True)
self.assertEqual(f.writable(), False)
self.assertEqual(f.seekable(), True)
self.read_ops(f)
def test_buffered_file_io(self):
- with self.open(support.TESTFN, "wb") as f:
+ with self.open(os_helper.TESTFN, "wb") as f:
self.assertEqual(f.readable(), False)
self.assertEqual(f.writable(), True)
self.assertEqual(f.seekable(), True)
self.write_ops(f)
- with self.open(support.TESTFN, "rb") as f:
+ with self.open(os_helper.TESTFN, "rb") as f:
self.assertEqual(f.readable(), True)
self.assertEqual(f.writable(), False)
self.assertEqual(f.seekable(), True)
self.read_ops(f, True)
def test_readline(self):
- with self.open(support.TESTFN, "wb") as f:
+ with self.open(os_helper.TESTFN, "wb") as f:
f.write(b"abc\ndef\nxyzzy\nfoo\x00bar\nanother line")
- with self.open(support.TESTFN, "rb") as f:
+ with self.open(os_helper.TESTFN, "rb") as f:
self.assertEqual(f.readline(), b"abc\n")
self.assertEqual(f.readline(10), b"def\n")
self.assertEqual(f.readline(2), b"xy")
@@ -572,7 +575,7 @@ def test_readline(self):
self.assertEqual(f.readline(), b"foo\x00bar\n")
self.assertEqual(f.readline(None), b"another line")
self.assertRaises(TypeError, f.readline, 5.3)
- with self.open(support.TESTFN, "r") as f:
+ with self.open(os_helper.TESTFN, "r") as f:
self.assertRaises(TypeError, f.readline, 5.3)
def test_readline_nonsizeable(self):
@@ -607,20 +610,20 @@ def test_large_file_ops(self):
support.requires(
'largefile',
'test requires %s bytes and a long time to run' % self.LARGE)
- with self.open(support.TESTFN, "w+b", 0) as f:
+ with self.open(os_helper.TESTFN, "w+b", 0) as f:
self.large_file_ops(f)
- with self.open(support.TESTFN, "w+b") as f:
+ with self.open(os_helper.TESTFN, "w+b") as f:
self.large_file_ops(f)
def test_with_open(self):
for bufsize in (0, 100):
f = None
- with self.open(support.TESTFN, "wb", bufsize) as f:
+ with self.open(os_helper.TESTFN, "wb", bufsize) as f:
f.write(b"xxx")
self.assertEqual(f.closed, True)
f = None
try:
- with self.open(support.TESTFN, "wb", bufsize) as f:
+ with self.open(os_helper.TESTFN, "wb", bufsize) as f:
1/0
except ZeroDivisionError:
self.assertEqual(f.closed, True)
@@ -629,13 +632,13 @@ def test_with_open(self):
# issue 5008
def test_append_mode_tell(self):
- with self.open(support.TESTFN, "wb") as f:
+ with self.open(os_helper.TESTFN, "wb") as f:
f.write(b"xxx")
- with self.open(support.TESTFN, "ab", buffering=0) as f:
+ with self.open(os_helper.TESTFN, "ab", buffering=0) as f:
self.assertEqual(f.tell(), 3)
- with self.open(support.TESTFN, "ab") as f:
+ with self.open(os_helper.TESTFN, "ab") as f:
self.assertEqual(f.tell(), 3)
- with self.open(support.TESTFN, "a") as f:
+ with self.open(os_helper.TESTFN, "a") as f:
self.assertGreater(f.tell(), 0)
def test_destructor(self):
@@ -655,13 +658,13 @@ def close(self):
def flush(self):
record.append(3)
super().flush()
- with support.check_warnings(('', ResourceWarning)):
- f = MyFileIO(support.TESTFN, "wb")
+ with warnings_helper.check_warnings(('', ResourceWarning)):
+ f = MyFileIO(os_helper.TESTFN, "wb")
f.write(b"xxx")
del f
support.gc_collect()
self.assertEqual(record, [1, 2, 3])
- with self.open(support.TESTFN, "rb") as f:
+ with self.open(os_helper.TESTFN, "rb") as f:
self.assertEqual(f.read(), b"xxx")
def _check_base_destructor(self, base):
@@ -707,9 +710,9 @@ def test_TextIOBase_destructor(self):
self._check_base_destructor(self.TextIOBase)
def test_close_flushes(self):
- with self.open(support.TESTFN, "wb") as f:
+ with self.open(os_helper.TESTFN, "wb") as f:
f.write(b"xxx")
- with self.open(support.TESTFN, "rb") as f:
+ with self.open(os_helper.TESTFN, "rb") as f:
self.assertEqual(f.read(), b"xxx")
def test_array_writes(self):
@@ -720,25 +723,25 @@ def check(f):
self.assertEqual(f.write(a), n)
f.writelines((a,))
check(self.BytesIO())
- check(self.FileIO(support.TESTFN, "w"))
+ check(self.FileIO(os_helper.TESTFN, "w"))
check(self.BufferedWriter(self.MockRawIO()))
check(self.BufferedRandom(self.MockRawIO()))
check(self.BufferedRWPair(self.MockRawIO(), self.MockRawIO()))
def test_closefd(self):
- self.assertRaises(ValueError, self.open, support.TESTFN, 'w',
+ self.assertRaises(ValueError, self.open, os_helper.TESTFN, 'w',
closefd=False)
def test_read_closed(self):
- with self.open(support.TESTFN, "w") as f:
+ with self.open(os_helper.TESTFN, "w") as f:
f.write("egg\n")
- with self.open(support.TESTFN, "r") as f:
+ with self.open(os_helper.TESTFN, "r") as f:
file = self.open(f.fileno(), "r", closefd=False)
self.assertEqual(file.read(), "egg\n")
file.seek(0)
file.close()
self.assertRaises(ValueError, file.read)
- with self.open(support.TESTFN, "rb") as f:
+ with self.open(os_helper.TESTFN, "rb") as f:
file = self.open(f.fileno(), "rb", closefd=False)
self.assertEqual(file.read()[:3], b"egg")
file.close()
@@ -746,12 +749,12 @@ def test_read_closed(self):
def test_no_closefd_with_filename(self):
# can't use closefd in combination with a file name
- self.assertRaises(ValueError, self.open, support.TESTFN, "r", closefd=False)
+ self.assertRaises(ValueError, self.open, os_helper.TESTFN, "r", closefd=False)
def test_closefd_attr(self):
- with self.open(support.TESTFN, "wb") as f:
+ with self.open(os_helper.TESTFN, "wb") as f:
f.write(b"egg\n")
- with self.open(support.TESTFN, "r") as f:
+ with self.open(os_helper.TESTFN, "r") as f:
self.assertEqual(f.buffer.raw.closefd, True)
file = self.open(f.fileno(), "r", closefd=False)
self.assertEqual(file.buffer.raw.closefd, False)
@@ -759,15 +762,15 @@ def test_closefd_attr(self):
def test_garbage_collection(self):
# FileIO objects are collected, and collecting them flushes
# all data to disk.
- with support.check_warnings(('', ResourceWarning)):
- f = self.FileIO(support.TESTFN, "wb")
+ with warnings_helper.check_warnings(('', ResourceWarning)):
+ f = self.FileIO(os_helper.TESTFN, "wb")
f.write(b"abcxxx")
f.f = f
wr = weakref.ref(f)
del f
support.gc_collect()
self.assertIsNone(wr(), wr)
- with self.open(support.TESTFN, "rb") as f:
+ with self.open(os_helper.TESTFN, "rb") as f:
self.assertEqual(f.read(), b"abcxxx")
def test_unbounded_file(self):
@@ -804,29 +807,29 @@ def bad_flush():
def test_flush_error_on_close(self):
# raw file
# Issue #5700: io.FileIO calls flush() after file closed
- self.check_flush_error_on_close(support.TESTFN, 'wb', buffering=0)
- fd = os.open(support.TESTFN, os.O_WRONLY|os.O_CREAT)
+ self.check_flush_error_on_close(os_helper.TESTFN, 'wb', buffering=0)
+ fd = os.open(os_helper.TESTFN, os.O_WRONLY|os.O_CREAT)
self.check_flush_error_on_close(fd, 'wb', buffering=0)
- fd = os.open(support.TESTFN, os.O_WRONLY|os.O_CREAT)
+ fd = os.open(os_helper.TESTFN, os.O_WRONLY|os.O_CREAT)
self.check_flush_error_on_close(fd, 'wb', buffering=0, closefd=False)
os.close(fd)
# buffered io
- self.check_flush_error_on_close(support.TESTFN, 'wb')
- fd = os.open(support.TESTFN, os.O_WRONLY|os.O_CREAT)
+ self.check_flush_error_on_close(os_helper.TESTFN, 'wb')
+ fd = os.open(os_helper.TESTFN, os.O_WRONLY|os.O_CREAT)
self.check_flush_error_on_close(fd, 'wb')
- fd = os.open(support.TESTFN, os.O_WRONLY|os.O_CREAT)
+ fd = os.open(os_helper.TESTFN, os.O_WRONLY|os.O_CREAT)
self.check_flush_error_on_close(fd, 'wb', closefd=False)
os.close(fd)
# text io
- self.check_flush_error_on_close(support.TESTFN, 'w')
- fd = os.open(support.TESTFN, os.O_WRONLY|os.O_CREAT)
+ self.check_flush_error_on_close(os_helper.TESTFN, 'w')
+ fd = os.open(os_helper.TESTFN, os.O_WRONLY|os.O_CREAT)
self.check_flush_error_on_close(fd, 'w')
- fd = os.open(support.TESTFN, os.O_WRONLY|os.O_CREAT)
+ fd = os.open(os_helper.TESTFN, os.O_WRONLY|os.O_CREAT)
self.check_flush_error_on_close(fd, 'w', closefd=False)
os.close(fd)
def test_multi_close(self):
- f = self.open(support.TESTFN, "wb", buffering=0)
+ f = self.open(os_helper.TESTFN, "wb", buffering=0)
f.close()
f.close()
f.close()
@@ -857,9 +860,9 @@ def test_types_have_dict(self):
self.assertTrue(hasattr(obj, "__dict__"))
def test_opener(self):
- with self.open(support.TESTFN, "w") as f:
+ with self.open(os_helper.TESTFN, "w") as f:
f.write("egg\n")
- fd = os.open(support.TESTFN, os.O_RDONLY)
+ fd = os.open(os_helper.TESTFN, os.O_RDONLY)
def opener(path, flags):
return fd
with self.open("non-existent", "r", opener=opener) as f:
@@ -894,14 +897,14 @@ def test_fileio_closefd(self):
f2.readline()
def test_nonbuffered_textio(self):
- with support.check_no_resource_warning(self):
+ with warnings_helper.check_no_resource_warning(self):
with self.assertRaises(ValueError):
- self.open(support.TESTFN, 'w', buffering=0)
+ self.open(os_helper.TESTFN, 'w', buffering=0)
def test_invalid_newline(self):
- with support.check_no_resource_warning(self):
+ with warnings_helper.check_no_resource_warning(self):
with self.assertRaises(ValueError):
- self.open(support.TESTFN, 'w', newline='invalid')
+ self.open(os_helper.TESTFN, 'w', newline='invalid')
def test_buffered_readinto_mixin(self):
# Test the implementation provided by BufferedIOBase
@@ -924,10 +927,10 @@ def check_path_succeeds(path):
with self.open(path, "r") as f:
self.assertEqual(f.read(), "egg\n")
- check_path_succeeds(FakePath(support.TESTFN))
- check_path_succeeds(FakePath(support.TESTFN.encode('utf-8')))
+ check_path_succeeds(FakePath(os_helper.TESTFN))
+ check_path_succeeds(FakePath(os_helper.TESTFN.encode('utf-8')))
- with self.open(support.TESTFN, "w") as f:
+ with self.open(os_helper.TESTFN, "w") as f:
bad_path = FakePath(f.fileno())
with self.assertRaises(TypeError):
self.open(bad_path, 'w')
@@ -942,7 +945,7 @@ def check_path_succeeds(path):
# ensure that refcounting is correct with some error conditions
with self.assertRaisesRegex(ValueError, 'read/write/append mode'):
- self.open(FakePath(support.TESTFN), 'rwxa')
+ self.open(FakePath(os_helper.TESTFN), 'rwxa')
def test_RawIOBase_readall(self):
# Exercise the default unlimited RawIOBase.read() and readall()
@@ -1454,9 +1457,9 @@ def test_threads(self):
l = list(range(256)) * N
random.shuffle(l)
s = bytes(bytearray(l))
- with self.open(support.TESTFN, "wb") as f:
+ with self.open(os_helper.TESTFN, "wb") as f:
f.write(s)
- with self.open(support.TESTFN, self.read_mode, buffering=0) as raw:
+ with self.open(os_helper.TESTFN, self.read_mode, buffering=0) as raw:
bufio = self.tp(raw, 8)
errors = []
results = []
@@ -1482,7 +1485,7 @@ def f():
c = bytes(bytearray([i]))
self.assertEqual(s.count(c), N)
finally:
- support.unlink(support.TESTFN)
+ os_helper.unlink(os_helper.TESTFN)
def test_unseekable(self):
bufio = self.tp(self.MockUnseekableIO(b"A" * 10))
@@ -1572,9 +1575,9 @@ def test_misbehaved_io_read(self):
def test_garbage_collection(self):
# C BufferedReader objects are collected.
# The Python version has __del__, so it ends into gc.garbage instead
- self.addCleanup(support.unlink, support.TESTFN)
- with support.check_warnings(('', ResourceWarning)):
- rawio = self.FileIO(support.TESTFN, "w+b")
+ self.addCleanup(os_helper.unlink, os_helper.TESTFN)
+ with warnings_helper.check_warnings(('', ResourceWarning)):
+ rawio = self.FileIO(os_helper.TESTFN, "w+b")
f = self.tp(rawio)
f.f = f
wr = weakref.ref(f)
@@ -1791,26 +1794,26 @@ def test_destructor(self):
def test_truncate(self):
# Truncate implicitly flushes the buffer.
- self.addCleanup(support.unlink, support.TESTFN)
- with self.open(support.TESTFN, self.write_mode, buffering=0) as raw:
+ self.addCleanup(os_helper.unlink, os_helper.TESTFN)
+ with self.open(os_helper.TESTFN, self.write_mode, buffering=0) as raw:
bufio = self.tp(raw, 8)
bufio.write(b"abcdef")
self.assertEqual(bufio.truncate(3), 3)
self.assertEqual(bufio.tell(), 6)
- with self.open(support.TESTFN, "rb", buffering=0) as f:
+ with self.open(os_helper.TESTFN, "rb", buffering=0) as f:
self.assertEqual(f.read(), b"abc")
def test_truncate_after_write(self):
# Ensure that truncate preserves the file position after
# writes longer than the buffer size.
# Issue: https://bugs.python.org/issue32228
- self.addCleanup(support.unlink, support.TESTFN)
- with self.open(support.TESTFN, "wb") as f:
+ self.addCleanup(os_helper.unlink, os_helper.TESTFN)
+ with self.open(os_helper.TESTFN, "wb") as f:
# Fill with some buffer
f.write(b'\x00' * 10000)
buffer_sizes = [8192, 4096, 200]
for buffer_size in buffer_sizes:
- with self.open(support.TESTFN, "r+b", buffering=buffer_size) as f:
+ with self.open(os_helper.TESTFN, "r+b", buffering=buffer_size) as f:
f.write(b'\x00' * (buffer_size + 1))
# After write write_pos and write_end are set to 0
f.read(1)
@@ -1838,7 +1841,7 @@ def test_threads(self):
# writing the buffer to the raw streams. This is in addition
# to concurrency issues due to switching threads in the middle
# of Python code.
- with self.open(support.TESTFN, self.write_mode, buffering=0) as raw:
+ with self.open(os_helper.TESTFN, self.write_mode, buffering=0) as raw:
bufio = self.tp(raw, 8)
errors = []
def f():
@@ -1858,12 +1861,12 @@ def f():
self.assertFalse(errors,
"the following exceptions were caught: %r" % errors)
bufio.close()
- with self.open(support.TESTFN, "rb") as f:
+ with self.open(os_helper.TESTFN, "rb") as f:
s = f.read()
for i in range(256):
self.assertEqual(s.count(bytes([i])), N)
finally:
- support.unlink(support.TESTFN)
+ os_helper.unlink(os_helper.TESTFN)
def test_misbehaved_io(self):
rawio = self.MisbehavedRawIO()
@@ -1931,9 +1934,9 @@ def test_garbage_collection(self):
# C BufferedWriter objects are collected, and collecting them flushes
# all data to disk.
# The Python version has __del__, so it ends into gc.garbage instead
- self.addCleanup(support.unlink, support.TESTFN)
- with support.check_warnings(('', ResourceWarning)):
- rawio = self.FileIO(support.TESTFN, "w+b")
+ self.addCleanup(os_helper.unlink, os_helper.TESTFN)
+ with warnings_helper.check_warnings(('', ResourceWarning)):
+ rawio = self.FileIO(os_helper.TESTFN, "w+b")
f = self.tp(rawio)
f.write(b"123xxx")
f.x = f
@@ -1941,7 +1944,7 @@ def test_garbage_collection(self):
del f
support.gc_collect()
self.assertIsNone(wr(), wr)
- with self.open(support.TESTFN, "rb") as f:
+ with self.open(os_helper.TESTFN, "rb") as f:
self.assertEqual(f.read(), b"123xxx")
def test_args_error(self):
@@ -2579,10 +2582,10 @@ class TextIOWrapperTest(unittest.TestCase):
def setUp(self):
self.testdata = b"AAA\r\nBBB\rCCC\r\nDDD\nEEE\r\n"
self.normalized = b"AAA\nBBB\nCCC\nDDD\nEEE\n".decode("ascii")
- support.unlink(support.TESTFN)
+ os_helper.unlink(os_helper.TESTFN)
def tearDown(self):
- support.unlink(support.TESTFN)
+ os_helper.unlink(os_helper.TESTFN)
def test_constructor(self):
r = self.BytesIO(b"\xc3\xa9\n\n")
@@ -2918,11 +2921,11 @@ def test_error_through_destructor(self):
def test_basic_io(self):
for chunksize in (1, 2, 3, 4, 5, 15, 16, 17, 31, 32, 33, 63, 64, 65):
for enc in "ascii", "latin-1", "utf-8" :# , "utf-16-be", "utf-16-le":
- f = self.open(support.TESTFN, "w+", encoding=enc)
+ f = self.open(os_helper.TESTFN, "w+", encoding=enc)
f._CHUNK_SIZE = chunksize
self.assertEqual(f.write("abc"), 3)
f.close()
- f = self.open(support.TESTFN, "r+", encoding=enc)
+ f = self.open(os_helper.TESTFN, "r+", encoding=enc)
f._CHUNK_SIZE = chunksize
self.assertEqual(f.tell(), 0)
self.assertEqual(f.read(), "abc")
@@ -2967,7 +2970,7 @@ def multi_line_test(self, f, enc):
self.assertEqual(rlines, wlines)
def test_telling(self):
- f = self.open(support.TESTFN, "w+", encoding="utf-8")
+ f = self.open(os_helper.TESTFN, "w+", encoding="utf-8")
p0 = f.tell()
f.write("\xff\n")
p1 = f.tell()
@@ -2995,9 +2998,9 @@ def test_seeking(self):
u_suffix = "\u8888\n"
suffix = bytes(u_suffix.encode("utf-8"))
line = prefix + suffix
- with self.open(support.TESTFN, "wb") as f:
+ with self.open(os_helper.TESTFN, "wb") as f:
f.write(line*2)
- with self.open(support.TESTFN, "r", encoding="utf-8") as f:
+ with self.open(os_helper.TESTFN, "r", encoding="utf-8") as f:
s = f.read(prefix_size)
self.assertEqual(s, str(prefix, "ascii"))
self.assertEqual(f.tell(), prefix_size)
@@ -3006,9 +3009,9 @@ def test_seeking(self):
def test_seeking_too(self):
# Regression test for a specific bug
data = b'\xe0\xbf\xbf\n'
- with self.open(support.TESTFN, "wb") as f:
+ with self.open(os_helper.TESTFN, "wb") as f:
f.write(data)
- with self.open(support.TESTFN, "r", encoding="utf-8") as f:
+ with self.open(os_helper.TESTFN, "r", encoding="utf-8") as f:
f._CHUNK_SIZE # Just test that it exists
f._CHUNK_SIZE = 2
f.readline()
@@ -3022,17 +3025,17 @@ def test_seek_and_tell(self):
def test_seek_and_tell_with_data(data, min_pos=0):
"""Tell/seek to various points within a data stream and ensure
that the decoded data returned by read() is consistent."""
- f = self.open(support.TESTFN, 'wb')
+ f = self.open(os_helper.TESTFN, 'wb')
f.write(data)
f.close()
- f = self.open(support.TESTFN, encoding='test_decoder')
+ f = self.open(os_helper.TESTFN, encoding='test_decoder')
f._CHUNK_SIZE = CHUNK_SIZE
decoded = f.read()
f.close()
for i in range(min_pos, len(decoded) + 1): # seek positions
for j in [1, 5, len(decoded) - i]: # read lengths
- f = self.open(support.TESTFN, encoding='test_decoder')
+ f = self.open(os_helper.TESTFN, encoding='test_decoder')
self.assertEqual(f.read(i), decoded[:i])
cookie = f.tell()
self.assertEqual(f.read(j), decoded[i:i + j])
@@ -3062,11 +3065,11 @@ def test_seek_and_tell_with_data(data, min_pos=0):
StatefulIncrementalDecoder.codecEnabled = 0
def test_multibyte_seek_and_tell(self):
- f = self.open(support.TESTFN, "w", encoding="euc_jp")
+ f = self.open(os_helper.TESTFN, "w", encoding="euc_jp")
f.write("AB\n\u3046\u3048\n")
f.close()
- f = self.open(support.TESTFN, "r", encoding="euc_jp")
+ f = self.open(os_helper.TESTFN, "r", encoding="euc_jp")
self.assertEqual(f.readline(), "AB\n")
p0 = f.tell()
self.assertEqual(f.readline(), "\u3046\u3048\n")
@@ -3077,7 +3080,7 @@ def test_multibyte_seek_and_tell(self):
f.close()
def test_seek_with_encoder_state(self):
- f = self.open(support.TESTFN, "w", encoding="euc_jis_2004")
+ f = self.open(os_helper.TESTFN, "w", encoding="euc_jis_2004")
f.write("\u00e6\u0300")
p0 = f.tell()
f.write("\u00e6")
@@ -3085,7 +3088,7 @@ def test_seek_with_encoder_state(self):
f.write("\u0300")
f.close()
- f = self.open(support.TESTFN, "r", encoding="euc_jis_2004")
+ f = self.open(os_helper.TESTFN, "r", encoding="euc_jis_2004")
self.assertEqual(f.readline(), "\u00e6\u0300\u0300")
f.close()
@@ -3229,7 +3232,7 @@ def test_issue2282(self):
def test_append_bom(self):
# The BOM is not written again when appending to a non-empty file
- filename = support.TESTFN
+ filename = os_helper.TESTFN
for charset in ('utf-8-sig', 'utf-16', 'utf-32'):
with self.open(filename, 'w', encoding=charset) as f:
f.write('aaa')
@@ -3244,7 +3247,7 @@ def test_append_bom(self):
def test_seek_bom(self):
# Same test, but when seeking manually
- filename = support.TESTFN
+ filename = os_helper.TESTFN
for charset in ('utf-8-sig', 'utf-16', 'utf-32'):
with self.open(filename, 'w', encoding=charset) as f:
f.write('aaa')
@@ -3259,7 +3262,7 @@ def test_seek_bom(self):
def test_seek_append_bom(self):
# Same test, but first seek to the start and then to the end
- filename = support.TESTFN
+ filename = os_helper.TESTFN
for charset in ('utf-8-sig', 'utf-16', 'utf-32'):
with self.open(filename, 'w', encoding=charset) as f:
f.write('aaa')
@@ -3271,16 +3274,16 @@ def test_seek_append_bom(self):
self.assertEqual(f.read(), 'aaaxxx'.encode(charset))
def test_errors_property(self):
- with self.open(support.TESTFN, "w") as f:
+ with self.open(os_helper.TESTFN, "w") as f:
self.assertEqual(f.errors, "strict")
- with self.open(support.TESTFN, "w", errors="replace") as f:
+ with self.open(os_helper.TESTFN, "w", errors="replace") as f:
self.assertEqual(f.errors, "replace")
@support.no_tracing
def test_threads_write(self):
# Issue6750: concurrent writes could duplicate data
event = threading.Event()
- with self.open(support.TESTFN, "w", buffering=1) as f:
+ with self.open(os_helper.TESTFN, "w", buffering=1) as f:
def run(n):
text = "Thread%03d\n" % n
event.wait()
@@ -3289,7 +3292,7 @@ def run(n):
for x in range(20)]
with threading_helper.start_threads(threads, event.set):
time.sleep(0.02)
- with self.open(support.TESTFN) as f:
+ with self.open(os_helper.TESTFN) as f:
content = f.read()
for n in range(20):
self.assertEqual(content.count("Thread%03d\n" % n), 1)
@@ -3732,8 +3735,8 @@ def test_garbage_collection(self):
# C TextIOWrapper objects are collected, and collecting them flushes
# all data to disk.
# The Python version has __del__, so it ends in gc.garbage instead.
- with support.check_warnings(('', ResourceWarning)):
- rawio = io.FileIO(support.TESTFN, "wb")
+ with warnings_helper.check_warnings(('', ResourceWarning)):
+ rawio = io.FileIO(os_helper.TESTFN, "wb")
b = self.BufferedWriter(rawio)
t = self.TextIOWrapper(b, encoding="ascii")
t.write("456def")
@@ -3742,7 +3745,7 @@ def test_garbage_collection(self):
del t
support.gc_collect()
self.assertIsNone(wr(), wr)
- with self.open(support.TESTFN, "rb") as f:
+ with self.open(os_helper.TESTFN, "rb") as f:
self.assertEqual(f.read(), b"456def")
def test_rwpair_cleared_before_textio(self):
@@ -3899,7 +3902,7 @@ class PyIncrementalNewlineDecoderTest(IncrementalNewlineDecoderTest):
class MiscIOTest(unittest.TestCase):
def tearDown(self):
- support.unlink(support.TESTFN)
+ os_helper.unlink(os_helper.TESTFN)
def test___all__(self):
for name in self.io.__all__:
@@ -3913,21 +3916,21 @@ def test___all__(self):
self.assertTrue(issubclass(obj, self.IOBase))
def test_attributes(self):
- f = self.open(support.TESTFN, "wb", buffering=0)
+ f = self.open(os_helper.TESTFN, "wb", buffering=0)
self.assertEqual(f.mode, "wb")
f.close()
- with support.check_warnings(('', DeprecationWarning)):
- f = self.open(support.TESTFN, "U")
- self.assertEqual(f.name, support.TESTFN)
- self.assertEqual(f.buffer.name, support.TESTFN)
- self.assertEqual(f.buffer.raw.name, support.TESTFN)
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
+ f = self.open(os_helper.TESTFN, "U")
+ self.assertEqual(f.name, os_helper.TESTFN)
+ self.assertEqual(f.buffer.name, os_helper.TESTFN)
+ self.assertEqual(f.buffer.raw.name, os_helper.TESTFN)
self.assertEqual(f.mode, "U")
self.assertEqual(f.buffer.mode, "rb")
self.assertEqual(f.buffer.raw.mode, "rb")
f.close()
- f = self.open(support.TESTFN, "w+")
+ f = self.open(os_helper.TESTFN, "w+")
self.assertEqual(f.mode, "w+")
self.assertEqual(f.buffer.mode, "rb+") # Does it really matter?
self.assertEqual(f.buffer.raw.mode, "rb+")
@@ -3969,7 +3972,7 @@ def test_io_after_close(self):
{"mode": "w+", "buffering": 2},
{"mode": "w+b", "buffering": 0},
]:
- f = self.open(support.TESTFN, **kwargs)
+ f = self.open(os_helper.TESTFN, **kwargs)
f.close()
self.assertRaises(ValueError, f.flush)
self.assertRaises(ValueError, f.fileno)
@@ -4019,17 +4022,17 @@ def test_abcs(self):
self.assertIsInstance(self.TextIOBase, abc.ABCMeta)
def _check_abc_inheritance(self, abcmodule):
- with self.open(support.TESTFN, "wb", buffering=0) as f:
+ with self.open(os_helper.TESTFN, "wb", buffering=0) as f:
self.assertIsInstance(f, abcmodule.IOBase)
self.assertIsInstance(f, abcmodule.RawIOBase)
self.assertNotIsInstance(f, abcmodule.BufferedIOBase)
self.assertNotIsInstance(f, abcmodule.TextIOBase)
- with self.open(support.TESTFN, "wb") as f:
+ with self.open(os_helper.TESTFN, "wb") as f:
self.assertIsInstance(f, abcmodule.IOBase)
self.assertNotIsInstance(f, abcmodule.RawIOBase)
self.assertIsInstance(f, abcmodule.BufferedIOBase)
self.assertNotIsInstance(f, abcmodule.TextIOBase)
- with self.open(support.TESTFN, "w") as f:
+ with self.open(os_helper.TESTFN, "w") as f:
self.assertIsInstance(f, abcmodule.IOBase)
self.assertNotIsInstance(f, abcmodule.RawIOBase)
self.assertNotIsInstance(f, abcmodule.BufferedIOBase)
@@ -4053,9 +4056,9 @@ def _check_warn_on_dealloc(self, *args, **kwargs):
self.assertIn(r, str(cm.warning.args[0]))
def test_warn_on_dealloc(self):
- self._check_warn_on_dealloc(support.TESTFN, "wb", buffering=0)
- self._check_warn_on_dealloc(support.TESTFN, "wb")
- self._check_warn_on_dealloc(support.TESTFN, "w")
+ self._check_warn_on_dealloc(os_helper.TESTFN, "wb", buffering=0)
+ self._check_warn_on_dealloc(os_helper.TESTFN, "wb")
+ self._check_warn_on_dealloc(os_helper.TESTFN, "w")
def _check_warn_on_dealloc_fd(self, *args, **kwargs):
fds = []
@@ -4073,7 +4076,7 @@ def cleanup_fds():
# When using closefd=False, there's no warning
r, w = os.pipe()
fds += r, w
- with support.check_no_resource_warning(self):
+ with warnings_helper.check_no_resource_warning(self):
open(r, *args, closefd=False, **kwargs)
def test_warn_on_dealloc_fd(self):
@@ -4096,7 +4099,7 @@ def test_pickling(self):
{"mode": "w+b", "buffering": 0},
]:
for protocol in range(pickle.HIGHEST_PROTOCOL + 1):
- with self.open(support.TESTFN, **kwargs) as f:
+ with self.open(os_helper.TESTFN, **kwargs) as f:
self.assertRaises(TypeError, pickle.dumps, f, protocol)
def test_nonblock_pipe_write_bigbuf(self):
@@ -4159,20 +4162,20 @@ def _test_nonblock_pipe_write(self, bufsize):
def test_create_fail(self):
# 'x' mode fails if file is existing
- with self.open(support.TESTFN, 'w'):
+ with self.open(os_helper.TESTFN, 'w'):
pass
- self.assertRaises(FileExistsError, self.open, support.TESTFN, 'x')
+ self.assertRaises(FileExistsError, self.open, os_helper.TESTFN, 'x')
def test_create_writes(self):
# 'x' mode opens for writing
- with self.open(support.TESTFN, 'xb') as f:
+ with self.open(os_helper.TESTFN, 'xb') as f:
f.write(b"spam")
- with self.open(support.TESTFN, 'rb') as f:
+ with self.open(os_helper.TESTFN, 'rb') as f:
self.assertEqual(b"spam", f.read())
def test_open_allargs(self):
# there used to be a buffer overflow in the parser for rawmode
- self.assertRaises(ValueError, self.open, support.TESTFN, 'rwax+')
+ self.assertRaises(ValueError, self.open, os_helper.TESTFN, 'rwax+')
def test_check_encoding_errors(self):
# bpo-37388: open() and TextIOWrapper must check encoding and errors
@@ -4427,7 +4430,7 @@ def check_interrupted_write_retry(self, item, **fdopen_kwargs):
"""Check that a buffered write, when it gets interrupted (either
returning a partial result or EINTR), properly invokes the signal
handler and retries if the latter returned successfully."""
- select = support.import_module("select")
+ select = import_helper.import_module("select")
# A quantity that exceeds the buffer size of an anonymous pipe's
# write end.
diff --git a/Lib/test/test_json/__init__.py b/Lib/test/test_json/__init__.py
index bac370dadfc83..74b64ed86a318 100644
--- a/Lib/test/test_json/__init__.py
+++ b/Lib/test/test_json/__init__.py
@@ -4,10 +4,12 @@
import unittest
from test import support
+from test.support import import_helper
+
# import json with and without accelerations
-cjson = support.import_fresh_module('json', fresh=['_json'])
-pyjson = support.import_fresh_module('json', blocked=['_json'])
+cjson = import_helper.import_fresh_module('json', fresh=['_json'])
+pyjson = import_helper.import_fresh_module('json', blocked=['_json'])
# JSONDecodeError is cached inside the _json module
cjson.JSONDecodeError = cjson.decoder.JSONDecodeError = json.JSONDecodeError
diff --git a/Lib/test/test_json/test_tool.py b/Lib/test/test_json/test_tool.py
index fc2a7a4fca3c5..5411188acb6a2 100644
--- a/Lib/test/test_json/test_tool.py
+++ b/Lib/test/test_json/test_tool.py
@@ -6,6 +6,7 @@
import subprocess
from test import support
+from test.support import os_helper
from test.support.script_helper import assert_python_ok
@@ -91,7 +92,7 @@ def test_stdin_stdout(self):
self.assertEqual(process.stderr, '')
def _create_infile(self, data=None):
- infile = support.TESTFN
+ infile = os_helper.TESTFN
with open(infile, "w", encoding="utf-8") as fp:
self.addCleanup(os.remove, infile)
fp.write(data or self.data)
@@ -121,7 +122,7 @@ def test_non_ascii_infile(self):
def test_infile_outfile(self):
infile = self._create_infile()
- outfile = support.TESTFN + '.out'
+ outfile = os_helper.TESTFN + '.out'
rc, out, err = assert_python_ok('-m', 'json.tool', infile, outfile)
self.addCleanup(os.remove, outfile)
with open(outfile, "r") as fp:
@@ -189,7 +190,7 @@ def test_compact(self):
def test_no_ensure_ascii_flag(self):
infile = self._create_infile('{"key":"💩"}')
- outfile = support.TESTFN + '.out'
+ outfile = os_helper.TESTFN + '.out'
self.addCleanup(os.remove, outfile)
assert_python_ok('-m', 'json.tool', '--no-ensure-ascii', infile, outfile)
with open(outfile, "rb") as f:
@@ -200,7 +201,7 @@ def test_no_ensure_ascii_flag(self):
def test_ensure_ascii_default(self):
infile = self._create_infile('{"key":"💩"}')
- outfile = support.TESTFN + '.out'
+ outfile = os_helper.TESTFN + '.out'
self.addCleanup(os.remove, outfile)
assert_python_ok('-m', 'json.tool', infile, outfile)
with open(outfile, "rb") as f:
diff --git a/Lib/test/test_netrc.py b/Lib/test/test_netrc.py
index 7ce7e565704f7..2bd46aa745ff2 100644
--- a/Lib/test/test_netrc.py
+++ b/Lib/test/test_netrc.py
@@ -1,5 +1,6 @@
import netrc, os, unittest, sys, tempfile, textwrap
from test import support
+from test.support import os_helper
class NetrcTestCase(unittest.TestCase):
@@ -108,16 +109,16 @@ def test_comment_at_end_of_machine_line_pass_has_hash(self):
def test_security(self):
# This test is incomplete since we are normally not run as root and
# therefore can't test the file ownership being wrong.
- d = support.TESTFN
+ d = os_helper.TESTFN
os.mkdir(d)
- self.addCleanup(support.rmtree, d)
+ self.addCleanup(os_helper.rmtree, d)
fn = os.path.join(d, '.netrc')
with open(fn, 'wt') as f:
f.write("""\
machine foo.domain.com login bar password pass
default login foo password pass
""")
- with support.EnvironmentVarGuard() as environ:
+ with os_helper.EnvironmentVarGuard() as environ:
environ.set('HOME', d)
os.chmod(fn, 0o600)
nrc = netrc.netrc()
@@ -127,10 +128,10 @@ def test_security(self):
self.assertRaises(netrc.NetrcParseError, netrc.netrc)
def test_file_not_found_in_home(self):
- d = support.TESTFN
+ d = os_helper.TESTFN
os.mkdir(d)
- self.addCleanup(support.rmtree, d)
- with support.EnvironmentVarGuard() as environ:
+ self.addCleanup(os_helper.rmtree, d)
+ with os_helper.EnvironmentVarGuard() as environ:
environ.set('HOME', d)
self.assertRaises(FileNotFoundError, netrc.netrc)
@@ -139,9 +140,9 @@ def test_file_not_found_explicit(self):
file='unlikely_netrc')
def test_home_not_set(self):
- fake_home = support.TESTFN
+ fake_home = os_helper.TESTFN
os.mkdir(fake_home)
- self.addCleanup(support.rmtree, fake_home)
+ self.addCleanup(os_helper.rmtree, fake_home)
fake_netrc_path = os.path.join(fake_home, '.netrc')
with open(fake_netrc_path, 'w') as f:
f.write('machine foo.domain.com login bar password pass')
@@ -152,7 +153,7 @@ def test_home_not_set(self):
def fake_expanduser(s):
called.append(s)
- with support.EnvironmentVarGuard() as environ:
+ with os_helper.EnvironmentVarGuard() as environ:
environ.set('HOME', fake_home)
environ.set('USERPROFILE', fake_home)
result = orig_expanduser(s)
diff --git a/Lib/test/test_nis.py b/Lib/test/test_nis.py
index 21074c68106a3..a22142f4069ba 100644
--- a/Lib/test/test_nis.py
+++ b/Lib/test/test_nis.py
@@ -1,8 +1,10 @@
from test import support
+from test.support import import_helper
import unittest
+
# Skip test if nis module does not exist.
-nis = support.import_module('nis')
+nis = import_helper.import_module('nis')
class NisTests(unittest.TestCase):
diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
index 2307b133dbd0d..1f5cb103933e0 100644
--- a/Lib/test/test_pickle.py
+++ b/Lib/test/test_pickle.py
@@ -10,6 +10,7 @@
import unittest
from test import support
+from test.support import import_helper
from test.pickletester import AbstractHookTests
from test.pickletester import AbstractUnpickleTests
@@ -499,7 +500,7 @@ def test_exceptions(self):
('builtins', name))
def test_multiprocessing_exceptions(self):
- module = support.import_module('multiprocessing.context')
+ module = import_helper.import_module('multiprocessing.context')
for name, exc in get_exceptions(module):
with self.subTest(name):
self.assertEqual(reverse_mapping('multiprocessing.context', name),
diff --git a/Lib/test/test_py_compile.py b/Lib/test/test_py_compile.py
index d4a68c9320d04..11b579c26e711 100644
--- a/Lib/test/test_py_compile.py
+++ b/Lib/test/test_py_compile.py
@@ -9,13 +9,14 @@
import unittest
from test import support
+from test.support import os_helper
def without_source_date_epoch(fxn):
"""Runs function with SOURCE_DATE_EPOCH unset."""
@functools.wraps(fxn)
def wrapper(*args, **kwargs):
- with support.EnvironmentVarGuard() as env:
+ with os_helper.EnvironmentVarGuard() as env:
env.unset('SOURCE_DATE_EPOCH')
return fxn(*args, **kwargs)
return wrapper
@@ -25,7 +26,7 @@ def with_source_date_epoch(fxn):
"""Runs function with SOURCE_DATE_EPOCH set."""
@functools.wraps(fxn)
def wrapper(*args, **kwargs):
- with support.EnvironmentVarGuard() as env:
+ with os_helper.EnvironmentVarGuard() as env:
env['SOURCE_DATE_EPOCH'] = '123456789'
return fxn(*args, **kwargs)
return wrapper
diff --git a/Lib/test/test_sqlite.py b/Lib/test/test_sqlite.py
index 9564da35193f1..73002f228fa70 100644
--- a/Lib/test/test_sqlite.py
+++ b/Lib/test/test_sqlite.py
@@ -1,7 +1,8 @@
import test.support
+from test.support import import_helper
# Skip test if _sqlite3 module not installed
-test.support.import_module('_sqlite3')
+import_helper.import_module('_sqlite3')
import unittest
import sqlite3
diff --git a/Lib/test/test_univnewlines.py b/Lib/test/test_univnewlines.py
index fd07539fb60fd..b905491878001 100644
--- a/Lib/test/test_univnewlines.py
+++ b/Lib/test/test_univnewlines.py
@@ -5,6 +5,8 @@
import os
import sys
from test import support
+from test.support import os_helper
+
if not hasattr(sys.stdin, 'newlines'):
raise unittest.SkipTest(
@@ -46,29 +48,29 @@ def setUp(self):
data = self.DATA
if "b" in self.WRITEMODE:
data = data.encode("ascii")
- with self.open(support.TESTFN, self.WRITEMODE) as fp:
+ with self.open(os_helper.TESTFN, self.WRITEMODE) as fp:
fp.write(data)
def tearDown(self):
try:
- os.unlink(support.TESTFN)
+ os.unlink(os_helper.TESTFN)
except:
pass
def test_read(self):
- with self.open(support.TESTFN, self.READMODE) as fp:
+ with self.open(os_helper.TESTFN, self.READMODE) as fp:
data = fp.read()
self.assertEqual(data, DATA_LF)
self.assertEqual(repr(fp.newlines), repr(self.NEWLINE))
def test_readlines(self):
- with self.open(support.TESTFN, self.READMODE) as fp:
+ with self.open(os_helper.TESTFN, self.READMODE) as fp:
data = fp.readlines()
self.assertEqual(data, DATA_SPLIT)
self.assertEqual(repr(fp.newlines), repr(self.NEWLINE))
def test_readline(self):
- with self.open(support.TESTFN, self.READMODE) as fp:
+ with self.open(os_helper.TESTFN, self.READMODE) as fp:
data = []
d = fp.readline()
while d:
@@ -78,7 +80,7 @@ def test_readline(self):
self.assertEqual(repr(fp.newlines), repr(self.NEWLINE))
def test_seek(self):
- with self.open(support.TESTFN, self.READMODE) as fp:
+ with self.open(os_helper.TESTFN, self.READMODE) as fp:
fp.readline()
pos = fp.tell()
data = fp.readlines()
@@ -105,7 +107,7 @@ class TestCRLFNewlines(TestGenericUnivNewlines):
DATA = DATA_CRLF
def test_tell(self):
- with self.open(support.TESTFN, self.READMODE) as fp:
+ with self.open(os_helper.TESTFN, self.READMODE) as fp:
self.assertEqual(repr(fp.newlines), repr(None))
data = fp.readline()
pos = fp.tell()
diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py
index b1c92427dd270..718113d6e1bb2 100644
--- a/Lib/test/test_uuid.py
+++ b/Lib/test/test_uuid.py
@@ -1,5 +1,6 @@
import unittest
from test import support
+from test.support import import_helper
import builtins
import contextlib
import copy
@@ -10,8 +11,8 @@
import weakref
from unittest import mock
-py_uuid = support.import_fresh_module('uuid', blocked=['_uuid'])
-c_uuid = support.import_fresh_module('uuid', fresh=['_uuid'])
+py_uuid = import_helper.import_fresh_module('uuid', blocked=['_uuid'])
+c_uuid = import_helper.import_fresh_module('uuid', fresh=['_uuid'])
def importable(name):
try:
More information about the Python-checkins
mailing list