Update streaming test and docstrings.

Author: daspecster

speech/google/cloud/speech/_gax.py

@@ -182,7 +182,7 @@ def streaming_recognize(self, sample, language_code=None,
                        .cloud_speech_pb2.StreamingRecognizeResponse`
         :returns: ``StreamingRecognizeResponse`` instances.
         """
-        if sample.stream is None or sample.stream.closed:
+        if sample.stream.closed:
             raise ValueError('Stream is closed.')
 
         requests = _stream_requests(sample, language_code=language_code,

speech/google/cloud/speech/client.py

@@ -71,7 +71,7 @@ def sample(self, content=None, source_uri=None, stream=None, encoding=None,
         """Factory: construct Sample to use when making recognize requests.
 
         :type content: bytes
-        :param content: (Optional) Bytes object containing audio data.
+        :param content: (Optional) Bytes containing audio data.
 
         :type source_uri: str
         :param source_uri: (Optional) URI that points to a file that contains

speech/google/cloud/speech/sample.py

@@ -23,7 +23,7 @@ class Sample(object):
     """Representation of an audio sample to be used with Google Speech API.
 
     :type content: bytes
-    :param content: (Optional) Bytes object containing audio data.
+    :param content: (Optional) Bytes containing audio data.
 
     :type source_uri: str
     :param source_uri: (Optional) URI that points to a file that contains
@@ -59,12 +59,10 @@ def __init__(self, content=None, source_uri=None, stream=None,
                  encoding=None, sample_rate=None, client=None):
         self._client = client
 
-        no_source = content is None and source_uri is None and stream is None
-        both_source = (content is not None
-                       and source_uri is not None
-                       and stream is not None)
-        if no_source or both_source:
-            raise ValueError('Supply one of '
+        sources = [content is not None, source_uri is not None,
+                   stream is not None]
+        if sources.count(True) != 1:
+            raise ValueError('Supply exactly one of '
                              '\'content\',  \'source_uri\', \'stream\'')
 
         self._content = content
@@ -124,8 +122,6 @@ def stream(self):
         :rtype: file
         :returns: File like object to stream.
         """
-        if getattr(self._stream, 'read', None) is None:
-            return None
         return self._stream
 
     @property

speech/unit_tests/test_client.py

@@ -459,8 +459,9 @@ def speech_api(channel=None):
         speech_api.SERVICE_ADDRESS = host
 
         stream.close()
+        self.assertTrue(stream.closed)
 
-        sample = client.sample(content=stream,
+        sample = client.sample(stream=stream,
                                encoding=Encoding.LINEAR16,
                                sample_rate=self.SAMPLE_RATE)