Update imports, remove commented code.

Author: daspecster

speech/google/cloud/speech/_gax.py

@@ -15,23 +15,22 @@
 """GAX/GAPIC module for managing Speech API requests."""
 
 
-from google.cloud._helpers import make_secure_stub
-from google.cloud.connection import DEFAULT_USER_AGENT
-
-from google.cloud.speech.alternative import Alternative
-from google.cloud.speech.operation import Operation
-
 from google.cloud.gapic.speech.v1beta1.speech_api import SpeechApi
-from google.cloud.grpc.speech.v1beta1.cloud_speech_pb2 import SpeechContext
-from google.cloud.grpc.speech.v1beta1.cloud_speech_pb2 import RecognitionConfig
 from google.cloud.grpc.speech.v1beta1.cloud_speech_pb2 import RecognitionAudio
+from google.cloud.grpc.speech.v1beta1.cloud_speech_pb2 import RecognitionConfig
+from google.cloud.grpc.speech.v1beta1.cloud_speech_pb2 import SpeechContext
 from google.cloud.grpc.speech.v1beta1.cloud_speech_pb2 import (
     StreamingRecognitionConfig)
 from google.cloud.grpc.speech.v1beta1.cloud_speech_pb2 import (
     StreamingRecognizeRequest)
-
 from google.longrunning import operations_grpc
 
+from google.cloud._helpers import make_secure_stub
+from google.cloud.connection import DEFAULT_USER_AGENT
+
+from google.cloud.speech.alternative import Alternative
+from google.cloud.speech.operation import Operation
+
 OPERATIONS_API_HOST = 'speech.googleapis.com'
 
 

speech/google/cloud/speech/client.py

@@ -17,16 +17,16 @@
 from base64 import b64encode
 import os
 
-from google.cloud._helpers import _to_bytes
 from google.cloud._helpers import _bytes_to_unicode
+from google.cloud._helpers import _to_bytes
 from google.cloud.client import Client as BaseClient
 from google.cloud.environment_vars import DISABLE_GRPC
 
+from google.cloud.speech.alternative import Alternative
 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

speech/unit_tests/test_client.py

@@ -89,15 +89,15 @@ def test_create_sample_from_client(self):
 
     def test_sync_recognize_content_with_optional_params_no_gax(self):
         from base64 import b64encode
-        from google.cloud._helpers import _to_bytes
-        from google.cloud._helpers import _bytes_to_unicode
 
+        from google.cloud._helpers import _bytes_to_unicode
+        from google.cloud._helpers import _to_bytes
         from google.cloud._testing import _Monkey
-        from google.cloud.speech import client as MUT
+
         from google.cloud import speech
+        from google.cloud.speech import client as MUT
         from google.cloud.speech.alternative import Alternative
         from google.cloud.speech.sample import Sample
-
         from unit_tests._fixtures import SYNC_RECOGNIZE_RESPONSE
 
         _AUDIO_CONTENT = _to_bytes(self.AUDIO_CONTENT)
@@ -151,8 +151,9 @@ def test_sync_recognize_content_with_optional_params_no_gax(self):
 
     def test_sync_recognize_source_uri_without_optional_params_no_gax(self):
         from google.cloud._testing import _Monkey
-        from google.cloud.speech import client as MUT
+
         from google.cloud import speech
+        from google.cloud.speech import client as MUT
         from google.cloud.speech.alternative import Alternative
         from google.cloud.speech.sample import Sample
         from unit_tests._fixtures import SYNC_RECOGNIZE_RESPONSE
@@ -194,8 +195,9 @@ def test_sync_recognize_source_uri_without_optional_params_no_gax(self):
 
     def test_sync_recognize_with_empty_results_no_gax(self):
         from google.cloud._testing import _Monkey
-        from google.cloud.speech import client as MUT
+
         from google.cloud import speech
+        from google.cloud.speech import client as MUT
         from google.cloud.speech.sample import Sample
         from unit_tests._fixtures import SYNC_RECOGNIZE_EMPTY_RESPONSE
 
@@ -212,8 +214,9 @@ def test_sync_recognize_with_empty_results_no_gax(self):
 
     def test_sync_recognize_with_empty_results_gax(self):
         from google.cloud._testing import _Monkey
-        from google.cloud.speech import _gax as MUT
+
         from google.cloud import speech
+        from google.cloud.speech import _gax as MUT
         from google.cloud.speech.sample import Sample
 
         credentials = _Credentials()
@@ -231,9 +234,10 @@ def test_sync_recognize_with_empty_results_gax(self):
                 client.sync_recognize(sample)
 
     def test_sync_recognize_with_gax(self):
+        from google.cloud._testing import _Monkey
+
         from google.cloud import speech
         from google.cloud.speech import _gax as MUT
-        from google.cloud._testing import _Monkey
 
         creds = _Credentials()
         client = self._makeOne(credentials=creds, use_gax=True)
@@ -268,10 +272,10 @@ def test_async_supported_encodings(self):
             client.async_recognize(sample)
 
     def test_async_recognize_no_gax(self):
-        from unit_tests._fixtures import ASYNC_RECOGNIZE_RESPONSE
         from google.cloud import speech
         from google.cloud.speech.operation import Operation
         from google.cloud.speech.sample import Sample
+        from unit_tests._fixtures import ASYNC_RECOGNIZE_RESPONSE
 
         RETURNED = ASYNC_RECOGNIZE_RESPONSE
 
@@ -291,9 +295,10 @@ def test_async_recognize_no_gax(self):
         self.assertIsNone(operation.metadata)
 
     def test_async_recognize_with_gax(self):
-        from google.cloud.speech import _gax as MUT
         from google.cloud._testing import _Monkey
+
         from google.cloud import speech
+        from google.cloud.speech import _gax as MUT
         from google.cloud.speech.operation import Operation
 
         credentials = _Credentials()
@@ -312,8 +317,9 @@ def test_async_recognize_with_gax(self):
         self.assertIsNone(operation.response)
 
     def test_speech_api_with_gax(self):
-        from google.cloud.speech import _gax as MUT
         from google.cloud._testing import _Monkey
+
+        from google.cloud.speech import _gax as MUT
         from google.cloud.speech.client import GAPICSpeechAPI
 
         creds = _Credentials()
@@ -342,24 +348,6 @@ def test_speech_api_preset(self):
         self.assertIs(client.speech_api, fake_api)
 
 
-# class _MockGAPICAlternative(object):
-#     transcript = 'testing 1 2 3'
-#     confidence = 0.95234356
-#
-#
-# class _MockGAPICSyncResult(object):
-#     alternatives = [_MockGAPICAlternative()]
-#
-#
-# class _MockGAPICSpeechResponse(object):
-#     error = None
-#     endpointer_type = None
-#     name = None
-#     metadata = _MockGAPICMetadata()
-#     results = []
-#     result_index = 0
-
-
 class _MockGAPICSpeechAPI(object):
     _requests = None
     _response = None