[Python-checkins] bpo-40275: Use new test.support helper submodules in tests (GH-21219)

Hai Shi webhook-mailer at python.org
Tue Jun 30 09:46:13 EDT 2020

• Previous message (by thread): [Python-checkins] Update FAQ release schedule and estimated users (GH-21180)
• Next message (by thread): [Python-checkins] bpo-40275: Use new test.support helper submodules in tests (GH-21169)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

https://github.com/python/cpython/commit/3ddc634cd5469550c0c2dc5a6051a70739995699
commit: 3ddc634cd5469550c0c2dc5a6051a70739995699
branch: master
author: Hai Shi <shihai1992 at gmail.com>
committer: GitHub <noreply at github.com>
date: 2020年06月30日T15:46:06+02:00
summary:
bpo-40275: Use new test.support helper submodules in tests (GH-21219)
files:
M Lib/test/audiotests.py
M Lib/test/libregrtest/cmdline.py
M Lib/test/libregrtest/main.py
M Lib/test/libregrtest/runtest_mp.py
M Lib/test/test_aifc.py
M Lib/test/test_bz2.py
M Lib/test/test_functools.py
M Lib/test/test_future.py
M Lib/test/test_logging.py
M Lib/test/test_poll.py
M Lib/test/test_regrtest.py
M Lib/test/test_smtpd.py
M Lib/test/test_time.py
M Lib/test/test_unicode_file.py
M Lib/test/test_urllib.py
M Lib/test/test_zipimport_support.py
diff --git a/Lib/test/audiotests.py b/Lib/test/audiotests.py
index d3e8e9ee44a13..9d6c4cc2b4b02 100644
--- a/Lib/test/audiotests.py
+++ b/Lib/test/audiotests.py
@@ -1,4 +1,5 @@
-from test.support import findfile, TESTFN, unlink
+from test.support import findfile
+from test.support.os_helper import TESTFN, unlink
 import array
 import io
 import pickle
diff --git a/Lib/test/libregrtest/cmdline.py b/Lib/test/libregrtest/cmdline.py
index c0bb051bd0783..a4bac79c8af68 100644
--- a/Lib/test/libregrtest/cmdline.py
+++ b/Lib/test/libregrtest/cmdline.py
@@ -2,6 +2,7 @@
 import os
 import sys
 from test import support
