fix import errors

Author: vchudnov-g

gapic/templates/%namespace/%name_%version/%sub/__init__.py.j2

@@ -10,76 +10,77 @@ __version__ = package_version.__version__
 
 import google.api_core as api_core
 
-try:
-  api_core.check_python_version("{{package_path}}")
-  api_core.check_dependency_versions("{{package_path}}")
-except AttributeError:
+if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"):
+    api_core.check_python_version("{{package_path}}")
+    api_core.check_dependency_versions("{{package_path}}")
+else:
 {# TODO: Remove this try-catch when we require api-core at a version that
    supports the changes in https://github.com/googleapis/python-api-core/pull/832
 
     In the meantime, please ensure the functionality here mirrors the
-    equivalent functionality in api_core, in those two functions above.  
+    equivalent functionality in api_core, in those two functions above.
 #}
-  # An older version of api_core is installed, which does not define the
-  # functions above. We do equivalent checks manually.
-
-  import logging
-  import sys
-
-  _py_version_str = sys.version.split()[0]
-  _package_label = "{{package_path}}"
-  if sys.version_info < (3, 9):
-    logging.warning("You are using a non-supported Python version " +
-            f"({_py_version_str}).  Google will not post any further " +
-            f"updates to {_package_label} supporting this Python version. " +
-            "Please upgrade to the latest Python version, or at " +
-            f"least to Python 3.9, and then update {_package_label}.")
-  if sys.version_info[:2] == (3, 9):
-    logging.warning(f"You are using a Python version ({_py_version_str}) " +
-            f"which Google will stop supporting in {_package_label} when " +
-            "it reaches its end of life (October 2025). Please " +
-            "upgrade to the latest Python version, or at " +
-            "least Python 3.10, before then, and " +
-            f"then update {_package_label}.")
-
-  from packaging.version import parse as parse_version
-
-  if sys.version_info < (3, 8):
-    import pkg_resources
-    def _get_version(dependency_name):
-      try:
-        version_string = pkg_resources.get_distribution(dependency_name).version
-        return parse_version(version_string)
-      except pkg_resources.DistributionNotFound:
-        return None
-  else:
-    from importlib import metadata
-  
-    def _get_version(dependency_name):
-      try:
-        version_string = metadata.version("requests")
-        parsed_version = parse_version(version_string)
-        return parsed_version.release
-      except metadata.PackageNotFoundError:
-        return None
-  
-  _dependency_package = "google.protobuf"
-  _next_supported_version = "4.25.8"
-  _next_supported_version_tuple = (4, 25, 8)
-  _version_used = _get_version(_dependency_package)
-  if _version_used and _version_used < _next_supported_version_tuple:
-    logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
-            f"{_dependency_package}, currently installed at version " +
-            f"{_version_used.__str__}. Future updates to " +
-            f"{_package_label} will require {_dependency_package} at " +
-            f"version {_next_supported_version} or higher. Please ensure " +
-            "that either (a) your Python environment doesn't pin the " +
-            f"version of {_dependency_package}, so that updates to " +
-            f"{_package_label} can require the higher version, or " +
-            "(b) you manually update your Python environment to use at " +
-            f"least version {_next_supported_version} of " +
-            f"{_dependency_package}.")
-  
+    # An older version of api_core is installed, which does not define the
+    # functions above. We do equivalent checks manually.
+
+    import logging
+    import sys
+
+    _py_version_str = sys.version.split()[0]
+    _package_label = "{{package_path}}"
+    if sys.version_info < (3, 9):
+        logging.warning("You are using a non-supported Python version " +
+                f"({_py_version_str}).  Google will not post any further " +
+                f"updates to {_package_label} supporting this Python version. " +
+                "Please upgrade to the latest Python version, or at " +
+                f"least to Python 3.9, and then update {_package_label}.")
+    if sys.version_info[:2] == (3, 9):
+        logging.warning(f"You are using a Python version ({_py_version_str}) " +
+                f"which Google will stop supporting in {_package_label} when " +
+                "it reaches its end of life (October 2025). Please " +
+                "upgrade to the latest Python version, or at " +
+                "least Python 3.10, before then, and " +
+                f"then update {_package_label}.")
+
+    from packaging.version import parse as parse_version
+
+    if sys.version_info < (3, 8):
+        import pkg_resources
+
+        def _get_version(dependency_name):
+          try:
+            version_string = pkg_resources.get_distribution(dependency_name).version
+            return parse_version(version_string)
+          except pkg_resources.DistributionNotFound:
+            return None
+    else:
+        from importlib import metadata
+
+        def _get_version(dependency_name):
+            try:
+                version_string = metadata.version("requests")
+                parsed_version = parse_version(version_string)
+                return parsed_version.release
+            except metadata.PackageNotFoundError:
+                return None
+
+    _dependency_package = "google.protobuf"
+    _next_supported_version = "4.25.8"
+    _next_supported_version_tuple = (4, 25, 8)
+    _version_used = _get_version(_dependency_package)
+    if _version_used and _version_used < _next_supported_version_tuple:
+        logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
+                  f"{_dependency_package}, currently installed at version " +
+                  f"{_version_used.__str__}. Future updates to " +
+                  f"{_package_label} will require {_dependency_package} at " +
+                  f"version {_next_supported_version} or higher. Please ensure " +
+                  "that either (a) your Python environment doesn't pin the " +
+                  f"version of {_dependency_package}, so that updates to " +
+                  f"{_package_label} can require the higher version, or " +
+                  "(b) you manually update your Python environment to use at " +
+                  f"least version {_next_supported_version} of " +
+                  f"{_dependency_package}.")
+
 {#  Import subpackages. -#}
 {% for subpackage, _ in api.subpackages|dictsort %}
 from . import {{ subpackage }}

tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py

@@ -20,69 +20,70 @@
 
 import google.api_core as api_core
 
-try:
-  api_core.check_python_version("google.cloud.asset_v1")
-  api_core.check_dependency_versions("google.cloud.asset_v1")
-except AttributeError:
-  # An older version of api_core is installed, which does not define the
-  # functions above. We do equivalent checks manually.
+if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"):
+    api_core.check_python_version("google.cloud.asset_v1")
+    api_core.check_dependency_versions("google.cloud.asset_v1")
+else:
+    # An older version of api_core is installed, which does not define the
+    # functions above. We do equivalent checks manually.
 
-  import logging
-  import sys
+    import logging
+    import sys
 
-  _py_version_str = sys.version.split()[0]
-  _package_label = "google.cloud.asset_v1"
-  if sys.version_info < (3, 9):
-    logging.warning("You are using a non-supported Python version " +
-            f"({_py_version_str}).  Google will not post any further " +
-            f"updates to {_package_label} supporting this Python version. " +
-            "Please upgrade to the latest Python version, or at " +
-            f"least to Python 3.9, and then update {_package_label}.")
-  if sys.version_info[:2] == (3, 9):
-    logging.warning(f"You are using a Python version ({_py_version_str}) " +
-            f"which Google will stop supporting in {_package_label} when " +
-            "it reaches its end of life (October 2025). Please " +
-            "upgrade to the latest Python version, or at " +
-            "least Python 3.10, before then, and " +
-            f"then update {_package_label}.")
+    _py_version_str = sys.version.split()[0]
+    _package_label = "google.cloud.asset_v1"
+    if sys.version_info < (3, 9):
+        logging.warning("You are using a non-supported Python version " +
+                f"({_py_version_str}).  Google will not post any further " +
+                f"updates to {_package_label} supporting this Python version. " +
+                "Please upgrade to the latest Python version, or at " +
+                f"least to Python 3.9, and then update {_package_label}.")
+    if sys.version_info[:2] == (3, 9):
+        logging.warning(f"You are using a Python version ({_py_version_str}) " +
+                f"which Google will stop supporting in {_package_label} when " +
+                "it reaches its end of life (October 2025). Please " +
+                "upgrade to the latest Python version, or at " +
+                "least Python 3.10, before then, and " +
+                f"then update {_package_label}.")
 
-  from packaging.version import parse as parse_version
+    from packaging.version import parse as parse_version
 
-  if sys.version_info < (3, 8):
-    import pkg_resources
-    def _get_version(dependency_name):
-      try:
-        version_string = pkg_resources.get_distribution(dependency_name).version
-        return parse_version(version_string)
-      except pkg_resources.DistributionNotFound:
-        return None
-  else:
-    from importlib import metadata
+    if sys.version_info < (3, 8):
+        import pkg_resources
 
-    def _get_version(dependency_name):
-      try:
-        version_string = metadata.version("requests")
-        parsed_version = parse_version(version_string)
-        return parsed_version.release
-      except metadata.PackageNotFoundError:
-        return None
+        def _get_version(dependency_name):
+          try:
+            version_string = pkg_resources.get_distribution(dependency_name).version
+            return parse_version(version_string)
+          except pkg_resources.DistributionNotFound:
+            return None
+    else:
+        from importlib import metadata
 
-  _dependency_package = "google.protobuf"
-  _next_supported_version = "4.25.8"
-  _next_supported_version_tuple = (4, 25, 8)
-  _version_used = _get_version(_dependency_package)
-  if _version_used and _version_used < _next_supported_version_tuple:
-    logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
-            f"{_dependency_package}, currently installed at version " +
-            f"{_version_used.__str__}. Future updates to " +
-            f"{_package_label} will require {_dependency_package} at " +
-            f"version {_next_supported_version} or higher. Please ensure " +
-            "that either (a) your Python environment doesn't pin the " +
-            f"version of {_dependency_package}, so that updates to " +
-            f"{_package_label} can require the higher version, or " +
-            "(b) you manually update your Python environment to use at " +
-            f"least version {_next_supported_version} of " +
-            f"{_dependency_package}.")
+        def _get_version(dependency_name):
+            try:
+                version_string = metadata.version("requests")
+                parsed_version = parse_version(version_string)
+                return parsed_version.release
+            except metadata.PackageNotFoundError:
+                return None
+
+    _dependency_package = "google.protobuf"
+    _next_supported_version = "4.25.8"
+    _next_supported_version_tuple = (4, 25, 8)
+    _version_used = _get_version(_dependency_package)
+    if _version_used and _version_used < _next_supported_version_tuple:
+        logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
+                  f"{_dependency_package}, currently installed at version " +
+                  f"{_version_used.__str__}. Future updates to " +
+                  f"{_package_label} will require {_dependency_package} at " +
+                  f"version {_next_supported_version} or higher. Please ensure " +
+                  "that either (a) your Python environment doesn't pin the " +
+                  f"version of {_dependency_package}, so that updates to " +
+                  f"{_package_label} can require the higher version, or " +
+                  "(b) you manually update your Python environment to use at " +
+                  f"least version {_next_supported_version} of " +
+                  f"{_dependency_package}.")
 
 
 from .services.asset_service import AssetServiceClient

