From d1137b4f4002f09584f191ecb27ea934073dcee5 Mon Sep 17 00:00:00 2001 From: Reuben Frankel Date: Fri, 31 Oct 2025 04:36:34 +0000 Subject: [PATCH 1/4] Use error log over `print` to avoid stdout write --- google/api_core/_python_version_support.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/google/api_core/_python_version_support.py b/google/api_core/_python_version_support.py index 9fb92af6..085c06bd 100644 --- a/google/api_core/_python_version_support.py +++ b/google/api_core/_python_version_support.py @@ -16,12 +16,16 @@ import datetime import enum +import logging import warnings import sys import textwrap from typing import Any, List, NamedTuple, Optional, Dict, Tuple +_LOGGER = logging.getLogger(__name__) + + class PythonVersionStatus(enum.Enum): """Support status of a Python version in this client library artifact release. @@ -171,7 +175,7 @@ def _get_pypi_package_name(module_name): else: return None # Module not found in the mapping except Exception as e: - print(f"An error occurred: {e}") + _LOGGER.error("An error occurred: %s", e) return None From ecc869cee5ffa925652a2d5b92c12d3fd5d7b740 Mon Sep 17 00:00:00 2001 From: Reuben Frankel Date: Fri, 31 Oct 2025 04:40:46 +0000 Subject: [PATCH 2/4] Move common return to end of function --- google/api_core/_python_version_support.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/google/api_core/_python_version_support.py b/google/api_core/_python_version_support.py index 085c06bd..2d07b6ca 100644 --- a/google/api_core/_python_version_support.py +++ b/google/api_core/_python_version_support.py @@ -172,11 +172,10 @@ def _get_pypi_package_name(module_name): if module_name in module_to_distributions: # pragma: NO COVER # The value is a list of distribution names, take the first one return module_to_distributions[module_name][0] - else: - return None # Module not found in the mapping except Exception as e: _LOGGER.error("An error occurred: %s", e) - return None + + return None def _get_distribution_and_import_packages(import_package: str) -> Tuple[str, Any]: From b3db26130ad36d17e50c459b76c066117b4efda8 Mon Sep 17 00:00:00 2001 From: Reuben <60552974+ReubenFrankel@users.noreply.github.com> Date: Tue, 4 Nov 2025 11:55:55 +0000 Subject: [PATCH 3/4] Update google/api_core/_python_version_support.py Co-authored-by: Chalmer Lowe --- google/api_core/_python_version_support.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google/api_core/_python_version_support.py b/google/api_core/_python_version_support.py index 2d07b6ca..3643cb1e 100644 --- a/google/api_core/_python_version_support.py +++ b/google/api_core/_python_version_support.py @@ -173,7 +173,7 @@ def _get_pypi_package_name(module_name): # The value is a list of distribution names, take the first one return module_to_distributions[module_name][0] except Exception as e: - _LOGGER.error("An error occurred: %s", e) + _LOGGER.info(f"An error occurred while determining PyPI package name for {module_name}: {e}") return None From 1314e81ca627d6112b51a027e313942e6424fc71 Mon Sep 17 00:00:00 2001 From: Reuben Frankel Date: Tue, 4 Nov 2025 12:09:48 +0000 Subject: [PATCH 4/4] Fix lint error --- google/api_core/_python_version_support.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/google/api_core/_python_version_support.py b/google/api_core/_python_version_support.py index 3643cb1e..2c56364b 100644 --- a/google/api_core/_python_version_support.py +++ b/google/api_core/_python_version_support.py @@ -173,7 +173,11 @@ def _get_pypi_package_name(module_name): # The value is a list of distribution names, take the first one return module_to_distributions[module_name][0] except Exception as e: - _LOGGER.info(f"An error occurred while determining PyPI package name for {module_name}: {e}") + _LOGGER.info( + "An error occurred while determining PyPI package name for %s: %s", + module_name, + e, + ) return None