[webkit-changes] [WebKit/WebKit] 93f874: Fix removed-in-Python-3.12 deprecations

Sam Sneddon noreply at github.com
Thu Aug 31 06:44:54 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 93f8745ec911a80187109e33a70172e08fdd6583
      https://github.com/WebKit/WebKit/commit/93f8745ec911a80187109e33a70172e08fdd6583
  Author: Sam Sneddon <gsnedders at apple.com>
  Date:   2023-08-31 (Thu, 31 Aug 2023)

  Changed paths:
    M Source/WebKit/Scripts/webkit/parser_unittest.py
    M Tools/Scripts/webkitpy/benchmark_runner/benchmark_results_unittest.py
    M Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py
    M Tools/Scripts/webkitpy/benchmark_runner/utils.py
    M Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py
    M Tools/Scripts/webkitpy/common/prettypatch_unittest.py
    M Tools/Scripts/webkitpy/common/watchlist/watchlistparser_unittest.py
    R Tools/Scripts/webkitpy/common/webkitunittest.py
    M Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server_unittest.py
    M Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py
    M Tools/Scripts/webkitpy/tool/commands/applywatchlistlocal_unittest.py
    M Tools/Scripts/webkitpy/tool/commands/commandtest.py
    M Tools/Scripts/webkitpy/w3c/test_converter_unittest.py

  Log Message:
  -----------
  Fix removed-in-Python-3.12 deprecations
https://bugs.webkit.org/show_bug.cgi?id=260878

Reviewed by Michael Catanzaro.

This largely just deals with the long-deprecated unittest deprecations:

 * assertRegexpMatches -> assertRegex
 * assertNotRegexpMatches -> assertNotRegex
 * assertRaisesRegexp -> assertRaisesRegex
 * assertEquals -> assertEqual

Additionally, this gets rid of usage of distutils (gone in Python
3.12) and imp (also gone in Python 3.12).

* Source/WebKit/Scripts/webkit/parser_unittest.py:
(UnsupportedPrecompilerDirectiveTest.assertRaisesRegex):
(UnsupportedPrecompilerDirectiveTest.test_error_at_else):
(UnsupportedPrecompilerDirectiveTest.test_error_at_elif):
* Tools/Scripts/webkitpy/benchmark_runner/benchmark_results_unittest.py:
(BenchmarkResultsTest.assertRaisesRegex):
(BenchmarkResultsTest.test_init):
* Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py:
* Tools/Scripts/webkitpy/benchmark_runner/utils.py:
(load_source):
(load_subclasses):
* Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
(SCMTest.assertRegex):
(SCMTest):
(SCMTest.assertNotRegex):
(SCMTest._shared_test_diff_for_revision):
(test_commit_logs):
(GitTest.test_create_patch):
(GitTest.test_create_patch_with_git_index):
(GitTest.test_rename_files):
(GitSVNTest.test_delete_branch):
(GitSVNTest.test_remote_merge_base):
(GitSVNTest.test_commit_with_message_working_copy_only):
(GitSVNTest.test_commit_with_message):
(GitSVNTest.test_commit_with_message_git_commit):
(GitSVNTest.test_commit_with_message_git_commit_range):
(GitSVNTest.test_commit_with_message_only_local_commit):
(GitSVNTest.test_commit_with_message_multiple_local_commits_and_working_copy):
(GitSVNTest.test_commit_with_message_multiple_local_commits_always_squash):
(GitSVNTest.test_commit_with_message_multiple_local_commits):
(GitSVNTest.test_commit_with_message_not_synced):
(GitSVNTest.test_create_patch_local_plus_working_copy):
(GitSVNTest.test_create_patch):
(GitSVNTest.test_create_patch_after_merge):
(GitSVNTest.test_create_patch_with_changed_files):
(GitSVNTest.test_create_patch_git_commit):
(GitSVNTest.test_create_patch_git_commit_range):
(GitSVNTest.test_create_patch_working_copy_only):
(GitSVNTest.test_create_patch_multiple_local_commits):
(GitSVNTest.test_create_patch_not_synced):
(GitSVNTest.test_create_binary_patch):
* Tools/Scripts/webkitpy/common/prettypatch_unittest.py:
(PrettyPatchTest.check_ruby):
* Tools/Scripts/webkitpy/common/watchlist/watchlistparser_unittest.py:
(WatchListParserTest):
(WatchListParserTest.setUp):
* Tools/Scripts/webkitpy/common/webkitunittest.py: Removed.
* Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server_unittest.py:
* Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py:
(XvfbDriverTest.assertRaisesRegex):
(XvfbDriverTest.test_xvfb_not_replying):
* Tools/Scripts/webkitpy/tool/commands/applywatchlistlocal_unittest.py:
(ApplyWatchListLocalTest.assertRaisesRegex):
(test_args_parsing_with_two_bugs):
* Tools/Scripts/webkitpy/tool/commands/commandtest.py:
(CommandsTest):
* Tools/Scripts/webkitpy/w3c/test_converter_unittest.py:
(verify_test_harness_paths):

Canonical link: https://commits.webkit.org/267496@main




More information about the webkit-changes mailing list