|
 |
cd4c38 |
From 01d7101b39dd9049ae3cb9c30195b42ed9c76579 Mon Sep 17 00:00:00 2001
|
|
|
cd4c38 |
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
|
|
|
cd4c38 |
Date: Tue, 20 Jun 2023 11:36:40 -0400
|
|
|
cd4c38 |
Subject: [PATCH 1/2] Do not use importlib find_module API
|
|
|
cd4c38 |
|
|
|
cd4c38 |
This API was removed in Python 3.12
|
|
|
cd4c38 |
(https://github.com/python/cpython/issues/98040).
|
|
|
cd4c38 |
|
|
|
cd4c38 |
Fixes Python 3.12 support in grpcio tests.
|
|
|
cd4c38 |
---
|
|
|
cd4c38 |
src/python/grpcio_tests/tests/_loader.py | 4 +++-
|
|
|
cd4c38 |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
cd4c38 |
|
|
|
cd4c38 |
diff --git a/src/python/grpcio_tests/tests/_loader.py b/src/python/grpcio_tests/tests/_loader.py
|
|
|
cd4c38 |
index 80c107aa8e..c497a9aabd 100644
|
|
|
cd4c38 |
--- a/src/python/grpcio_tests/tests/_loader.py
|
|
|
cd4c38 |
+++ b/src/python/grpcio_tests/tests/_loader.py
|
|
|
cd4c38 |
@@ -71,7 +71,9 @@ class Loader(object):
|
|
|
cd4c38 |
"""
|
|
|
cd4c38 |
for importer, module_name, is_package in (
|
|
|
cd4c38 |
pkgutil.walk_packages(package_paths)):
|
|
|
cd4c38 |
- module = importer.find_module(module_name).load_module(module_name)
|
|
|
cd4c38 |
+ spec = importer.find_spec(module_name)
|
|
|
cd4c38 |
+ module = importlib.util.module_from_spec(spec)
|
|
|
cd4c38 |
+ spec.loader.exec_module(module)
|
|
|
cd4c38 |
self.visit_module(module)
|
|
|
cd4c38 |
|
|
|
cd4c38 |
def visit_module(self, module):
|
|
|
cd4c38 |
--
|
|
|
cd4c38 |
2.40.1
|
|
|
cd4c38 |
|
|
|
cd4c38 |
|
|
|
cd4c38 |
From a7191f6781674340740896d5a284ab856e596b2e Mon Sep 17 00:00:00 2001
|
|
|
cd4c38 |
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
|
|
|
cd4c38 |
Date: Tue, 20 Jun 2023 12:38:23 -0400
|
|
|
cd4c38 |
Subject: [PATCH 2/2] More importlib find_module migration
|
|
|
cd4c38 |
|
|
|
cd4c38 |
Do not use importlib find_module API in bazel/_gevent_test_main.py
|
|
|
cd4c38 |
|
|
|
cd4c38 |
This API was removed in Python 3.12
|
|
|
cd4c38 |
(https://github.com/python/cpython/issues/98040).
|
|
|
cd4c38 |
---
|
|
|
cd4c38 |
bazel/_gevent_test_main.py | 5 ++++-
|
|
|
cd4c38 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
cd4c38 |
|
|
|
cd4c38 |
diff --git a/bazel/_gevent_test_main.py b/bazel/_gevent_test_main.py
|
|
|
cd4c38 |
index f7936daaf0..bec31a911b 100644
|
|
|
cd4c38 |
--- a/bazel/_gevent_test_main.py
|
|
|
cd4c38 |
+++ b/bazel/_gevent_test_main.py
|
|
|
cd4c38 |
@@ -42,6 +42,7 @@ import unittest
|
|
|
cd4c38 |
import sys
|
|
|
cd4c38 |
import os
|
|
|
cd4c38 |
import pkgutil
|
|
|
cd4c38 |
+import importlib
|
|
|
cd4c38 |
|
|
|
cd4c38 |
def trace_callback(event, args):
|
|
|
cd4c38 |
if event in ("switch", "throw"):
|
|
|
cd4c38 |
@@ -73,7 +74,9 @@ class SingleLoader(object):
|
|
|
cd4c38 |
tests = []
|
|
|
cd4c38 |
for importer, module_name, is_package in pkgutil.walk_packages([os.path.dirname(os.path.relpath(__file__))]):
|
|
|
cd4c38 |
if pattern in module_name:
|
|
|
cd4c38 |
- module = importer.find_module(module_name).load_module(module_name)
|
|
|
cd4c38 |
+ spec = importer.find_spec(module_name)
|
|
|
cd4c38 |
+ module = importlib.util.module_from_spec(spec)
|
|
|
cd4c38 |
+ spec.loader.exec_module(module)
|
|
|
cd4c38 |
tests.append(loader.loadTestsFromModule(module))
|
|
|
cd4c38 |
if len(tests) != 1:
|
|
|
cd4c38 |
raise AssertionError("Expected only 1 test module. Found {}".format(tests))
|
|
|
cd4c38 |
--
|
|
|
cd4c38 |
2.40.1
|
|
|
cd4c38 |
|