tests/integration/goldens/credentials/google/iam/credentials_v1/__init__.py

@@ -20,69 +20,70 @@
 
 import google.api_core as api_core
 
-try:
-  api_core.check_python_version("google.iam.credentials_v1")
-  api_core.check_dependency_versions("google.iam.credentials_v1")
-except AttributeError:
-  # An older version of api_core is installed, which does not define the
-  # functions above. We do equivalent checks manually.
+if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"):
+    api_core.check_python_version("google.iam.credentials_v1")
+    api_core.check_dependency_versions("google.iam.credentials_v1")
+else:
+    # An older version of api_core is installed, which does not define the
+    # functions above. We do equivalent checks manually.
 
-  import logging
-  import sys
+    import logging
+    import sys
 
-  _py_version_str = sys.version.split()[0]
-  _package_label = "google.iam.credentials_v1"
-  if sys.version_info < (3, 9):
-    logging.warning("You are using a non-supported Python version " +
-            f"({_py_version_str}).  Google will not post any further " +
-            f"updates to {_package_label} supporting this Python version. " +
-            "Please upgrade to the latest Python version, or at " +
-            f"least to Python 3.9, and then update {_package_label}.")
-  if sys.version_info[:2] == (3, 9):
-    logging.warning(f"You are using a Python version ({_py_version_str}) " +
-            f"which Google will stop supporting in {_package_label} when " +
-            "it reaches its end of life (October 2025). Please " +
-            "upgrade to the latest Python version, or at " +
-            "least Python 3.10, before then, and " +
-            f"then update {_package_label}.")
+    _py_version_str = sys.version.split()[0]
+    _package_label = "google.iam.credentials_v1"
+    if sys.version_info < (3, 9):
+        logging.warning("You are using a non-supported Python version " +
+                f"({_py_version_str}).  Google will not post any further " +
+                f"updates to {_package_label} supporting this Python version. " +
+                "Please upgrade to the latest Python version, or at " +
+                f"least to Python 3.9, and then update {_package_label}.")
+    if sys.version_info[:2] == (3, 9):
+        logging.warning(f"You are using a Python version ({_py_version_str}) " +
+                f"which Google will stop supporting in {_package_label} when " +
+                "it reaches its end of life (October 2025). Please " +
+                "upgrade to the latest Python version, or at " +
+                "least Python 3.10, before then, and " +
+                f"then update {_package_label}.")
 