+from test.support import os_helper
 
 
 USAGE = """\
@@ -291,7 +292,7 @@ def _create_parser():
 def relative_filename(string):
 # CWD is replaced with a temporary dir before calling main(), so we
 # join it with the saved CWD so it ends up where the user expects.
- return os.path.join(support.SAVEDCWD, string)
+ return os.path.join(os_helper.SAVEDCWD, string)
 
 
 def huntrleaks(string):
diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index 7675a97b5b48e..793c99a8f4ca3 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -216,7 +216,7 @@ def find_tests(self, tests):
 # regex to match 'test_builtin' in line:
 # '0:00:00 [ 4/400] test_builtin -- test_dict took 1 sec'
 regex = re.compile(r'\btest_[a-zA-Z0-9_]+\b')
- with open(os.path.join(support.SAVEDCWD, self.ns.fromfile)) as fp:
+ with open(os.path.join(os_helper.SAVEDCWD, self.ns.fromfile)) as fp:
 for line in fp:
 line = line.split('#', 1)[0]
 line = line.strip()
@@ -559,7 +559,7 @@ def save_xml_result(self):
 for k, v in totals.items():
 root.set(k, str(v))
 
- xmlpath = os.path.join(support.SAVEDCWD, self.ns.xmlpath)
+ xmlpath = os.path.join(os_helper.SAVEDCWD, self.ns.xmlpath)
 with open(xmlpath, 'wb') as f:
 for s in ET.tostringlist(root):
 f.write(s)
@@ -597,7 +597,7 @@ def create_temp_dir(self):
 test_cwd = 'test_python_worker_{}'.format(pid)
 else:
 test_cwd = 'test_python_{}'.format(pid)
- test_cwd += support.FS_NONASCII
+ test_cwd += os_helper.FS_NONASCII
 test_cwd = os.path.join(self.tmp_dir, test_cwd)
 return test_cwd
 
@@ -609,10 +609,10 @@ def cleanup(self):
 for name in glob.glob(path):
 if os.path.isdir(name):
 print("Remove directory: %s" % name)
- support.rmtree(name)
+ os_helper.rmtree(name)
 else:
 print("Remove file: %s" % name)
- support.unlink(name)
+ os_helper.unlink(name)
 
 def main(self, tests=None, **kwargs):
 self.parse_args(kwargs)
@@ -629,7 +629,7 @@ def main(self, tests=None, **kwargs):
 # Run the tests in a context manager that temporarily changes the CWD
 # to a temporary and writable directory. If it's not possible to
 # create or change the CWD, the original CWD will be used.
- # The original CWD is available from support.SAVEDCWD.
+ # The original CWD is available from os_helper.SAVEDCWD.
 with os_helper.temp_cwd(test_cwd, quiet=True):
 # When using multiprocessing, worker processes will use test_cwd
 # as their parent temporary directory. So when the main process
diff --git a/Lib/test/libregrtest/runtest_mp.py b/Lib/test/libregrtest/runtest_mp.py
index 7a18e45434bb4..3d503af23b6a7 100644
--- a/Lib/test/libregrtest/runtest_mp.py
+++ b/Lib/test/libregrtest/runtest_mp.py
@@ -11,6 +11,7 @@
 import traceback
 import types
 from test import support
+from test.support import os_helper
 
 from test.libregrtest.runtest import (
 runtest, INTERRUPTED, CHILD_ERROR, PROGRESS_MIN_TIME,
@@ -70,7 +71,7 @@ def run_test_in_subprocess(testname, ns):
 stderr=subprocess.PIPE,
 universal_newlines=True,
 close_fds=(os.name != 'nt'),
- cwd=support.SAVEDCWD,
+ cwd=os_helper.SAVEDCWD,
 **kw)
 
 
diff --git a/Lib/test/test_aifc.py b/Lib/test/test_aifc.py
index 5a95099cc5cdf..fb6da4136f4c5 100644
--- a/Lib/test/test_aifc.py
+++ b/Lib/test/test_aifc.py
@@ -1,4 +1,6 @@
-from test.support import check_no_resource_warning, findfile, TESTFN, unlink
+from test.support import findfile
+from test.support.os_helper import TESTFN, unlink
+from test.support.warnings_helper import check_no_resource_warning
 import unittest
 from unittest import mock
 from test import audiotests
diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py
index 8f0773d55faef..ccc5e4df83a7a 100644
--- a/Lib/test/test_bz2.py
+++ b/Lib/test/test_bz2.py
@@ -12,14 +12,15 @@
 import shutil
 import subprocess
 import threading
+from test.support import import_helper
 from test.support import threading_helper
-from test.support import unlink
+from test.support.os_helper import unlink
 import _compression
 import sys
 
 
 # Skip tests if the bz2 module doesn't exist.
-bz2 = support.import_module('bz2')
+bz2 = import_helper.import_module('bz2')
 from bz2 import BZ2File, BZ2Compressor, BZ2Decompressor
 
 has_cmdline_bunzip2 = None
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index e726188982bc4..edd5773e13d54 100644
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -19,15 +19,18 @@
 from weakref import proxy
 import contextlib
 
+from test.support import import_helper
 from test.support import threading_helper
 from test.support.script_helper import assert_python_ok
 
 import functools
 
-py_functools = support.import_fresh_module('functools', blocked=['_functools'])
-c_functools = support.import_fresh_module('functools', fresh=['_functools'])
+py_functools = import_helper.import_fresh_module('functools',
+ blocked=['_functools'])
+c_functools = import_helper.import_fresh_module('functools',
+ fresh=['_functools'])
 
-decimal = support.import_fresh_module('decimal', fresh=['_decimal'])
+decimal = import_helper.import_fresh_module('decimal', fresh=['_decimal'])
 
 @contextlib.contextmanager
 def replaced_module(name, replacement):
diff --git a/Lib/test/test_future.py b/Lib/test/test_future.py
index 0f40357b3a731..e4715587d21cf 100644
--- a/Lib/test/test_future.py
+++ b/Lib/test/test_future.py
@@ -4,6 +4,7 @@
 import ast
 import unittest
 from test import support
+from test.support import import_helper
 from textwrap import dedent
 import os
 import re
@@ -24,17 +25,17 @@ def check_syntax_error(self, err, basename, lineno, offset=1):
 self.assertEqual(err.offset, offset)
 
 def test_future1(self):
- with support.CleanImport('future_test1'):
+ with import_helper.CleanImport('future_test1'):
 from test import future_test1
 self.assertEqual(future_test1.result, 6)
 
 def test_future2(self):
- with support.CleanImport('future_test2'):
+ with import_helper.CleanImport('future_test2'):
 from test import future_test2
 self.assertEqual(future_test2.result, 6)
 
 def test_future3(self):
- with support.CleanImport('test_future3'):
+ with import_helper.CleanImport('test_future3'):
 from test import test_future3
 
 def test_badfuture3(self):
@@ -113,7 +114,7 @@ def test_parserhack(self):
 self.fail("syntax error didn't occur")
 
 def test_multiple_features(self):
- with support.CleanImport("test.test_future5"):
+ with import_helper.CleanImport("test.test_future5"):
 from test import test_future5
 
 def test_unicode_literals_exec(self):
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 2ae00b6e3b4e9..eb5b926908a19 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -42,8 +42,10 @@
 import tempfile
 from test.support.script_helper import assert_python_ok, assert_python_failure
 from test import support
+from test.support import os_helper
 from test.support import socket_helper
 from test.support import threading_helper
+from test.support import warnings_helper
 from test.support.logging_helper import TestHandler
 import textwrap
 import threading
@@ -1169,7 +1171,7 @@ class ConfigFileTest(BaseTest):
 
 """Reading logging config from a .ini-style config file."""
 
- check_no_resource_warning = support.check_no_resource_warning
+ check_no_resource_warning = warnings_helper.check_no_resource_warning
 expected_log_pat = r"^(\w+) \+\+ (\w+)$"
 
 # config0 is a standard configuration.
@@ -1756,7 +1758,7 @@ def setUp(self):
 
 def tearDown(self):
 SocketHandlerTest.tearDown(self)
- support.unlink(self.address)
+ os_helper.unlink(self.address)
 
 class DatagramHandlerTest(BaseTest):
 
@@ -1837,7 +1839,7 @@ def setUp(self):
 
 def tearDown(self):
 DatagramHandlerTest.tearDown(self)
- support.unlink(self.address)
+ os_helper.unlink(self.address)
 
 class SysLogHandlerTest(BaseTest):
 
@@ -1921,7 +1923,7 @@ def setUp(self):
 
 def tearDown(self):
 SysLogHandlerTest.tearDown(self)
- support.unlink(self.address)
+ os_helper.unlink(self.address)
 
 @unittest.skipUnless(socket_helper.IPV6_ENABLED,
 'IPv6 support required for this test.')
@@ -2175,7 +2177,7 @@ class ConfigDictTest(BaseTest):
 
 """Reading logging config from a dictionary."""
 
- check_no_resource_warning = support.check_no_resource_warning
+ check_no_resource_warning = warnings_helper.check_no_resource_warning
 expected_log_pat = r"^(\w+) \+\+ (\w+)$"
 
 # config0 is a standard configuration.
diff --git a/Lib/test/test_poll.py b/Lib/test/test_poll.py
index a14c69a5723a2..de62350696a92 100644
--- a/Lib/test/test_poll.py
+++ b/Lib/test/test_poll.py
@@ -7,8 +7,10 @@
 import threading
 import time
 import unittest
-from test.support import TESTFN, run_unittest, cpython_only
+from test.support import run_unittest, cpython_only
 from test.support import threading_helper
+from test.support.os_helper import TESTFN
+
 
 try:
 select.poll
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
index 6745be6fea1ac..39af0d96d1e54 100644
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -18,6 +18,7 @@
 import unittest
 from test import libregrtest
 from test import support
+from test.support import os_helper
 from test.libregrtest import utils
 
 
@@ -161,12 +162,12 @@ def test_ignore(self):
 self.assertEqual(ns.ignore_tests, ['pattern'])
 self.checkError([opt], 'expected one argument')
 
- self.addCleanup(support.unlink, support.TESTFN)
- with open(support.TESTFN, "w") as fp:
+ self.addCleanup(os_helper.unlink, os_helper.TESTFN)
+ with open(os_helper.TESTFN, "w") as fp:
 print('matchfile1', file=fp)
 print('matchfile2', file=fp)
 
- filename = os.path.abspath(support.TESTFN)
+ filename = os.path.abspath(os_helper.TESTFN)
 ns = libregrtest._parse_args(['-m', 'match',
 '--ignorefile', filename])
 self.assertEqual(ns.ignore_tests,
@@ -183,12 +184,12 @@ def test_match(self):
 '-m', 'pattern2'])
 self.assertEqual(ns.match_tests, ['pattern1', 'pattern2'])
 
- self.addCleanup(support.unlink, support.TESTFN)
- with open(support.TESTFN, "w") as fp:
+ self.addCleanup(os_helper.unlink, os_helper.TESTFN)
+ with open(os_helper.TESTFN, "w") as fp:
 print('matchfile1', file=fp)
 print('matchfile2', file=fp)
 
- filename = os.path.abspath(support.TESTFN)
+ filename = os.path.abspath(os_helper.TESTFN)
 ns = libregrtest._parse_args(['-m', 'match',
 '--matchfile', filename])
 self.assertEqual(ns.match_tests,
@@ -237,7 +238,7 @@ def test_memlimit(self):
 
 def test_testdir(self):
 ns = libregrtest._parse_args(['--testdir', 'foo'])
- self.assertEqual(ns.testdir, os.path.join(support.SAVEDCWD, 'foo'))
+ self.assertEqual(ns.testdir, os.path.join(os_helper.SAVEDCWD, 'foo'))
 self.checkError(['--testdir'], 'expected one argument')
 
 def test_runleaks(self):
@@ -284,7 +285,7 @@ def test_coverdir(self):
 with self.subTest(opt=opt):
 ns = libregrtest._parse_args([opt, 'foo'])
 self.assertEqual(ns.coverdir,
- os.path.join(support.SAVEDCWD, 'foo'))
+ os.path.join(os_helper.SAVEDCWD, 'foo'))
 self.checkError([opt], 'expected one argument')
 
 def test_nocoverdir(self):
@@ -363,7 +364,7 @@ def setUp(self):
 self.testdir = os.path.realpath(os.path.dirname(__file__))
 
 self.tmptestdir = tempfile.mkdtemp()
- self.addCleanup(support.rmtree, self.tmptestdir)
+ self.addCleanup(os_helper.rmtree, self.tmptestdir)
 
 def create_test(self, name=None, code=None):
 if not name:
@@ -384,7 +385,7 @@ def test_empty_test(self):
 name = self.TESTNAME_PREFIX + name
 path = os.path.join(self.tmptestdir, name + '.py')
 
- self.addCleanup(support.unlink, path)
+ self.addCleanup(os_helper.unlink, path)
 # Use 'x' mode to ensure that we do not override existing tests
 try:
 with open(path, 'x', encoding='utf-8') as fp:
@@ -770,8 +771,8 @@ def test_fromfile(self):
 # Write the list of files using a format similar to regrtest output:
 # [1/2] test_1
 # [2/2] test_2
- filename = support.TESTFN
- self.addCleanup(support.unlink, filename)
+ filename = os_helper.TESTFN
+ self.addCleanup(os_helper.unlink, filename)
 
 # test format '0:00:00 [2/7] test_opcodes -- test_grammar took 0 sec'
 with open(filename, "w") as fp:
@@ -886,7 +887,7 @@ def check_leak(self, code, what):
 test = self.create_test('huntrleaks', code=code)
 
 filename = 'reflog.txt'
- self.addCleanup(support.unlink, filename)
+ self.addCleanup(os_helper.unlink, filename)
 output = self.run_tests('--huntrleaks', '3:3:', test,
 exitcode=2,
 stderr=subprocess.STDOUT)
@@ -997,8 +998,8 @@ def test_method4(self):
 testname = self.create_test(code=code)
 
 # only run a subset
- filename = support.TESTFN
- self.addCleanup(support.unlink, filename)
+ filename = os_helper.TESTFN
+ self.addCleanup(os_helper.unlink, filename)
 
 subset = [
 # only ignore the method name
@@ -1038,8 +1039,8 @@ def test_method4(self):
 self.assertEqual(methods, all_methods)
 
 # only run a subset
- filename = support.TESTFN
- self.addCleanup(support.unlink, filename)
+ filename = os_helper.TESTFN
+ self.addCleanup(os_helper.unlink, filename)
 
 subset = [
 # only match the method name
diff --git a/Lib/test/test_smtpd.py b/Lib/test/test_smtpd.py
index 3be7739743940..d5d5abfcf370a 100644
--- a/Lib/test/test_smtpd.py
+++ b/Lib/test/test_smtpd.py
@@ -2,6 +2,7 @@
 import textwrap
 from test import support, mock_socket
 from test.support import socket_helper
+from test.support import warnings_helper
 import socket
 import io
 import smtpd
@@ -714,49 +715,49 @@ def test_unknown_command(self):
 b'recognized\r\n')
 
 def test_attribute_deprecations(self):
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 spam = self.channel._SMTPChannel__server
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 self.channel._SMTPChannel__server = 'spam'
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 spam = self.channel._SMTPChannel__line
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 self.channel._SMTPChannel__line = 'spam'
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 spam = self.channel._SMTPChannel__state
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 self.channel._SMTPChannel__state = 'spam'
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 spam = self.channel._SMTPChannel__greeting
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 self.channel._SMTPChannel__greeting = 'spam'
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 spam = self.channel._SMTPChannel__mailfrom
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 self.channel._SMTPChannel__mailfrom = 'spam'
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 spam = self.channel._SMTPChannel__rcpttos
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 self.channel._SMTPChannel__rcpttos = 'spam'
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 spam = self.channel._SMTPChannel__data
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 self.channel._SMTPChannel__data = 'spam'
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 spam = self.channel._SMTPChannel__fqdn
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 self.channel._SMTPChannel__fqdn = 'spam'
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 spam = self.channel._SMTPChannel__peer
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 self.channel._SMTPChannel__peer = 'spam'
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 spam = self.channel._SMTPChannel__conn
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 self.channel._SMTPChannel__conn = 'spam'
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 spam = self.channel._SMTPChannel__addr
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 self.channel._SMTPChannel__addr = 'spam'
 
 @unittest.skipUnless(socket_helper.IPV6_ENABLED, "IPv6 not enabled")
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 80e43fafad813..6ced0470d0756 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -1,4 +1,5 @@
 from test import support
+from test.support import warnings_helper
 import decimal
 import enum
 import locale
@@ -247,7 +248,7 @@ def test_default_values_for_zero(self):
 # not change output based on its value and no test for year
 # because systems vary in their support for year 0.
 expected = "2000 01 01 00 00 00 1 001"
- with support.check_warnings():
+ with warnings_helper.check_warnings():
 result = time.strftime("%Y %m %d %H %M %S %w %j", (2000,)+(0,)*8)
 self.assertEqual(expected, result)
 
diff --git a/Lib/test/test_unicode_file.py b/Lib/test/test_unicode_file.py
index 46a0d062540b7..e397949187983 100644
--- a/Lib/test/test_unicode_file.py
+++ b/Lib/test/test_unicode_file.py
@@ -6,8 +6,10 @@
 import unicodedata
 
 import unittest
-from test.support import (run_unittest, rmtree, change_cwd,
- TESTFN_UNICODE, TESTFN_UNENCODABLE, create_empty_file)
+from test.support import run_unittest
+from test.support.os_helper import (rmtree, change_cwd, TESTFN_UNICODE,
+ TESTFN_UNENCODABLE, create_empty_file)
+
 
 if not os.path.supports_unicode_filenames:
 try:
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 68bb49efb2810..f41fa2a950686 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -9,6 +9,8 @@
 import unittest
 from unittest.mock import patch
 from test import support
+from test.support import os_helper
+from test.support import warnings_helper
 import os
 try:
 import ssl
@@ -50,7 +52,7 @@ def urlopen(url, data=None, proxies=None):
 
 
 def FancyURLopener():
- with support.check_warnings(
+ with warnings_helper.check_warnings(
 ('FancyURLopener style of invoking requests is deprecated.',
 DeprecationWarning)):
 return urllib.request.FancyURLopener()
@@ -145,19 +147,19 @@ def setUp(self):
 # Create a temp file to use for testing
 self.text = bytes("test_urllib: %s\n" % self.__class__.__name__,
 "ascii")
- f = open(support.TESTFN, 'wb')
+ f = open(os_helper.TESTFN, 'wb')
 try:
 f.write(self.text)
 finally:
 f.close()
- self.pathname = support.TESTFN
+ self.pathname = os_helper.TESTFN
 self.quoted_pathname = urllib.parse.quote(self.pathname)
 self.returned_obj = urlopen("file:%s" % self.quoted_pathname)
 
 def tearDown(self):
 """Shut down the open object"""
 self.returned_obj.close()
- os.remove(support.TESTFN)
+ os.remove(os_helper.TESTFN)
 
 def test_interface(self):
 # Make sure object returned by urlopen() has the specified methods
@@ -230,7 +232,7 @@ class ProxyTests(unittest.TestCase):
 
 def setUp(self):
 # Records changes to env vars
- self.env = support.EnvironmentVarGuard()
+ self.env = os_helper.EnvironmentVarGuard()
 # Delete all proxy related env vars
 for k in list(os.environ):
 if 'proxy' in k.lower():
@@ -592,13 +594,13 @@ def test_userpass_inurl_w_spaces(self):
 self.unfakehttp()
 
 def test_URLopener_deprecation(self):
- with support.check_warnings(('',DeprecationWarning)):
+ with warnings_helper.check_warnings(('',DeprecationWarning)):
 urllib.request.URLopener()
 
 @unittest.skipUnless(ssl, "ssl module required")
 def test_cafile_and_context(self):
 context = ssl.create_default_context()
- with support.check_warnings(('', DeprecationWarning)):
+ with warnings_helper.check_warnings(('', DeprecationWarning)):
 with self.assertRaises(ValueError):
 urllib.request.urlopen(
 "https://localhost", cafile="/nonexistent/path", context=context
@@ -699,10 +701,10 @@ def setUp(self):
 self.tempFiles = []
 
 # Create a temporary file.
- self.registerFileForCleanUp(support.TESTFN)
+ self.registerFileForCleanUp(os_helper.TESTFN)
 self.text = b'testing urllib.urlretrieve'
 try:
- FILE = open(support.TESTFN, 'wb')
+ FILE = open(os_helper.TESTFN, 'wb')
 FILE.write(self.text)
 FILE.close()
 finally:
@@ -745,18 +747,18 @@ def registerFileForCleanUp(self, fileName):
 def test_basic(self):
 # Make sure that a local file just gets its own location returned and
 # a headers value is returned.
- result = urllib.request.urlretrieve("file:%s" % support.TESTFN)
- self.assertEqual(result[0], support.TESTFN)
+ result = urllib.request.urlretrieve("file:%s" % os_helper.TESTFN)
+ self.assertEqual(result[0], os_helper.TESTFN)
 self.assertIsInstance(result[1], email.message.Message,
 "did not get an email.message.Message instance "
 "as second returned value")
 
 def test_copy(self):
 # Test that setting the filename argument works.
- second_temp = "%s.2" % support.TESTFN
+ second_temp = "%s.2" % os_helper.TESTFN
 self.registerFileForCleanUp(second_temp)
 result = urllib.request.urlretrieve(self.constructLocalFileUrl(
- support.TESTFN), second_temp)
+ os_helper.TESTFN), second_temp)
 self.assertEqual(second_temp, result[0])
 self.assertTrue(os.path.exists(second_temp), "copy of the file was not "
 "made")
@@ -777,10 +779,10 @@ def hooktester(block_count, block_read_size, file_size, count_holder=[0]):
 self.assertIsInstance(file_size, int)
 self.assertEqual(block_count, count_holder[0])
 count_holder[0] = count_holder[0] + 1
- second_temp = "%s.2" % support.TESTFN
+ second_temp = "%s.2" % os_helper.TESTFN
 self.registerFileForCleanUp(second_temp)
 urllib.request.urlretrieve(
- self.constructLocalFileUrl(support.TESTFN),
+ self.constructLocalFileUrl(os_helper.TESTFN),
 second_temp, hooktester)
 
 def test_reporthook_0_bytes(self):
@@ -790,7 +792,7 @@ def hooktester(block_count, block_read_size, file_size, _report=report):
 _report.append((block_count, block_read_size, file_size))
 srcFileName = self.createNewTempFile()
 urllib.request.urlretrieve(self.constructLocalFileUrl(srcFileName),
- support.TESTFN, hooktester)
+ os_helper.TESTFN, hooktester)
 self.assertEqual(len(report), 1)
 self.assertEqual(report[0][2], 0)
 
@@ -803,7 +805,7 @@ def hooktester(block_count, block_read_size, file_size, _report=report):
 _report.append((block_count, block_read_size, file_size))
 srcFileName = self.createNewTempFile(b"x" * 5)
 urllib.request.urlretrieve(self.constructLocalFileUrl(srcFileName),
- support.TESTFN, hooktester)
+ os_helper.TESTFN, hooktester)
 self.assertEqual(len(report), 2)
 self.assertEqual(report[0][2], 5)
 self.assertEqual(report[1][2], 5)
@@ -817,7 +819,7 @@ def hooktester(block_count, block_read_size, file_size, _report=report):
 _report.append((block_count, block_read_size, file_size))
 srcFileName = self.createNewTempFile(b"x" * 8193)
 urllib.request.urlretrieve(self.constructLocalFileUrl(srcFileName),
- support.TESTFN, hooktester)
+ os_helper.TESTFN, hooktester)
 self.assertEqual(len(report), 3)
 self.assertEqual(report[0][2], 8193)
 self.assertEqual(report[0][1], 8192)
@@ -1556,7 +1558,7 @@ def test_quoted_open(self):
 class DummyURLopener(urllib.request.URLopener):
 def open_spam(self, url):
 return url
- with support.check_warnings(
+ with warnings_helper.check_warnings(
 ('DummyURLopener style of invoking requests is deprecated.',
 DeprecationWarning)):
 self.assertEqual(DummyURLopener().open(
@@ -1567,9 +1569,9 @@ def open_spam(self, url):
 "spam://c:|windows%/:=&?~#+!,ドル;'@()*[]|/path/"),
 "//c:|windows%/:=&?~#+!,ドル;'@()*[]|/path/")
 
- @support.ignore_warnings(category=DeprecationWarning)
+ @warnings_helper.ignore_warnings(category=DeprecationWarning)
 def test_urlopener_retrieve_file(self):
- with support.temp_dir() as tmpdir:
+ with os_helper.temp_dir() as tmpdir:
 fd, tmpfile = tempfile.mkstemp(dir=tmpdir)
 os.close(fd)
 fileurl = "file:" + urllib.request.pathname2url(tmpfile)
@@ -1577,7 +1579,7 @@ def test_urlopener_retrieve_file(self):
 # Some buildbots have TEMP folder that uses a lowercase drive letter.
 self.assertEqual(os.path.normcase(filename), os.path.normcase(tmpfile))
 
- @support.ignore_warnings(category=DeprecationWarning)
+ @warnings_helper.ignore_warnings(category=DeprecationWarning)
 def test_urlopener_retrieve_remote(self):
 url = "http://www.python.org/file.txt"
 self.fakehttp(b"HTTP/1.1 200 OK\r\n\r\nHello!")
@@ -1585,7 +1587,7 @@ def test_urlopener_retrieve_remote(self):
 filename, _ = urllib.request.URLopener().retrieve(url)
 self.assertEqual(os.path.splitext(filename)[1], ".txt")
 
- @support.ignore_warnings(category=DeprecationWarning)
+ @warnings_helper.ignore_warnings(category=DeprecationWarning)
 def test_local_file_open(self):
 # bpo-35907, CVE-2019-9948: urllib must reject local_file:// scheme
 class DummyURLopener(urllib.request.URLopener):
diff --git a/Lib/test/test_zipimport_support.py b/Lib/test/test_zipimport_support.py
index 88561017503ff..7bf50a33728e5 100644
--- a/Lib/test/test_zipimport_support.py
+++ b/Lib/test/test_zipimport_support.py
@@ -13,6 +13,7 @@
 import inspect
 import linecache
 import unittest
+from test.support import os_helper
 from test.support.script_helper import (spawn_python, kill_python, assert_python_ok,
 make_script, make_zip_script)
 
@@ -77,7 +78,7 @@ def tearDown(self):
 
 def test_inspect_getsource_issue4223(self):
 test_src = "def foo(): pass\n"
- with test.support.temp_dir() as d:
+ with os_helper.temp_dir() as d:
 init_name = make_script(d, '__init__', test_src)
 name_in_zip = os.path.join('zip_pkg',
 os.path.basename(init_name))
@@ -117,7 +118,7 @@ def test_doctest_issue4197(self):
 mod_name = mod_name.replace("sample_", "sample_zipped_")
 sample_sources[mod_name] = src
 
- with test.support.temp_dir() as d:
+ with os_helper.temp_dir() as d:
 script_name = make_script(d, 'test_zipped_doctest',
 test_src)
 zip_name, run_name = make_zip_script(d, 'test_zip',
@@ -192,7 +193,7 @@ class Test:
 doctest.testmod()
 """)
 pattern = 'File "%s", line 2, in %s'
- with test.support.temp_dir() as d:
+ with os_helper.temp_dir() as d:
 script_name = make_script(d, 'script', test_src)
 rc, out, err = assert_python_ok(script_name)
 expected = pattern % (script_name, "__main__.Test")
@@ -219,7 +220,7 @@ def f():
 import pdb
 pdb.Pdb(nosigint=True).runcall(f)
 """)
- with test.support.temp_dir() as d:
+ with os_helper.temp_dir() as d:
 script_name = make_script(d, 'script', test_src)
 p = spawn_python(script_name)
 p.stdin.write(b'l\n')

---

• Previous message (by thread): [Python-checkins] Update FAQ release schedule and estimated users (GH-21180)
• Next message (by thread): [Python-checkins] bpo-40275: Use new test.support helper submodules in tests (GH-21169)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

More information about the Python-checkins mailing list