From fa1b27823668140c6f50a933be2a33d02e5621b1 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Mon, 11 Oct 2021 14:58:32 -0700 Subject: [PATCH 1/2] avoid grpc import when disabled --- google/cloud/logging_v2/client.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/google/cloud/logging_v2/client.py b/google/cloud/logging_v2/client.py index 8b92e8e8c..d9cbd7a07 100644 --- a/google/cloud/logging_v2/client.py +++ b/google/cloud/logging_v2/client.py @@ -18,13 +18,6 @@ import os import sys -try: - from google.cloud.logging_v2 import _gapic -except ImportError: # pragma: NO COVER - _HAVE_GRPC = False - _gapic = None -else: - _HAVE_GRPC = True import google.api_core.client_options from google.cloud.client import ClientWithProject @@ -48,6 +41,18 @@ _DISABLE_GRPC = os.getenv(DISABLE_GRPC, False) +_HAVE_GRPC = False + +try: + if not _DISABLE_GRPC: + # only import if DISABLE_GRPC is not set + from google.cloud.logging_v2 import _gapic + _HAVE_GRPC = True +except ImportError: # pragma: NO COVER + # could not import gapic library. Fall back to HTTP mode + _HAVE_GRPC = False + _gapic = None + _USE_GRPC = _HAVE_GRPC and not _DISABLE_GRPC _GAE_RESOURCE_TYPE = "gae_app" From 4d6d1e0a61bf8273ec4739e7d8408c2abd704ab8 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 11 Oct 2021 22:06:22 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- google/cloud/logging_v2/client.py | 1 + 1 file changed, 1 insertion(+) diff --git a/google/cloud/logging_v2/client.py b/google/cloud/logging_v2/client.py index d9cbd7a07..2663b2839 100644 --- a/google/cloud/logging_v2/client.py +++ b/google/cloud/logging_v2/client.py @@ -47,6 +47,7 @@ if not _DISABLE_GRPC: # only import if DISABLE_GRPC is not set from google.cloud.logging_v2 import _gapic + _HAVE_GRPC = True except ImportError: # pragma: NO COVER # could not import gapic library. Fall back to HTTP mode