Merge pull request googleapis#2665 from dhermes/speech-no-more-condl-import

dhermes · web-flow · commit 9e163ef9eeb2 · 2016-11-02T10:59:06.000-07:00
Removing ImportError check in Speech client.
diff --git a/speech/google/cloud/speech/client.py b/speech/google/cloud/speech/client.py
@@ -22,23 +22,15 @@
 from google.cloud.client import Client as BaseClient
 from google.cloud.environment_vars import DISABLE_GRPC
 
+from google.cloud.speech._gax import GAPICSpeechAPI
 from google.cloud.speech.connection import Connection
 from google.cloud.speech.encoding import Encoding
 from google.cloud.speech.operation import Operation
 from google.cloud.speech.sample import Sample
 from google.cloud.speech.alternative import Alternative
 
-try:
-    from google.cloud.speech._gax import GAPICSpeechAPI
-except ImportError:  # pragma: NO COVER
-    _HAVE_GAX = False
-    GAPICSpeechAPI = None
-else:
-    _HAVE_GAX = True
 
-
-_DISABLE_GAX = os.getenv(DISABLE_GRPC, False)
-_USE_GAX = _HAVE_GAX and not _DISABLE_GAX
+_USE_GAX = not os.getenv(DISABLE_GRPC, False)
 
 
 class Client(BaseClient):