-  from packaging.version import parse as parse_version
+    from packaging.version import parse as parse_version
 
-  if sys.version_info < (3, 8):
-    import pkg_resources
-    def _get_version(dependency_name):
-      try:
-        version_string = pkg_resources.get_distribution(dependency_name).version
-        return parse_version(version_string)
-      except pkg_resources.DistributionNotFound:
-        return None
-  else:
-    from importlib import metadata
+    if sys.version_info < (3, 8):
+        import pkg_resources
 
-    def _get_version(dependency_name):
-      try:
-        version_string = metadata.version("requests")
-        parsed_version = parse_version(version_string)
-        return parsed_version.release
-      except metadata.PackageNotFoundError:
-        return None
+        def _get_version(dependency_name):
+          try:
+            version_string = pkg_resources.get_distribution(dependency_name).version
+            return parse_version(version_string)
+          except pkg_resources.DistributionNotFound:
+            return None
+    else:
+        from importlib import metadata
 
-  _dependency_package = "google.protobuf"
-  _next_supported_version = "4.25.8"
-  _next_supported_version_tuple = (4, 25, 8)
-  _version_used = _get_version(_dependency_package)
-  if _version_used and _version_used < _next_supported_version_tuple:
-    logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
-            f"{_dependency_package}, currently installed at version " +
-            f"{_version_used.__str__}. Future updates to " +
-            f"{_package_label} will require {_dependency_package} at " +
-            f"version {_next_supported_version} or higher. Please ensure " +
-            "that either (a) your Python environment doesn't pin the " +
-            f"version of {_dependency_package}, so that updates to " +
-            f"{_package_label} can require the higher version, or " +
-            "(b) you manually update your Python environment to use at " +
-            f"least version {_next_supported_version} of " +
-            f"{_dependency_package}.")
+        def _get_version(dependency_name):
+            try:
+                version_string = metadata.version("requests")
+                parsed_version = parse_version(version_string)
+                return parsed_version.release
+            except metadata.PackageNotFoundError:
+                return None
+
+    _dependency_package = "google.protobuf"
+    _next_supported_version = "4.25.8"
+    _next_supported_version_tuple = (4, 25, 8)
+    _version_used = _get_version(_dependency_package)
+    if _version_used and _version_used < _next_supported_version_tuple:
+        logging.warning(f"DEPRECATION: Package {_package_label} depends on " +
+                  f"{_dependency_package}, currently installed at version " +
+                  f"{_version_used.__str__}. Future updates to " +
+                  f"{_package_label} will require {_dependency_package} at " +
+                  f"version {_next_supported_version} or higher. Please ensure " +
+                  "that either (a) your Python environment doesn't pin the " +
+                  f"version of {_dependency_package}, so that updates to " +
+                  f"{_package_label} can require the higher version, or " +
+                  "(b) you manually update your Python environment to use at " +
+                  f"least version {_next_supported_version} of " +
+                  f"{_dependency_package}.")
 
 
 from .services.iam_credentials import IAMCredentialsClient