From 9c48ace907bf60f581352ed66e570ba8dbce849e Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Tue, 23 May 2017 07:09:39 -0700
Subject: [PATCH 001/211] Fix a couple of video intelligence issues. (#3447)

---
 .../google/cloud/videointelligence_v1beta1/__init__.py          | 2 +-
 .../google/cloud/videointelligence_v1beta1/types.py             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/videointelligence/google/cloud/videointelligence_v1beta1/__init__.py b/videointelligence/google/cloud/videointelligence_v1beta1/__init__.py
index 60b42da4de3fe..9e732b5800bd4 100644
--- a/videointelligence/google/cloud/videointelligence_v1beta1/__init__.py
+++ b/videointelligence/google/cloud/videointelligence_v1beta1/__init__.py
@@ -17,7 +17,7 @@
 from google.cloud.gapic.videointelligence.v1beta1.video_intelligence_service_client import VideoIntelligenceServiceClient
 from google.cloud.gapic.videointelligence.v1beta1 import enums
 
-from google.cloud.gapic.videointelligence_v1beta1 import types
+from google.cloud.videointelligence_v1beta1 import types
 
 
 
diff --git a/videointelligence/google/cloud/videointelligence_v1beta1/types.py b/videointelligence/google/cloud/videointelligence_v1beta1/types.py
index 482b4adad57d6..9ac3b8a6b2a5b 100644
--- a/videointelligence/google/cloud/videointelligence_v1beta1/types.py
+++ b/videointelligence/google/cloud/videointelligence_v1beta1/types.py
@@ -20,7 +20,7 @@
 
 
 names = []
-for name, message in get_messages(video_intelligence_pb2):
+for name, message in get_messages(video_intelligence_pb2).items():
     setattr(sys.modules[__name__], name, message)
     names.append(name)
 

From c82cd6bb7a42f61893ff29e0570249124a8aca61 Mon Sep 17 00:00:00 2001
From: florencep <florenceperot@google.com>
Date: Thu, 25 May 2017 13:00:59 -0700
Subject: [PATCH 002/211] corrected package name (#3452)

---
 videointelligence/README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/videointelligence/README.rst b/videointelligence/README.rst
index 1790007d95b4a..d3741cd88fc1f 100644
--- a/videointelligence/README.rst
+++ b/videointelligence/README.rst
@@ -16,7 +16,7 @@ Quick Start
 
 .. code-block:: console
 
-    $ pip install --upgrade google-cloud-video-intelligence
+    $ pip install --upgrade google-cloud-videointelligence
 
 Authentication
 --------------

From 5e86158b79b6dc3706ec552c5e7a5d6f19b18963 Mon Sep 17 00:00:00 2001
From: Ricardo Lui Geh <ricardo.geh@gmail.com>
Date: Tue, 30 May 2017 16:22:48 -0300
Subject: [PATCH 003/211] Show how to create credentials object (#3454)

---
 docs/google-cloud-auth.rst | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/google-cloud-auth.rst b/docs/google-cloud-auth.rst
index e7f9c67802833..ac3c4b29528ae 100644
--- a/docs/google-cloud-auth.rst
+++ b/docs/google-cloud-auth.rst
@@ -87,14 +87,19 @@ However, you may want to be explicit because
   from different projects
 
 In these situations, you can create an explicit
-:class:`~google.auth.credentials.Credentials` object suited to your
-environment. After creation, you can pass it directly to a
-:class:`Client <google.cloud.client.Client>`:
+:class:`~google.auth.credentials.Credentials` object suited to your environment.
+After creation, you can pass it directly to a :class:`Client <google.cloud.client.Client>`:
 
 .. code:: python
 
     client = Client(credentials=credentials)
 
+.. tip::
+    To create a credentials object, follow the `google-auth-guide`_.
+
+.. _google-auth-guide: https://google-auth.readthedocs.io/en/latest/user-guide.html#service-account-private-key-files
+
+
 Google App Engine Environment
 -----------------------------
 

From 7e73e786126981ee30896d6484c02c4fae65da38 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Wed, 31 May 2017 13:54:09 -0400
Subject: [PATCH 004/211] Add 'Query.num_dml_affected_rows' property. (#3460)

Read-only, set from servier-provided 'numDmlAffectedRows' field.

Closes #2920.
---
 bigquery/google/cloud/bigquery/query.py | 14 ++++++++++++
 bigquery/tests/unit/test_query.py       | 30 +++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/bigquery/google/cloud/bigquery/query.py b/bigquery/google/cloud/bigquery/query.py
index 6b764f3c664d5..ee24d8397b736 100644
--- a/bigquery/google/cloud/bigquery/query.py
+++ b/bigquery/google/cloud/bigquery/query.py
@@ -226,6 +226,20 @@ def total_bytes_processed(self):
         if total_bytes_processed is not None:
             return int(total_bytes_processed)
 
+    @property
+    def num_dml_affected_rows(self):
+        """Total number of rows affected by a DML query.
+
+        See:
+        https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#numDmlAffectedRows
+
+        :rtype: int, or ``NoneType``
+        :returns: Count generated on the server (None until set by the server).
+        """
+        num_dml_affected_rows = self._properties.get('numDmlAffectedRows')
+        if num_dml_affected_rows is not None:
+            return int(num_dml_affected_rows)
+
     @property
     def rows(self):
         """Query results.
diff --git a/bigquery/tests/unit/test_query.py b/bigquery/tests/unit/test_query.py
index a15833af347d5..c2b3ce5496e18 100644
--- a/bigquery/tests/unit/test_query.py
+++ b/bigquery/tests/unit/test_query.py
@@ -70,6 +70,7 @@ def _makeResource(self, complete=False):
             ]
             resource['pageToken'] = self.TOKEN
             resource['totalBytesProcessed'] = 100000
+            resource['numDmlAffectedRows'] = 123
             resource['cacheHit'] = False
 
         return resource
@@ -124,10 +125,12 @@ def _verifyResourceProperties(self, query, resource):
         self.assertEqual(query.complete, resource.get('jobComplete'))
         self.assertEqual(query.errors, resource.get('errors'))
         self.assertEqual(query.page_token, resource.get('pageToken'))
+
         if 'totalRows' in resource:
             self.assertEqual(query.total_rows, int(resource['totalRows']))
         else:
             self.assertIsNone(query.total_rows)
+
         if 'totalBytesProcessed' in resource:
             self.assertEqual(query.total_bytes_processed,
                              int(resource['totalBytesProcessed']))
@@ -139,6 +142,12 @@ def _verifyResourceProperties(self, query, resource):
         else:
             self.assertIsNone(query.name)
 
+        if 'numDmlAffectedRows' in resource:
+            self.assertEqual(query.num_dml_affected_rows,
+                             int(resource['numDmlAffectedRows']))
+        else:
+            self.assertIsNone(query.num_dml_affected_rows)
+
         self._verify_udf_resources(query, resource)
         self._verifyQueryParameters(query, resource)
         self._verifySchema(query, resource)
@@ -371,6 +380,27 @@ def test_total_bytes_processed_present_string(self):
         query._set_properties(resource)
         self.assertEqual(query.total_bytes_processed, TOTAL_BYTES_PROCESSED)
 
+    def test_num_dml_affected_rows_missing(self):
+        client = _Client(self.PROJECT)
+        query = self._make_one(self.QUERY, client)
+        self.assertIsNone(query.num_dml_affected_rows)
+
+    def test_num_dml_affected_rows_present_integer(self):
+        DML_AFFECTED_ROWS = 123456
+        client = _Client(self.PROJECT)
+        query = self._make_one(self.QUERY, client)
+        resource = {'numDmlAffectedRows': DML_AFFECTED_ROWS}
+        query._set_properties(resource)
+        self.assertEqual(query.num_dml_affected_rows, DML_AFFECTED_ROWS)
+
+    def test_num_dml_affected_rows_present_string(self):
+        DML_AFFECTED_ROWS = 123456
+        client = _Client(self.PROJECT)
+        query = self._make_one(self.QUERY, client)
+        resource = {'numDmlAffectedRows': str(DML_AFFECTED_ROWS)}
+        query._set_properties(resource)
+        self.assertEqual(query.num_dml_affected_rows, DML_AFFECTED_ROWS)
+
     def test_schema(self):
         client = _Client(self.PROJECT)
         query = self._make_one(self.QUERY, client)

From a0f079f83e7ceefd9e14071172d4801e5dc4e043 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Wed, 31 May 2017 13:07:22 -0700
Subject: [PATCH 005/211] Re-organize the documentation structure in
 preparation to split docs among subpackages (#3459)

---
 .../client.rst}                               |   4 +-
 .../dataset.rst}                              |   0
 docs/{bigquery-job.rst => bigquery/job.rst}   |   0
 .../query.rst}                                |   0
 .../schema.rst}                               |   0
 .../snippets.py}                              |   0
 .../table.rst}                                |   0
 .../usage.rst}                                |  57 ++--
 .../client-intro.rst}                         |   4 +-
 .../client.rst}                               |   0
 .../cluster.rst}                              |   0
 .../column-family.rst}                        |   0
 .../data-api.rst}                             |   2 +-
 .../instance-api.rst}                         |   2 +-
 .../instance.rst}                             |   0
 .../row-data.rst}                             |   0
 .../row-filters.rst}                          |   0
 docs/{bigtable-row.rst => bigtable/row.rst}   |   0
 .../table-api.rst}                            |   4 +-
 .../table.rst}                                |   0
 .../usage.rst}                                |  23 +-
 docs/{google-cloud-auth.rst => core/auth.rst} |   0
 .../config.rst}                               |   2 +-
 docs/core/index.rst                           |  10 +
 docs/{ => core}/iterators.rst                 |   0
 .../modules.rst}                              |   0
 docs/{ => core}/operation-api.rst             |   0
 docs/datastore-usage.rst                      |   6 -
 .../batches.rst}                              |   0
 .../client.rst}                               |   0
 .../entities.rst}                             |   0
 .../helpers.rst}                              |   0
 .../keys.rst}                                 |   0
 .../queries.rst}                              |   0
 .../transactions.rst}                         |   0
 docs/datastore/usage.rst                      |  21 ++
 docs/{dns-changes.rst => dns/changes.rst}     |   0
 docs/{dns-client.rst => dns/client.rst}       |   0
 .../resource-record-set.rst}                  |   0
 docs/{dns-usage.rst => dns/usage.rst}         |  15 +-
 docs/{dns-zone.rst => dns/zone.rst}           |   0
 .../client.rst}                               |   0
 .../usage.rst}                                |  12 +-
 .../util.rst}                                 |   0
 docs/index.rst                                | 269 ++----------------
 .../client.rst}                               |   0
 .../document.rst}                             |   0
 .../responses.rst}                            |   0
 .../usage.rst}                                |  14 +-
 .../client.rst}                               |   0
 .../entries.rst}                              |   0
 .../handlers-app-engine.rst}                  |   0
 .../handlers-container-engine.rst}            |   0
 .../handlers.rst}                             |   0
 .../logger.rst}                               |   0
 .../metric.rst}                               |   0
 docs/{logging-sink.rst => logging/sink.rst}   |   0
 .../snippets.py}                              |   0
 .../stdlib-usage.rst}                         |   0
 .../transports-base.rst}                      |   0
 .../transports-sync.rst}                      |   0
 .../transports-thread.rst}                    |   0
 docs/{logging-usage.rst => logging/usage.rst} | 126 ++++----
 .../client.rst}                               |   0
 .../group.rst}                                |   0
 .../label.rst}                                |   0
 .../metric.rst}                               |   0
 .../query.rst}                                |   0
 .../resource.rst}                             |   0
 .../timeseries.rst}                           |   0
 .../usage.rst}                                |  17 +-
 docs/{pubsub-client.rst => pubsub/client.rst} |   0
 docs/{pubsub-iam.rst => pubsub/iam.rst}       |   0
 .../message.rst}                              |   0
 .../snippets.py}                              |   0
 .../subscription.rst}                         |   0
 docs/{pubsub-topic.rst => pubsub/topic.rst}   |   0
 docs/{pubsub-usage.rst => pubsub/usage.rst}   |  71 +++--
 .../api.rst}                                  |  11 +-
 .../client.rst}                               |   0
 .../project.rst}                              |   0
 docs/runtimeconfig-usage.rst                  |   6 -
 .../client.rst}                               |   0
 .../config.rst}                               |   0
 docs/runtimeconfig/usage.rst                  |  17 ++
 .../variable.rst}                             |   0
 .../batch-api.rst}                            |   0
 .../batch-usage.rst}                          |   2 +-
 .../client-api.rst}                           |   0
 .../client-usage.rst}                         |   4 +-
 .../database-api.rst}                         |   0
 .../database-usage.rst}                       |   2 +-
 .../instance-api.rst}                         |   0
 .../instance-usage.rst}                       |   2 +-
 .../keyset-api.rst}                           |   0
 .../session-api.rst}                          |   0
 .../session-crud-usage.rst}                   |   2 +-
 .../session-implicit-txn-usage.rst}           |   2 +-
 .../session-pool-usage.rst}                   |   0
 .../snapshot-api.rst}                         |   0
 .../snapshot-usage.rst}                       |   2 +-
 .../streamed-api.rst}                         |   0
 .../transaction-api.rst}                      |   0
 .../transaction-usage.rst}                    |   0
 docs/{spanner-usage.rst => spanner/usage.rst} |  30 +-
 .../alternative.rst}                          |   0
 docs/{speech-client.rst => speech/client.rst} |   0
 .../encoding.rst}                             |   0
 .../operation.rst}                            |   0
 docs/{speech-result.rst => speech/result.rst} |   0
 docs/{speech-sample.rst => speech/sample.rst} |   0
 docs/{speech-usage.rst => speech/usage.rst}   |  17 +-
 docs/storage-client.rst                       |   6 -
 docs/{storage-acl.rst => storage/acl.rst}     |   0
 docs/{storage-batch.rst => storage/batch.rst} |   0
 docs/{storage-blobs.rst => storage/blobs.rst} |   0
 .../buckets.rst}                              |   0
 docs/storage/client.rst                       |  16 ++
 .../snippets.py}                              |   0
 .../client.rst}                               |   0
 .../usage.rst}                                |  10 +-
 .../annotations.rst}                          |   0
 docs/{vision-batch.rst => vision/batch.rst}   |   0
 docs/{vision-client.rst => vision/client.rst} |   0
 docs/{vision-color.rst => vision/color.rst}   |   0
 .../crop-hint.rst}                            |   0
 docs/{vision-entity.rst => vision/entity.rst} |   0
 docs/{vision-face.rst => vision/face.rst}     |   0
 .../feature.rst}                              |   0
 docs/{vision-image.rst => vision/image.rst}   |   0
 .../safe-search.rst}                          |   0
 docs/{vision-text.rst => vision/text.rst}     |   0
 docs/{vision-usage.rst => vision/usage.rst}   |  26 +-
 docs/{vision-web.rst => vision/web.rst}       |   0
 pubsub/google/cloud/pubsub/client.py          |   8 +-
 pubsub/google/cloud/pubsub/subscription.py    |  22 +-
 pubsub/google/cloud/pubsub/topic.py           |  26 +-
 storage/google/cloud/storage/__init__.py      |   2 +-
 storage/google/cloud/storage/acl.py           |  10 +-
 storage/google/cloud/storage/blob.py          |   4 +-
 storage/google/cloud/storage/bucket.py        |  12 +-
 storage/google/cloud/storage/client.py        |   8 +-
 142 files changed, 449 insertions(+), 457 deletions(-)
 rename docs/{bigquery-client.rst => bigquery/client.rst} (71%)
 rename docs/{bigquery-dataset.rst => bigquery/dataset.rst} (100%)
 rename docs/{bigquery-job.rst => bigquery/job.rst} (100%)
 rename docs/{bigquery-query.rst => bigquery/query.rst} (100%)
 rename docs/{bigquery-schema.rst => bigquery/schema.rst} (100%)
 rename docs/{bigquery_snippets.py => bigquery/snippets.py} (100%)
 rename docs/{bigquery-table.rst => bigquery/table.rst} (100%)
 rename docs/{bigquery-usage.rst => bigquery/usage.rst} (93%)
 rename docs/{bigtable-client-intro.rst => bigtable/client-intro.rst} (96%)
 rename docs/{bigtable-client.rst => bigtable/client.rst} (100%)
 rename docs/{bigtable-cluster.rst => bigtable/cluster.rst} (100%)
 rename docs/{bigtable-column-family.rst => bigtable/column-family.rst} (100%)
 rename docs/{bigtable-data-api.rst => bigtable/data-api.rst} (99%)
 rename docs/{bigtable-instance-api.rst => bigtable/instance-api.rst} (98%)
 rename docs/{bigtable-instance.rst => bigtable/instance.rst} (100%)
 rename docs/{bigtable-row-data.rst => bigtable/row-data.rst} (100%)
 rename docs/{bigtable-row-filters.rst => bigtable/row-filters.rst} (100%)
 rename docs/{bigtable-row.rst => bigtable/row.rst} (100%)
 rename docs/{bigtable-table-api.rst => bigtable/table-api.rst} (98%)
 rename docs/{bigtable-table.rst => bigtable/table.rst} (100%)
 rename docs/{bigtable-usage.rst => bigtable/usage.rst} (82%)
 rename docs/{google-cloud-auth.rst => core/auth.rst} (100%)
 rename docs/{google-cloud-config.rst => core/config.rst} (96%)
 create mode 100644 docs/core/index.rst
 rename docs/{ => core}/iterators.rst (100%)
 rename docs/{google-cloud-api.rst => core/modules.rst} (100%)
 rename docs/{ => core}/operation-api.rst (100%)
 delete mode 100644 docs/datastore-usage.rst
 rename docs/{datastore-batches.rst => datastore/batches.rst} (100%)
 rename docs/{datastore-client.rst => datastore/client.rst} (100%)
 rename docs/{datastore-entities.rst => datastore/entities.rst} (100%)
 rename docs/{datastore-helpers.rst => datastore/helpers.rst} (100%)
 rename docs/{datastore-keys.rst => datastore/keys.rst} (100%)
 rename docs/{datastore-queries.rst => datastore/queries.rst} (100%)
 rename docs/{datastore-transactions.rst => datastore/transactions.rst} (100%)
 create mode 100644 docs/datastore/usage.rst
 rename docs/{dns-changes.rst => dns/changes.rst} (100%)
 rename docs/{dns-client.rst => dns/client.rst} (100%)
 rename docs/{dns-resource-record-set.rst => dns/resource-record-set.rst} (100%)
 rename docs/{dns-usage.rst => dns/usage.rst} (97%)
 rename docs/{dns-zone.rst => dns/zone.rst} (100%)
 rename docs/{error-reporting-client.rst => error-reporting/client.rst} (100%)
 rename docs/{error-reporting-usage.rst => error-reporting/usage.rst} (96%)
 rename docs/{error-reporting-util.rst => error-reporting/util.rst} (100%)
 rename docs/{language-client.rst => language/client.rst} (100%)
 rename docs/{language-document.rst => language/document.rst} (100%)
 rename docs/{language-responses.rst => language/responses.rst} (100%)
 rename docs/{language-usage.rst => language/usage.rst} (98%)
 rename docs/{logging-client.rst => logging/client.rst} (100%)
 rename docs/{logging-entries.rst => logging/entries.rst} (100%)
 rename docs/{logging-handlers-app-engine.rst => logging/handlers-app-engine.rst} (100%)
 rename docs/{logging-handlers-container-engine.rst => logging/handlers-container-engine.rst} (100%)
 rename docs/{logging-handlers.rst => logging/handlers.rst} (100%)
 rename docs/{logging-logger.rst => logging/logger.rst} (100%)
 rename docs/{logging-metric.rst => logging/metric.rst} (100%)
 rename docs/{logging-sink.rst => logging/sink.rst} (100%)
 rename docs/{logging_snippets.py => logging/snippets.py} (100%)
 rename docs/{logging-stdlib-usage.rst => logging/stdlib-usage.rst} (100%)
 rename docs/{logging-transports-base.rst => logging/transports-base.rst} (100%)
 rename docs/{logging-transports-sync.rst => logging/transports-sync.rst} (100%)
 rename docs/{logging-transports-thread.rst => logging/transports-thread.rst} (100%)
 rename docs/{logging-usage.rst => logging/usage.rst} (87%)
 rename docs/{monitoring-client.rst => monitoring/client.rst} (100%)
 rename docs/{monitoring-group.rst => monitoring/group.rst} (100%)
 rename docs/{monitoring-label.rst => monitoring/label.rst} (100%)
 rename docs/{monitoring-metric.rst => monitoring/metric.rst} (100%)
 rename docs/{monitoring-query.rst => monitoring/query.rst} (100%)
 rename docs/{monitoring-resource.rst => monitoring/resource.rst} (100%)
 rename docs/{monitoring-timeseries.rst => monitoring/timeseries.rst} (100%)
 rename docs/{monitoring-usage.rst => monitoring/usage.rst} (98%)
 rename docs/{pubsub-client.rst => pubsub/client.rst} (100%)
 rename docs/{pubsub-iam.rst => pubsub/iam.rst} (100%)
 rename docs/{pubsub-message.rst => pubsub/message.rst} (100%)
 rename docs/{pubsub_snippets.py => pubsub/snippets.py} (100%)
 rename docs/{pubsub-subscription.rst => pubsub/subscription.rst} (100%)
 rename docs/{pubsub-topic.rst => pubsub/topic.rst} (100%)
 rename docs/{pubsub-usage.rst => pubsub/usage.rst} (84%)
 rename docs/{resource-manager-api.rst => resource-manager/api.rst} (97%)
 rename docs/{resource-manager-client.rst => resource-manager/client.rst} (100%)
 rename docs/{resource-manager-project.rst => resource-manager/project.rst} (100%)
 delete mode 100644 docs/runtimeconfig-usage.rst
 rename docs/{runtimeconfig-client.rst => runtimeconfig/client.rst} (100%)
 rename docs/{runtimeconfig-config.rst => runtimeconfig/config.rst} (100%)
 create mode 100644 docs/runtimeconfig/usage.rst
 rename docs/{runtimeconfig-variable.rst => runtimeconfig/variable.rst} (100%)
 rename docs/{spanner-batch-api.rst => spanner/batch-api.rst} (100%)
 rename docs/{spanner-batch-usage.rst => spanner/batch-usage.rst} (99%)
 rename docs/{spanner-client-api.rst => spanner/client-api.rst} (100%)
 rename docs/{spanner-client-usage.rst => spanner/client-usage.rst} (96%)
 rename docs/{spanner-database-api.rst => spanner/database-api.rst} (100%)
 rename docs/{spanner-database-usage.rst => spanner/database-usage.rst} (98%)
 rename docs/{spanner-instance-api.rst => spanner/instance-api.rst} (100%)
 rename docs/{spanner-instance-usage.rst => spanner/instance-usage.rst} (98%)
 rename docs/{spanner-keyset-api.rst => spanner/keyset-api.rst} (100%)
 rename docs/{spanner-session-api.rst => spanner/session-api.rst} (100%)
 rename docs/{spanner-session-crud-usage.rst => spanner/session-crud-usage.rst} (96%)
 rename docs/{spanner-session-implicit-txn-usage.rst => spanner/session-implicit-txn-usage.rst} (96%)
 rename docs/{spanner-session-pool-usage.rst => spanner/session-pool-usage.rst} (100%)
 rename docs/{spanner-snapshot-api.rst => spanner/snapshot-api.rst} (100%)
 rename docs/{spanner-snapshot-usage.rst => spanner/snapshot-usage.rst} (97%)
 rename docs/{spanner-streamed-api.rst => spanner/streamed-api.rst} (100%)
 rename docs/{spanner-transaction-api.rst => spanner/transaction-api.rst} (100%)
 rename docs/{spanner-transaction-usage.rst => spanner/transaction-usage.rst} (100%)
 rename docs/{spanner-usage.rst => spanner/usage.rst} (60%)
 rename docs/{speech-alternative.rst => speech/alternative.rst} (100%)
 rename docs/{speech-client.rst => speech/client.rst} (100%)
 rename docs/{speech-encoding.rst => speech/encoding.rst} (100%)
 rename docs/{speech-operation.rst => speech/operation.rst} (100%)
 rename docs/{speech-result.rst => speech/result.rst} (100%)
 rename docs/{speech-sample.rst => speech/sample.rst} (100%)
 rename docs/{speech-usage.rst => speech/usage.rst} (98%)
 delete mode 100644 docs/storage-client.rst
 rename docs/{storage-acl.rst => storage/acl.rst} (100%)
 rename docs/{storage-batch.rst => storage/batch.rst} (100%)
 rename docs/{storage-blobs.rst => storage/blobs.rst} (100%)
 rename docs/{storage-buckets.rst => storage/buckets.rst} (100%)
 create mode 100644 docs/storage/client.rst
 rename docs/{storage_snippets.py => storage/snippets.py} (100%)
 rename docs/{translate-client.rst => translate/client.rst} (100%)
 rename docs/{translate-usage.rst => translate/usage.rst} (97%)
 rename docs/{vision-annotations.rst => vision/annotations.rst} (100%)
 rename docs/{vision-batch.rst => vision/batch.rst} (100%)
 rename docs/{vision-client.rst => vision/client.rst} (100%)
 rename docs/{vision-color.rst => vision/color.rst} (100%)
 rename docs/{vision-crop-hint.rst => vision/crop-hint.rst} (100%)
 rename docs/{vision-entity.rst => vision/entity.rst} (100%)
 rename docs/{vision-face.rst => vision/face.rst} (100%)
 rename docs/{vision-feature.rst => vision/feature.rst} (100%)
 rename docs/{vision-image.rst => vision/image.rst} (100%)
 rename docs/{vision-safe-search.rst => vision/safe-search.rst} (100%)
 rename docs/{vision-text.rst => vision/text.rst} (100%)
 rename docs/{vision-usage.rst => vision/usage.rst} (98%)
 rename docs/{vision-web.rst => vision/web.rst} (100%)

diff --git a/docs/bigquery-client.rst b/docs/bigquery/client.rst
similarity index 71%
rename from docs/bigquery-client.rst
rename to docs/bigquery/client.rst
index 2c7b2c8d21ffd..42d4ed8e082a1 100644
--- a/docs/bigquery-client.rst
+++ b/docs/bigquery/client.rst
@@ -1,5 +1,5 @@
-BigQuery Client
-===============
+Client
+======
 
 .. automodule:: google.cloud.bigquery.client
   :members:
diff --git a/docs/bigquery-dataset.rst b/docs/bigquery/dataset.rst
similarity index 100%
rename from docs/bigquery-dataset.rst
rename to docs/bigquery/dataset.rst
diff --git a/docs/bigquery-job.rst b/docs/bigquery/job.rst
similarity index 100%
rename from docs/bigquery-job.rst
rename to docs/bigquery/job.rst
diff --git a/docs/bigquery-query.rst b/docs/bigquery/query.rst
similarity index 100%
rename from docs/bigquery-query.rst
rename to docs/bigquery/query.rst
diff --git a/docs/bigquery-schema.rst b/docs/bigquery/schema.rst
similarity index 100%
rename from docs/bigquery-schema.rst
rename to docs/bigquery/schema.rst
diff --git a/docs/bigquery_snippets.py b/docs/bigquery/snippets.py
similarity index 100%
rename from docs/bigquery_snippets.py
rename to docs/bigquery/snippets.py
diff --git a/docs/bigquery-table.rst b/docs/bigquery/table.rst
similarity index 100%
rename from docs/bigquery-table.rst
rename to docs/bigquery/table.rst
diff --git a/docs/bigquery-usage.rst b/docs/bigquery/usage.rst
similarity index 93%
rename from docs/bigquery-usage.rst
rename to docs/bigquery/usage.rst
index 27fadafbe14ae..aaa63e91b679c 100644
--- a/docs/bigquery-usage.rst
+++ b/docs/bigquery/usage.rst
@@ -1,5 +1,16 @@
-Using the API
-=============
+BigQuery
+========
+
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  client
+  dataset
+  job
+  query
+  schema
+  table
 
 Authentication / Configuration
 ------------------------------
@@ -71,31 +82,31 @@ Dataset operations
 
 List datasets for the client's project:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START client_list_datasets]
    :end-before: [END client_list_datasets]
 
 Create a new dataset for the client's project:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START dataset_create]
    :end-before: [END dataset_create]
 
 Check for the existence of a dataset:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START dataset_exists]
    :end-before: [END dataset_exists]
 
 Refresh metadata for a dataset (to pick up changes made by another client):
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START dataset_reload]
    :end-before: [END dataset_reload]
 
 Patch metadata for a dataset:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START dataset_patch]
    :end-before: [END dataset_patch]
 
@@ -114,7 +125,7 @@ Replace the ACL for a dataset, and update all writeable fields:
 
 Delete a dataset:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START dataset_delete]
    :end-before: [END dataset_delete]
 
@@ -124,61 +135,61 @@ Tables
 
 Tables exist within datasets.  List tables for the dataset:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START dataset_list_tables]
    :end-before: [END dataset_list_tables]
 
 Create a table:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START table_create]
    :end-before: [END table_create]
 
 Check for the existence of a table:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START table_exists]
    :end-before: [END table_exists]
 
 Refresh metadata for a table (to pick up changes made by another client):
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START table_reload]
    :end-before: [END table_reload]
 
 Patch specific properties for a table:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START table_patch]
    :end-before: [END table_patch]
 
 Update all writable metadata for a table
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START table_update]
    :end-before: [END table_update]
 
 Get rows from a table's data:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START table_fetch_data]
    :end-before: [END table_fetch_data]
 
 Insert rows into a table's data:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START table_insert_data]
    :end-before: [END table_insert_data]
 
 Upload table data from a file:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START table_upload_from_file]
    :end-before: [END table_upload_from_file]
 
 Delete a table:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START table_delete]
    :end-before: [END table_delete]
 
@@ -195,7 +206,7 @@ Jobs describe actions peformed on data in BigQuery tables:
 
 List jobs for a project:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START client_list_jobs]
    :end-before: [END client_list_jobs]
 
@@ -205,13 +216,13 @@ Querying data (synchronous)
 
 Run a query which can be expected to complete within bounded time:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START client_run_sync_query]
    :end-before: [END client_run_sync_query]
 
 Run a query using a named query parameter:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START client_run_sync_query_w_param]
    :end-before: [END client_run_sync_query_w_param]
 
@@ -219,7 +230,7 @@ If the rows returned by the query do not fit into the initial response,
 then we need to fetch the remaining rows via
 :meth:`~google.cloud.bigquery.query.QueryResults.fetch_data`:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START client_run_sync_query_paged]
    :end-before: [END client_run_sync_query_paged]
 
@@ -227,7 +238,7 @@ If the query takes longer than the timeout allowed, ``query.complete``
 will be ``False``.  In that case, we need to poll the associated job until
 it is done, and then fetch the results:
 
-.. literalinclude:: bigquery_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START client_run_sync_query_timeout]
    :end-before: [END client_run_sync_query_timeout]
 
diff --git a/docs/bigtable-client-intro.rst b/docs/bigtable/client-intro.rst
similarity index 96%
rename from docs/bigtable-client-intro.rst
rename to docs/bigtable/client-intro.rst
index d53fd3246136e..cb31767f3c26e 100644
--- a/docs/bigtable-client-intro.rst
+++ b/docs/bigtable/client-intro.rst
@@ -23,7 +23,7 @@ Configuration
 -------------
 
 - For an overview of authentication in ``google-cloud-python``,
-  see :doc:`google-cloud-auth`.
+  see :doc:`/core/auth`.
 
 - In addition to any authentication configuration, you can also set the
   :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the Google Cloud Console
@@ -84,7 +84,7 @@ After a :class:`Client <google.cloud.bigtable.client.Client>`, the next highest-
 object is an :class:`Instance <google.cloud.bigtable.instance.Instance>`. You'll need
 one before you can interact with tables or data.
 
-Head next to learn about the :doc:`bigtable-instance-api`.
+Head next to learn about the :doc:`instance-api`.
 
 .. _Instance Admin: https://github.com/GoogleCloudPlatform/cloud-bigtable-client/tree/master/bigtable-protos/src/main/proto/google/bigtable/admin/instance/v1
 .. _Table Admin: https://github.com/GoogleCloudPlatform/cloud-bigtable-client/tree/master/bigtable-protos/src/main/proto/google/bigtable/admin/table/v1
diff --git a/docs/bigtable-client.rst b/docs/bigtable/client.rst
similarity index 100%
rename from docs/bigtable-client.rst
rename to docs/bigtable/client.rst
diff --git a/docs/bigtable-cluster.rst b/docs/bigtable/cluster.rst
similarity index 100%
rename from docs/bigtable-cluster.rst
rename to docs/bigtable/cluster.rst
diff --git a/docs/bigtable-column-family.rst b/docs/bigtable/column-family.rst
similarity index 100%
rename from docs/bigtable-column-family.rst
rename to docs/bigtable/column-family.rst
diff --git a/docs/bigtable-data-api.rst b/docs/bigtable/data-api.rst
similarity index 99%
rename from docs/bigtable-data-api.rst
rename to docs/bigtable/data-api.rst
index 028e137aa2dc6..57b179d93b64e 100644
--- a/docs/bigtable-data-api.rst
+++ b/docs/bigtable/data-api.rst
@@ -7,7 +7,7 @@ column families, you are ready to store and retrieve data.
 Cells vs. Columns vs. Column Families
 +++++++++++++++++++++++++++++++++++++
 
-* As explained in the :doc:`table overview <bigtable-table-api>`, tables can
+* As explained in the :doc:`table overview <table-api>`, tables can
   have many column families.
 * As described below, a table can also have many rows which are
   specified by row keys.
diff --git a/docs/bigtable-instance-api.rst b/docs/bigtable/instance-api.rst
similarity index 98%
rename from docs/bigtable-instance-api.rst
rename to docs/bigtable/instance-api.rst
index da53d6fbf2bad..119ca15c88a5b 100644
--- a/docs/bigtable-instance-api.rst
+++ b/docs/bigtable/instance-api.rst
@@ -123,7 +123,7 @@ Now we go down the hierarchy from
 :class:`Instance <google.cloud.bigtable.instance.Instance>` to a
 :class:`Table <google.cloud.bigtable.table.Table>`.
 
-Head next to learn about the :doc:`bigtable-table-api`.
+Head next to learn about the :doc:`table-api`.
 
 .. _Instance Admin API: https://cloud.google.com/bigtable/docs/creating-instance
 .. _CreateInstance: https://github.com/GoogleCloudPlatform/cloud-bigtable-client/blob/2aae624081f652427052fb652d3ae43d8ac5bf5a/bigtable-protos/src/main/proto/google/bigtable/admin/instance/v1/bigtable_instance_service.proto#L66-L68
diff --git a/docs/bigtable-instance.rst b/docs/bigtable/instance.rst
similarity index 100%
rename from docs/bigtable-instance.rst
rename to docs/bigtable/instance.rst
diff --git a/docs/bigtable-row-data.rst b/docs/bigtable/row-data.rst
similarity index 100%
rename from docs/bigtable-row-data.rst
rename to docs/bigtable/row-data.rst
diff --git a/docs/bigtable-row-filters.rst b/docs/bigtable/row-filters.rst
similarity index 100%
rename from docs/bigtable-row-filters.rst
rename to docs/bigtable/row-filters.rst
diff --git a/docs/bigtable-row.rst b/docs/bigtable/row.rst
similarity index 100%
rename from docs/bigtable-row.rst
rename to docs/bigtable/row.rst
diff --git a/docs/bigtable-table-api.rst b/docs/bigtable/table-api.rst
similarity index 98%
rename from docs/bigtable-table-api.rst
rename to docs/bigtable/table-api.rst
index 61f22257e2bcf..5168aad49ff70 100644
--- a/docs/bigtable-table-api.rst
+++ b/docs/bigtable/table-api.rst
@@ -98,7 +98,7 @@ or similar):
 This rule helps the backend determine when and how to clean up old cells
 in the column family.
 
-See :doc:`bigtable-column-family` for more information about
+See :doc:`column-family` for more information about
 :class:`GarbageCollectionRule <google.cloud.bigtable.column_family.GarbageCollectionRule>`
 and related classes.
 
@@ -141,7 +141,7 @@ Now we go down the final step of the hierarchy from
 :class:`Row <google.cloud.bigtable.row.Row>` as well as streaming
 data directly via a :class:`Table <google.cloud.bigtable.table.Table>`.
 
-Head next to learn about the :doc:`bigtable-data-api`.
+Head next to learn about the :doc:`data-api`.
 
 .. _ListTables: https://github.com/GoogleCloudPlatform/cloud-bigtable-client/blob/2aae624081f652427052fb652d3ae43d8ac5bf5a/bigtable-protos/src/main/proto/google/bigtable/admin/table/v1/bigtable_table_service.proto#L40-L42
 .. _CreateTable: https://github.com/GoogleCloudPlatform/cloud-bigtable-client/blob/2aae624081f652427052fb652d3ae43d8ac5bf5a/bigtable-protos/src/main/proto/google/bigtable/admin/table/v1/bigtable_table_service.proto#L35-L37
diff --git a/docs/bigtable-table.rst b/docs/bigtable/table.rst
similarity index 100%
rename from docs/bigtable-table.rst
rename to docs/bigtable/table.rst
diff --git a/docs/bigtable-usage.rst b/docs/bigtable/usage.rst
similarity index 82%
rename from docs/bigtable-usage.rst
rename to docs/bigtable/usage.rst
index 9d5b931b97ffb..421b2426f8cfa 100644
--- a/docs/bigtable-usage.rst
+++ b/docs/bigtable/usage.rst
@@ -1,5 +1,22 @@
-Using the API
-=============
+Bigtable
+========
+
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  client-intro
+  client
+  cluster
+  instance
+  instance-api
+  table
+  table-api
+  column-family
+  row
+  row-data
+  row-filters
+  data-api
 
 API requests are sent to the `Google Cloud Bigtable`_ API via RPC over HTTP/2.
 In order to support this, we'll rely on `gRPC`_. We are working with the gRPC
@@ -7,7 +24,7 @@ team to rapidly make the install story more user-friendly.
 
 Get started by learning about the
 :class:`Client <google.cloud.bigtable.client.Client>` on the
-:doc:`bigtable-client-intro` page.
+:doc:`client-intro` page.
 
 In the hierarchy of API concepts
 
diff --git a/docs/google-cloud-auth.rst b/docs/core/auth.rst
similarity index 100%
rename from docs/google-cloud-auth.rst
rename to docs/core/auth.rst
diff --git a/docs/google-cloud-config.rst b/docs/core/config.rst
similarity index 96%
rename from docs/google-cloud-config.rst
rename to docs/core/config.rst
index b30822522f76e..7328f685f6066 100644
--- a/docs/google-cloud-config.rst
+++ b/docs/core/config.rst
@@ -43,7 +43,7 @@ Authentication
 ==============
 
 The authentication credentials can be implicitly determined from the
-environment or directly. See :doc:`google-cloud-auth`.
+environment or directly. See :doc:`/core/auth`.
 
 Logging in via ``gcloud beta auth application-default login`` will
 automatically configure a JSON key file with your default project ID and
diff --git a/docs/core/index.rst b/docs/core/index.rst
new file mode 100644
index 0000000000000..58985beec8f17
--- /dev/null
+++ b/docs/core/index.rst
@@ -0,0 +1,10 @@
+Core
+====
+
+.. toctree::
+    config
+    auth
+    iterators
+    operation-api
+    modules
+
diff --git a/docs/iterators.rst b/docs/core/iterators.rst
similarity index 100%
rename from docs/iterators.rst
rename to docs/core/iterators.rst
diff --git a/docs/google-cloud-api.rst b/docs/core/modules.rst
similarity index 100%
rename from docs/google-cloud-api.rst
rename to docs/core/modules.rst
diff --git a/docs/operation-api.rst b/docs/core/operation-api.rst
similarity index 100%
rename from docs/operation-api.rst
rename to docs/core/operation-api.rst
diff --git a/docs/datastore-usage.rst b/docs/datastore-usage.rst
deleted file mode 100644
index 041c5a755c0ed..0000000000000
--- a/docs/datastore-usage.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Using the API
-=============
-
-.. automodule:: google.cloud.datastore
-  :members:
-  :show-inheritance:
diff --git a/docs/datastore-batches.rst b/docs/datastore/batches.rst
similarity index 100%
rename from docs/datastore-batches.rst
rename to docs/datastore/batches.rst
diff --git a/docs/datastore-client.rst b/docs/datastore/client.rst
similarity index 100%
rename from docs/datastore-client.rst
rename to docs/datastore/client.rst
diff --git a/docs/datastore-entities.rst b/docs/datastore/entities.rst
similarity index 100%
rename from docs/datastore-entities.rst
rename to docs/datastore/entities.rst
diff --git a/docs/datastore-helpers.rst b/docs/datastore/helpers.rst
similarity index 100%
rename from docs/datastore-helpers.rst
rename to docs/datastore/helpers.rst
diff --git a/docs/datastore-keys.rst b/docs/datastore/keys.rst
similarity index 100%
rename from docs/datastore-keys.rst
rename to docs/datastore/keys.rst
diff --git a/docs/datastore-queries.rst b/docs/datastore/queries.rst
similarity index 100%
rename from docs/datastore-queries.rst
rename to docs/datastore/queries.rst
diff --git a/docs/datastore-transactions.rst b/docs/datastore/transactions.rst
similarity index 100%
rename from docs/datastore-transactions.rst
rename to docs/datastore/transactions.rst
diff --git a/docs/datastore/usage.rst b/docs/datastore/usage.rst
new file mode 100644
index 0000000000000..6e22780f5a21e
--- /dev/null
+++ b/docs/datastore/usage.rst
@@ -0,0 +1,21 @@
+Datastore
+=========
+
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  client
+  entities
+  keys
+  queries
+  transactions
+  batches
+  helpers
+
+Modules
+-------
+
+.. automodule:: google.cloud.datastore
+  :members:
+  :show-inheritance:
diff --git a/docs/dns-changes.rst b/docs/dns/changes.rst
similarity index 100%
rename from docs/dns-changes.rst
rename to docs/dns/changes.rst
diff --git a/docs/dns-client.rst b/docs/dns/client.rst
similarity index 100%
rename from docs/dns-client.rst
rename to docs/dns/client.rst
diff --git a/docs/dns-resource-record-set.rst b/docs/dns/resource-record-set.rst
similarity index 100%
rename from docs/dns-resource-record-set.rst
rename to docs/dns/resource-record-set.rst
diff --git a/docs/dns-usage.rst b/docs/dns/usage.rst
similarity index 97%
rename from docs/dns-usage.rst
rename to docs/dns/usage.rst
index ab7bdac08a599..7ba5e77c02081 100644
--- a/docs/dns-usage.rst
+++ b/docs/dns/usage.rst
@@ -1,5 +1,14 @@
-Using the API
-=============
+DNS
+===
+
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  client
+  zone
+  resource-record-set
+  changes
 
 Client
 ------
@@ -8,7 +17,7 @@ Client
 configure your DNS applications.  Each instance holds both a ``project``
 and an authenticated connection to the DNS service.
 
-For an overview of authentication in ``google-cloud-python``, see :doc:`google-cloud-auth`.
+For an overview of authentication in ``google-cloud-python``, see :doc:`/core/auth`.
 
 Assuming your environment is set up as described in that document,
 create an instance of :class:`Client <google.cloud.dns.client.Client>`.
diff --git a/docs/dns-zone.rst b/docs/dns/zone.rst
similarity index 100%
rename from docs/dns-zone.rst
rename to docs/dns/zone.rst
diff --git a/docs/error-reporting-client.rst b/docs/error-reporting/client.rst
similarity index 100%
rename from docs/error-reporting-client.rst
rename to docs/error-reporting/client.rst
diff --git a/docs/error-reporting-usage.rst b/docs/error-reporting/usage.rst
similarity index 96%
rename from docs/error-reporting-usage.rst
rename to docs/error-reporting/usage.rst
index 47ed2fce977d4..7fd89c04b9366 100644
--- a/docs/error-reporting-usage.rst
+++ b/docs/error-reporting/usage.rst
@@ -1,12 +1,18 @@
-Using the API
-=============
+Stackdriver Error Reporting
+===========================
 
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  client
+  util
 
 Authentication and Configuration
 --------------------------------
 
 - For an overview of authentication in ``google-cloud-python``,
-  see :doc:`google-cloud-auth`.
+  see :doc:`/core/auth`.
 
 - In addition to any authentication configuration, you should also set the
   :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd like
diff --git a/docs/error-reporting-util.rst b/docs/error-reporting/util.rst
similarity index 100%
rename from docs/error-reporting-util.rst
rename to docs/error-reporting/util.rst
diff --git a/docs/index.rst b/docs/index.rst
index 2467260f97451..88a39b4c9a945 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,240 +1,27 @@
 .. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: google-cloud
-
-  google-cloud-api
-  google-cloud-config
-  google-cloud-auth
-  iterators
-  operation-api
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: BigQuery
-
-  bigquery-usage
-  Client <bigquery-client>
-  bigquery-dataset
-  bigquery-job
-  bigquery-table
-  bigquery-query
-  bigquery-schema
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: BigTable
-
-  bigtable-usage
-  bigtable-client-intro
-  bigtable-instance-api
-  bigtable-table-api
-  bigtable-data-api
-  Client <bigtable-client>
-  bigtable-instance
-  bigtable-cluster
-  bigtable-table
-  bigtable-column-family
-  bigtable-row
-  bigtable-row-filters
-  bigtable-row-data
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: Datastore
-
-  datastore-usage
-  Client <datastore-client>
-  datastore-entities
-  datastore-keys
-  datastore-queries
-  datastore-transactions
-  datastore-batches
-  datastore-helpers
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: DNS
-
-  dns-usage
-  Client <dns-client>
-  dns-zone
-  dns-resource-record-set
-  dns-changes
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: Natural Language
-
-  language-usage
-  Client <language-client>
-  language-document
-  language-responses
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: Pub/Sub
-
-  pubsub-usage
-  Client <pubsub-client>
-  pubsub-topic
-  pubsub-subscription
-  pubsub-message
-  pubsub-iam
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: Resource Manager
-
-  Overview <resource-manager-api>
-  resource-manager-client
-  resource-manager-project
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: Runtime Configuration
-
-  runtimeconfig-usage
-  Client <runtimeconfig-client>
-  runtimeconfig-config
-  runtimeconfig-variable
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: Spanner
-
-  spanner-usage
-  spanner-client-usage
-  spanner-instance-usage
-  spanner-database-usage
-  spanner-session-crud-usage
-  spanner-session-implicit-txn-usage
-  spanner-session-pool-usage
-  spanner-batch-usage
-  spanner-snapshot-usage
-  spanner-transaction-usage
-
-  spanner-client-api
-  spanner-instance-api
-  spanner-database-api
-  spanner-session-api
-  spanner-keyset-api
-  spanner-snapshot-api
-  spanner-batch-api
-  spanner-transaction-api
-  spanner-streamed-api
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: Speech
-
-  speech-usage
-  Client <speech-client>
-  speech-encoding
-  speech-operation
-  speech-result
-  speech-sample
-  speech-alternative
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: Stackdriver Error Reporting
-
-  error-reporting-usage
-  Client <error-reporting-client>
-  error-reporting-util
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: Stackdriver Logging
-
-  logging-usage
-  Client <logging-client>
-  logging-logger
-  logging-entries
-  logging-metric
-  logging-sink
-  logging-stdlib-usage
-  logging-handlers
-  logging-handlers-app-engine
-  logging-handlers-container-engine
-  logging-transports-sync
-  logging-transports-thread
-  logging-transports-base
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: Stackdriver Monitoring
-
-  monitoring-usage
-  Client <monitoring-client>
-  monitoring-metric
-  monitoring-resource
-  monitoring-group
-  monitoring-query
-  monitoring-timeseries
-  monitoring-label
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: Storage
-
-  Client <storage-client>
-  storage-blobs
-  storage-buckets
-  storage-acl
-  storage-batch
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: Translate
-
-  translate-usage
-  Client <translate-client>
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: Vision
-
-  vision-usage
-  vision-annotations
-  vision-batch
-  vision-client
-  vision-color
-  vision-crop-hint
-  vision-entity
-  vision-feature
-  vision-face
-  vision-image
-  vision-safe-search
-  vision-text
-  vision-web
-
-.. toctree::
-  :maxdepth: 0
-  :hidden:
-  :caption: External Links
-
-  GitHub <https://github.com/GoogleCloudPlatform/google-cloud-python/>
-  Issues <https://github.com/GoogleCloudPlatform/google-cloud-python/issues>
-  Stack Overflow <http://stackoverflow.com/questions/tagged/google-cloud-python>
-  PyPI <https://pypi.python.org/pypi/google-cloud>
+  :maxdepth: 2
+  :hidden:
+
+  core/index
+  bigquery/usage
+  bigtable/usage
+  datastore/usage
+  dns/usage
+  language/usage
+  pubsub/usage
+  resource-manager/api
+  runtimeconfig/usage
+  spanner/usage
+  speech/usage
+  error-reporting/usage
+  monitoring/usage
+  logging/usage
+  storage/client
+  translate/usage
+  vision/usage
+
+Google Cloud Client Library for Python
+======================================
 
 Getting started
 ---------------
@@ -245,8 +32,6 @@ The ``google-cloud`` library is ``pip`` install-able:
 
     $ pip install google-cloud
 
-----
-
 Cloud Datastore
 ~~~~~~~~~~~~~~~
 
@@ -281,3 +66,11 @@ Cloud Storage
   bucket = client.get_bucket('<your-bucket-name>')
   blob = bucket.blob('my-test-file.txt')
   blob.upload_from_string('this is test content!')
+
+Resources
+~~~~~~~~~
+
+* `GitHub <https://github.com/GoogleCloudPlatform/google-cloud-python/>`__
+* `Issues <https://github.com/GoogleCloudPlatform/google-cloud-python/issues>`__
+* `Stack Overflow <http://stackoverflow.com/questions/tagged/google-cloud-python>`__
+* `PyPI <https://pypi.python.org/pypi/google-cloud>`__
diff --git a/docs/language-client.rst b/docs/language/client.rst
similarity index 100%
rename from docs/language-client.rst
rename to docs/language/client.rst
diff --git a/docs/language-document.rst b/docs/language/document.rst
similarity index 100%
rename from docs/language-document.rst
rename to docs/language/document.rst
diff --git a/docs/language-responses.rst b/docs/language/responses.rst
similarity index 100%
rename from docs/language-responses.rst
rename to docs/language/responses.rst
diff --git a/docs/language-usage.rst b/docs/language/usage.rst
similarity index 98%
rename from docs/language-usage.rst
rename to docs/language/usage.rst
index bb443f89054c2..9b9cfb9cde6a0 100644
--- a/docs/language-usage.rst
+++ b/docs/language/usage.rst
@@ -1,5 +1,13 @@
-Using the API
-=============
+Natural Language
+================
+
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  client
+  document
+  responses
 
 The `Google Natural Language`_ API can be used to reveal the
 structure and meaning of text via powerful machine
@@ -26,7 +34,7 @@ means to configure your application. Each instance holds
 an authenticated connection to the Natural Language service.
 
 For an overview of authentication in ``google-cloud-python``, see
-:doc:`google-cloud-auth`.
+:doc:`/core/auth`.
 
 Assuming your environment is set up as described in that document,
 create an instance of :class:`~google.cloud.language.client.Client`.
diff --git a/docs/logging-client.rst b/docs/logging/client.rst
similarity index 100%
rename from docs/logging-client.rst
rename to docs/logging/client.rst
diff --git a/docs/logging-entries.rst b/docs/logging/entries.rst
similarity index 100%
rename from docs/logging-entries.rst
rename to docs/logging/entries.rst
diff --git a/docs/logging-handlers-app-engine.rst b/docs/logging/handlers-app-engine.rst
similarity index 100%
rename from docs/logging-handlers-app-engine.rst
rename to docs/logging/handlers-app-engine.rst
diff --git a/docs/logging-handlers-container-engine.rst b/docs/logging/handlers-container-engine.rst
similarity index 100%
rename from docs/logging-handlers-container-engine.rst
rename to docs/logging/handlers-container-engine.rst
diff --git a/docs/logging-handlers.rst b/docs/logging/handlers.rst
similarity index 100%
rename from docs/logging-handlers.rst
rename to docs/logging/handlers.rst
diff --git a/docs/logging-logger.rst b/docs/logging/logger.rst
similarity index 100%
rename from docs/logging-logger.rst
rename to docs/logging/logger.rst
diff --git a/docs/logging-metric.rst b/docs/logging/metric.rst
similarity index 100%
rename from docs/logging-metric.rst
rename to docs/logging/metric.rst
diff --git a/docs/logging-sink.rst b/docs/logging/sink.rst
similarity index 100%
rename from docs/logging-sink.rst
rename to docs/logging/sink.rst
diff --git a/docs/logging_snippets.py b/docs/logging/snippets.py
similarity index 100%
rename from docs/logging_snippets.py
rename to docs/logging/snippets.py
diff --git a/docs/logging-stdlib-usage.rst b/docs/logging/stdlib-usage.rst
similarity index 100%
rename from docs/logging-stdlib-usage.rst
rename to docs/logging/stdlib-usage.rst
diff --git a/docs/logging-transports-base.rst b/docs/logging/transports-base.rst
similarity index 100%
rename from docs/logging-transports-base.rst
rename to docs/logging/transports-base.rst
diff --git a/docs/logging-transports-sync.rst b/docs/logging/transports-sync.rst
similarity index 100%
rename from docs/logging-transports-sync.rst
rename to docs/logging/transports-sync.rst
diff --git a/docs/logging-transports-thread.rst b/docs/logging/transports-thread.rst
similarity index 100%
rename from docs/logging-transports-thread.rst
rename to docs/logging/transports-thread.rst
diff --git a/docs/logging-usage.rst b/docs/logging/usage.rst
similarity index 87%
rename from docs/logging-usage.rst
rename to docs/logging/usage.rst
index 5c8490c726355..5ec64aa905986 100644
--- a/docs/logging-usage.rst
+++ b/docs/logging/usage.rst
@@ -1,12 +1,28 @@
-Using the API
-=============
-
+Stackdriver Logging
+===================
+
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  client
+  logger
+  entries
+  metric
+  sink
+  stdlib-usage
+  handlers
+  handlers-app-engine
+  handlers-container-engine
+  transports-sync
+  transports-thread
+  transports-base
 
 Authentication and Configuration
 --------------------------------
 
 - For an overview of authentication in ``google-cloud-python``,
-  see :doc:`google-cloud-auth`.
+  see :doc:`/core/auth`.
 
 - In addition to any authentication configuration, you should also set the
   :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd like
@@ -22,13 +38,13 @@ Authentication and Configuration
 - After configuring your environment, create a
   :class:`~google.cloud.logging.client.Client`
 
-  .. literalinclude:: logging_snippets.py
+  .. literalinclude:: snippets.py
      :start-after: [START client_create_default]
      :end-before: [END client_create_default]
 
   or pass in ``credentials`` and ``project`` explicitly
 
-  .. literalinclude:: logging_snippets.py
+  .. literalinclude:: snippets.py
      :start-after: [START client_create_explicit]
      :end-before: [END client_create_explicit]
 
@@ -40,19 +56,19 @@ To write log entries, first create a
 :class:`~google.cloud.logging.logger.Logger`, passing the "log name" with
 which to associate the entries:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START logger_create]
     :end-before: [END logger_create]
 
 Write a simple text entry to the logger.
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START logger_log_text]
     :end-before: [END logger_log_text]
 
 Write a dictionary entry to the logger.
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START logger_log_struct]
     :end-before: [END logger_log_struct]
 
@@ -62,13 +78,13 @@ Retrieving log entries
 
 Fetch entries for the default project.
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START client_list_entries_default]
     :end-before: [END client_list_entries_default]
 
 Fetch entries across multiple projects.
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START client_list_entries_multi_project]
     :end-before: [END client_list_entries_multi_project]
 
@@ -78,25 +94,25 @@ Filter entries retrieved using the `Advanced Logs Filters`_ syntax
 
 Fetch entries for the default project.
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START client_list_entries_filter]
     :end-before: [END client_list_entries_filter]
 
 Sort entries in descending timestamp order.
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START client_list_entries_order_by]
     :end-before: [END client_list_entries_order_by]
 
 Retrieve entries in batches of 10, iterating until done.
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START client_list_entries_paged]
     :end-before: [END client_list_entries_paged]
 
 Retrieve entries for a single logger, sorting in descending timestamp order:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START logger_list_entries]
     :end-before: [END logger_list_entries]
 
@@ -104,7 +120,7 @@ Retrieve entries for a single logger, sorting in descending timestamp order:
 Delete all entries for a logger
 -------------------------------
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START logger_delete]
     :end-before: [END logger_delete]
 
@@ -117,31 +133,31 @@ used within Stackdriver Monitoring to create charts and alerts.
 
 List all metrics for a project:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START client_list_metrics]
     :end-before: [END client_list_metrics]
 
 Create a metric:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START metric_create]
     :end-before: [END metric_create]
 
 Refresh local information about a metric:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START metric_reload]
     :end-before: [END metric_reload]
 
 Update a metric:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START metric_update]
     :end-before: [END metric_update]
 
 Delete a metric:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START metric_delete]
     :end-before: [END metric_delete]
 
@@ -162,13 +178,13 @@ Make sure that the storage bucket you want to export logs too has
 
 Add ``cloud-logs@google.com`` as the owner of the bucket:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START sink_bucket_permissions]
     :end-before: [END sink_bucket_permissions]
 
 Create a Cloud Storage sink:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START sink_storage_create]
     :end-before: [END sink_storage_create]
 
@@ -183,13 +199,13 @@ See: `Setting permissions for BigQuery`_
 
 .. _Setting permissions for BigQuery: https://cloud.google.com/logging/docs/export/configure_export_v2#errors_exporting_to_bigquery
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START sink_dataset_permissions]
     :end-before: [END sink_dataset_permissions]
 
 Create a BigQuery sink:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START sink_bigquery_create]
     :end-before: [END sink_bigquery_create]
 
@@ -204,13 +220,13 @@ See: `Setting permissions for Pub/Sub`_
 
 .. _Setting permissions for Pub/Sub: https://cloud.google.com/logging/docs/export/configure_export_v2#errors_exporting_logs_to_cloud_pubsub
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START sink_topic_permissions]
     :end-before: [END sink_topic_permissions]
 
 Create a Cloud Pub/Sub sink:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START sink_pubsub_create]
     :end-before: [END sink_pubsub_create]
 
@@ -219,25 +235,25 @@ Manage Sinks
 
 List all sinks for a project:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START client_list_sinks]
     :end-before: [END client_list_sinks]
 
 Refresh local information about a sink:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START sink_reload]
     :end-before: [END sink_reload]
 
 Update a sink:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START sink_update]
     :end-before: [END sink_update]
 
 Delete a sink:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START sink_delete]
     :end-before: [END sink_delete]
 
@@ -249,7 +265,7 @@ Stackdriver Logging. There are different handler options to accomplish this.
 To automatically pick the default for your current environment, use
 :meth:`~google.cloud.logging.client.Client.get_default_handler`.
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START create_default_handler]
     :end-before: [END create_default_handler]
 
@@ -259,7 +275,7 @@ as well as any other loggers created. A helper method
 :meth:`~google.cloud.logging.client.Client.setup_logging` is provided
 to configure this automatically.
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START setup_logging]
     :end-before: [END setup_logging]
 
@@ -270,12 +286,12 @@ to configure this automatically.
 
 You can also exclude certain loggers:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START setup_logging_excludes]
     :end-before: [END setup_logging_excludes]
 
 Cloud Logging Handler
-=====================
+~~~~~~~~~~~~~~~~~~~~~
 
 If you prefer not to use
 :meth:`~google.cloud.logging.client.Client.get_default_handler`, you can
@@ -283,7 +299,7 @@ directly create a
 :class:`~google.cloud.logging.handlers.handlers.CloudLoggingHandler` instance
 which will write directly to the API.
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START create_cloud_handler]
     :end-before: [END create_cloud_handler]
 
@@ -298,12 +314,29 @@ All logs will go to a single custom log, which defaults to "python". The name
 of the Python logger will be included in the structured log entry under the
 "python_logger" field. You can change it by providing a name to the handler:
 
-.. literalinclude:: logging_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START create_named_handler]
     :end-before: [END create_named_handler]
 
+Cloud Logging Handler transports
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The :class:`~google.cloud.logging.handlers.handlers.CloudLoggingHandler`
+logging handler can use different transports. The default is
+:class:`~google.cloud.logging.handlers.BackgroundThreadTransport`.
+
+ 1. :class:`~google.cloud.logging.handlers.BackgroundThreadTransport` this is
+    the default. It writes entries on a background
+    :class:`python.threading.Thread`.
+
+ 1. :class:`~google.cloud.logging.handlers.SyncTransport` this handler does a
+    direct API call on each logging statement to write the entry.
+
+
+.. _Google Container Engine: https://cloud.google.com/container-engine/
+
 fluentd logging handlers
-========================
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 Besides :class:`~google.cloud.logging.handlers.handlers.CloudLoggingHandler`,
 which writes directly to the API, two other handlers are provided.
@@ -323,20 +356,3 @@ In both cases, the fluentd agent is configured to automatically parse log files
 in an expected format and forward them to Stackdriver logging. The handlers
 provided help set the correct metadata such as log level so that logs can be
 filtered accordingly.
-
-Cloud Logging Handler transports
-=================================
-
-The :class:`~google.cloud.logging.handlers.handlers.CloudLoggingHandler`
-logging handler can use different transports. The default is
-:class:`~google.cloud.logging.handlers.BackgroundThreadTransport`.
-
- 1. :class:`~google.cloud.logging.handlers.BackgroundThreadTransport` this is
-    the default. It writes entries on a background
-    :class:`python.threading.Thread`.
-
- 1. :class:`~google.cloud.logging.handlers.SyncTransport` this handler does a
-    direct API call on each logging statement to write the entry.
-
-
-.. _Google Container Engine: https://cloud.google.com/container-engine/
diff --git a/docs/monitoring-client.rst b/docs/monitoring/client.rst
similarity index 100%
rename from docs/monitoring-client.rst
rename to docs/monitoring/client.rst
diff --git a/docs/monitoring-group.rst b/docs/monitoring/group.rst
similarity index 100%
rename from docs/monitoring-group.rst
rename to docs/monitoring/group.rst
diff --git a/docs/monitoring-label.rst b/docs/monitoring/label.rst
similarity index 100%
rename from docs/monitoring-label.rst
rename to docs/monitoring/label.rst
diff --git a/docs/monitoring-metric.rst b/docs/monitoring/metric.rst
similarity index 100%
rename from docs/monitoring-metric.rst
rename to docs/monitoring/metric.rst
diff --git a/docs/monitoring-query.rst b/docs/monitoring/query.rst
similarity index 100%
rename from docs/monitoring-query.rst
rename to docs/monitoring/query.rst
diff --git a/docs/monitoring-resource.rst b/docs/monitoring/resource.rst
similarity index 100%
rename from docs/monitoring-resource.rst
rename to docs/monitoring/resource.rst
diff --git a/docs/monitoring-timeseries.rst b/docs/monitoring/timeseries.rst
similarity index 100%
rename from docs/monitoring-timeseries.rst
rename to docs/monitoring/timeseries.rst
diff --git a/docs/monitoring-usage.rst b/docs/monitoring/usage.rst
similarity index 98%
rename from docs/monitoring-usage.rst
rename to docs/monitoring/usage.rst
index 2f0408264ea8b..558425c5cab09 100644
--- a/docs/monitoring-usage.rst
+++ b/docs/monitoring/usage.rst
@@ -1,6 +1,17 @@
-Using the API
-=============
+Stackdriver Monitoring
+======================
 
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  client
+  metric
+  resource
+  group
+  query
+  timeseries
+  label
 
 Introduction
 ------------
@@ -49,7 +60,7 @@ GCP projects and AWS accounts. It can also simply be the ID of
 a monitored project.
 
 Most often the authentication credentials will be determined
-implicitly from your environment. See :doc:`google-cloud-auth` for
+implicitly from your environment. See :doc:`/core/auth` for
 more information.
 
 It is thus typical to create a client object as follows:
diff --git a/docs/pubsub-client.rst b/docs/pubsub/client.rst
similarity index 100%
rename from docs/pubsub-client.rst
rename to docs/pubsub/client.rst
diff --git a/docs/pubsub-iam.rst b/docs/pubsub/iam.rst
similarity index 100%
rename from docs/pubsub-iam.rst
rename to docs/pubsub/iam.rst
diff --git a/docs/pubsub-message.rst b/docs/pubsub/message.rst
similarity index 100%
rename from docs/pubsub-message.rst
rename to docs/pubsub/message.rst
diff --git a/docs/pubsub_snippets.py b/docs/pubsub/snippets.py
similarity index 100%
rename from docs/pubsub_snippets.py
rename to docs/pubsub/snippets.py
diff --git a/docs/pubsub-subscription.rst b/docs/pubsub/subscription.rst
similarity index 100%
rename from docs/pubsub-subscription.rst
rename to docs/pubsub/subscription.rst
diff --git a/docs/pubsub-topic.rst b/docs/pubsub/topic.rst
similarity index 100%
rename from docs/pubsub-topic.rst
rename to docs/pubsub/topic.rst
diff --git a/docs/pubsub-usage.rst b/docs/pubsub/usage.rst
similarity index 84%
rename from docs/pubsub-usage.rst
rename to docs/pubsub/usage.rst
index e385fe6eba5ec..96727e6548357 100644
--- a/docs/pubsub-usage.rst
+++ b/docs/pubsub/usage.rst
@@ -1,5 +1,16 @@
-Using the API
-=============
+Pub / Sub
+=========
+
+
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  client
+  topic
+  subscription
+  message
+  iam
 
 Authentication / Configuration
 ------------------------------
@@ -41,43 +52,43 @@ Manage topics for a project
 
 List topics for the default project:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START client_list_topics]
    :end-before: [END client_list_topics]
 
 Create a new topic for the default project:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START topic_create]
    :end-before: [END topic_create]
 
 Check for the existence of a topic:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START topic_exists]
    :end-before: [END topic_exists]
 
 Delete a topic:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START topic_delete]
    :end-before: [END topic_delete]
 
 Fetch the IAM policy for a topic:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START topic_get_iam_policy]
    :end-before: [END topic_get_iam_policy]
 
 Update the IAM policy for a topic:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START topic_set_iam_policy]
    :end-before: [END topic_set_iam_policy]
 
 Test permissions allowed by the current IAM policy on a topic:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START topic_check_iam_permissions]
    :end-before: [END topic_check_iam_permissions]
 
@@ -87,19 +98,19 @@ Publish messages to a topic
 
 Publish a single message to a topic, without attributes:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START topic_publish_simple_message]
    :end-before: [END topic_publish_simple_message]
 
 Publish a single message to a topic, with attributes:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START topic_publish_message_with_attrs]
    :end-before: [END topic_publish_message_with_attrs]
 
 Publish a set of messages to a topic (as a single request):
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START topic_batch]
    :end-before: [END topic_batch]
 
@@ -115,79 +126,79 @@ Manage subscriptions to topics
 
 List all subscriptions for the default project:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START client_list_subscriptions]
    :end-before: [END client_list_subscriptions]
 
 List subscriptions for a topic:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START topic_list_subscriptions]
    :end-before: [END topic_list_subscriptions]
 
 Create a new pull subscription for a topic, with defaults:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START topic_subscription_defaults]
    :end-before: [END topic_subscription_defaults]
 
 Create a new pull subscription for a topic with a non-default ACK deadline:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START topic_subscription_ack90]
    :end-before: [END topic_subscription_ack90]
 
 Create a new push subscription for a topic:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START topic_subscription_push]
    :end-before: [END topic_subscription_push]
 
 Check for the existence of a subscription:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START subscription_exists]
    :end-before: [END subscription_exists]
 
 Convert a pull subscription to push:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START subscription_pull_push]
    :end-before: [END subscription_pull_push]
 
 Convert a push subscription to pull:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START subscription_push_pull]
    :end-before: [END subscription_push_pull]
 
 Re-synchronize a subscription with the back-end:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START subscription_reload]
    :end-before: [END subscription_reload]
 
 Fetch the IAM policy for a subscription
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START subscription_get_iam_policy]
    :end-before: [END subscription_get_iam_policy]
 
 Update the IAM policy for a subscription:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START subscription_set_iam_policy]
    :end-before: [END subscription_set_iam_policy]
 
 Test permissions allowed by the current IAM policy on a subscription:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START subscription_check_iam_permissions]
    :end-before: [END subscription_check_iam_permissions]
 
 Delete a subscription:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START subscription_delete]
    :end-before: [END subscription_delete]
 
@@ -197,33 +208,33 @@ Pull messages from a subscription
 
 Fetch pending messages for a pull subscription:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START subscription_pull]
    :end-before: [END subscription_pull]
 
 Note that received messages must be acknowledged, or else the back-end
 will re-send them later:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START subscription_acknowledge]
    :end-before: [END subscription_acknowledge]
 
 Fetch messages for a pull subscription without blocking (none pending):
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START subscription_pull_return_immediately]
    :end-before: [END subscription_pull_return_immediately]
 
 Update the acknowlegement deadline for pulled messages:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START subscription_modify_ack_deadline]
    :end-before: [END subscription_modify_ack_deadline]
 
 Fetch pending messages, acknowledging those whose processing doesn't raise an
 error:
 
-.. literalinclude:: pubsub_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START subscription_pull_autoack]
    :end-before: [END subscription_pull_autoack]
 
diff --git a/docs/resource-manager-api.rst b/docs/resource-manager/api.rst
similarity index 97%
rename from docs/resource-manager-api.rst
rename to docs/resource-manager/api.rst
index f74439763a102..006e1c20171c0 100644
--- a/docs/resource-manager-api.rst
+++ b/docs/resource-manager/api.rst
@@ -1,5 +1,12 @@
-Resource Manager Overview
--------------------------
+Resource Manager
+----------------
+
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  client
+  project
 
 The Cloud Resource Manager API provides methods that you can use
 to programmatically manage your projects in the Google Cloud Platform.
diff --git a/docs/resource-manager-client.rst b/docs/resource-manager/client.rst
similarity index 100%
rename from docs/resource-manager-client.rst
rename to docs/resource-manager/client.rst
diff --git a/docs/resource-manager-project.rst b/docs/resource-manager/project.rst
similarity index 100%
rename from docs/resource-manager-project.rst
rename to docs/resource-manager/project.rst
diff --git a/docs/runtimeconfig-usage.rst b/docs/runtimeconfig-usage.rst
deleted file mode 100644
index 9f9e77252a6ad..0000000000000
--- a/docs/runtimeconfig-usage.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Using the API
-=============
-
-.. automodule:: google.cloud.runtimeconfig
-  :members:
-  :show-inheritance:
diff --git a/docs/runtimeconfig-client.rst b/docs/runtimeconfig/client.rst
similarity index 100%
rename from docs/runtimeconfig-client.rst
rename to docs/runtimeconfig/client.rst
diff --git a/docs/runtimeconfig-config.rst b/docs/runtimeconfig/config.rst
similarity index 100%
rename from docs/runtimeconfig-config.rst
rename to docs/runtimeconfig/config.rst
diff --git a/docs/runtimeconfig/usage.rst b/docs/runtimeconfig/usage.rst
new file mode 100644
index 0000000000000..3278d5aff9c5c
--- /dev/null
+++ b/docs/runtimeconfig/usage.rst
@@ -0,0 +1,17 @@
+Runtimeconfig
+=============
+
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  client
+  config
+  variable
+
+Modules
+-------
+
+.. automodule:: google.cloud.runtimeconfig
+  :members:
+  :show-inheritance:
diff --git a/docs/runtimeconfig-variable.rst b/docs/runtimeconfig/variable.rst
similarity index 100%
rename from docs/runtimeconfig-variable.rst
rename to docs/runtimeconfig/variable.rst
diff --git a/docs/spanner-batch-api.rst b/docs/spanner/batch-api.rst
similarity index 100%
rename from docs/spanner-batch-api.rst
rename to docs/spanner/batch-api.rst
diff --git a/docs/spanner-batch-usage.rst b/docs/spanner/batch-usage.rst
similarity index 99%
rename from docs/spanner-batch-usage.rst
rename to docs/spanner/batch-usage.rst
index 3bf4917958d23..1bdce70e5342d 100644
--- a/docs/spanner-batch-usage.rst
+++ b/docs/spanner/batch-usage.rst
@@ -176,4 +176,4 @@ if the ``with`` block exits without raising an exception.
 Next Step
 ---------
 
-Next, learn about :doc:`spanner-snapshot-usage`.
+Next, learn about :doc:`snapshot-usage`.
diff --git a/docs/spanner-client-api.rst b/docs/spanner/client-api.rst
similarity index 100%
rename from docs/spanner-client-api.rst
rename to docs/spanner/client-api.rst
diff --git a/docs/spanner-client-usage.rst b/docs/spanner/client-usage.rst
similarity index 96%
rename from docs/spanner-client-usage.rst
rename to docs/spanner/client-usage.rst
index 6c044e5ba5b53..a40c064f86da7 100644
--- a/docs/spanner-client-usage.rst
+++ b/docs/spanner/client-usage.rst
@@ -25,7 +25,7 @@ Configuration
 -------------
 
 - For an overview of authentication in ``google.cloud-python``,
-  see :doc:`google-cloud-auth`.
+  see :doc:`/core/auth`.
 
 - In addition to any authentication configuration, you can also set the
   :envvar:`GCLOUD_PROJECT` environment variable for the Google Cloud Console
@@ -62,7 +62,7 @@ After a :class:`~google.cloud.spanner.client.Client`, the next
 highest-level object is an :class:`~google.cloud.spanner.instance.Instance`.
 You'll need one before you can interact with databases.
 
-Next, learn about the :doc:`spanner-instance-usage`.
+Next, learn about the :doc:`instance-usage`.
 
 .. _Instance Admin: https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.instance.v1
 .. _Database Admin: https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1
diff --git a/docs/spanner-database-api.rst b/docs/spanner/database-api.rst
similarity index 100%
rename from docs/spanner-database-api.rst
rename to docs/spanner/database-api.rst
diff --git a/docs/spanner-database-usage.rst b/docs/spanner/database-usage.rst
similarity index 98%
rename from docs/spanner-database-usage.rst
rename to docs/spanner/database-usage.rst
index 3d1a51c6ed9a4..aecd1ab12ccc3 100644
--- a/docs/spanner-database-usage.rst
+++ b/docs/spanner/database-usage.rst
@@ -121,4 +121,4 @@ method:
 Next Step
 ---------
 
-Next, learn about :doc:`spanner-session-crud-usage`.
+Next, learn about :doc:`session-crud-usage`.
diff --git a/docs/spanner-instance-api.rst b/docs/spanner/instance-api.rst
similarity index 100%
rename from docs/spanner-instance-api.rst
rename to docs/spanner/instance-api.rst
diff --git a/docs/spanner-instance-usage.rst b/docs/spanner/instance-usage.rst
similarity index 98%
rename from docs/spanner-instance-usage.rst
rename to docs/spanner/instance-usage.rst
index e05910bc59fdf..f3b254e4f8081 100644
--- a/docs/spanner-instance-usage.rst
+++ b/docs/spanner/instance-usage.rst
@@ -175,7 +175,7 @@ Now we go down the hierarchy from
 :class:`~google.cloud.spanner.instance.Instance` to a
 :class:`~google.cloud.spanner.database.Database`.
 
-Next, learn about the :doc:`spanner-database-usage`.
+Next, learn about the :doc:`database-usage`.
 
 
 .. _Instance Admin API: https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.instance.v1
diff --git a/docs/spanner-keyset-api.rst b/docs/spanner/keyset-api.rst
similarity index 100%
rename from docs/spanner-keyset-api.rst
rename to docs/spanner/keyset-api.rst
diff --git a/docs/spanner-session-api.rst b/docs/spanner/session-api.rst
similarity index 100%
rename from docs/spanner-session-api.rst
rename to docs/spanner/session-api.rst
diff --git a/docs/spanner-session-crud-usage.rst b/docs/spanner/session-crud-usage.rst
similarity index 96%
rename from docs/spanner-session-crud-usage.rst
rename to docs/spanner/session-crud-usage.rst
index 43e983f787d8f..e0734bee10665 100644
--- a/docs/spanner-session-crud-usage.rst
+++ b/docs/spanner/session-crud-usage.rst
@@ -77,4 +77,4 @@ you can use the session as a Python context manager:
 Next Step
 ---------
 
-Next, learn about :doc:`spanner-session-implicit-txn-usage`.
+Next, learn about :doc:`session-implicit-txn-usage`.
diff --git a/docs/spanner-session-implicit-txn-usage.rst b/docs/spanner/session-implicit-txn-usage.rst
similarity index 96%
rename from docs/spanner-session-implicit-txn-usage.rst
rename to docs/spanner/session-implicit-txn-usage.rst
index cf0c066729172..5c7d3025f5662 100644
--- a/docs/spanner-session-implicit-txn-usage.rst
+++ b/docs/spanner/session-implicit-txn-usage.rst
@@ -51,4 +51,4 @@ fails if the result set is too large,
 Next Step
 ---------
 
-Next, learn about :doc:`spanner-batch-usage`.
+Next, learn about :doc:`batch-usage`.
diff --git a/docs/spanner-session-pool-usage.rst b/docs/spanner/session-pool-usage.rst
similarity index 100%
rename from docs/spanner-session-pool-usage.rst
rename to docs/spanner/session-pool-usage.rst
diff --git a/docs/spanner-snapshot-api.rst b/docs/spanner/snapshot-api.rst
similarity index 100%
rename from docs/spanner-snapshot-api.rst
rename to docs/spanner/snapshot-api.rst
diff --git a/docs/spanner-snapshot-usage.rst b/docs/spanner/snapshot-usage.rst
similarity index 97%
rename from docs/spanner-snapshot-usage.rst
rename to docs/spanner/snapshot-usage.rst
index 272612c00e75f..d67533edb8f73 100644
--- a/docs/spanner-snapshot-usage.rst
+++ b/docs/spanner/snapshot-usage.rst
@@ -81,4 +81,4 @@ fails if the result set is too large,
 Next Step
 ---------
 
-Next, learn about :doc:`spanner-transaction-usage`.
+Next, learn about :doc:`transaction-usage`.
diff --git a/docs/spanner-streamed-api.rst b/docs/spanner/streamed-api.rst
similarity index 100%
rename from docs/spanner-streamed-api.rst
rename to docs/spanner/streamed-api.rst
diff --git a/docs/spanner-transaction-api.rst b/docs/spanner/transaction-api.rst
similarity index 100%
rename from docs/spanner-transaction-api.rst
rename to docs/spanner/transaction-api.rst
diff --git a/docs/spanner-transaction-usage.rst b/docs/spanner/transaction-usage.rst
similarity index 100%
rename from docs/spanner-transaction-usage.rst
rename to docs/spanner/transaction-usage.rst
diff --git a/docs/spanner-usage.rst b/docs/spanner/usage.rst
similarity index 60%
rename from docs/spanner-usage.rst
rename to docs/spanner/usage.rst
index f308201b674f1..0d91420415231 100644
--- a/docs/spanner-usage.rst
+++ b/docs/spanner/usage.rst
@@ -1,11 +1,35 @@
-Using the API
-=============
+Spanner
+=======
+
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  client-usage
+  instance-usage
+  database-usage
+  session-crud-usage
+  session-implicit-txn-usage
+  session-pool-usage
+  batch-usage
+  snapshot-usage
+  transaction-usage
+
+  client-api
+  instance-api
+  database-api
+  session-api
+  keyset-api
+  snapshot-api
+  batch-api
+  transaction-api
+  streamed-api
 
 API requests are sent to the `Cloud Spanner`_ API via RPC over
 HTTP/2.  In order to support this, we'll rely on `gRPC`_.
 
 Get started by learning about the :class:`~google.cloud.spanner.client.Client`
-on the :doc:`spanner-client-usage` page.
+on the :doc:`client-usage` page.
 
 In the hierarchy of API concepts
 
diff --git a/docs/speech-alternative.rst b/docs/speech/alternative.rst
similarity index 100%
rename from docs/speech-alternative.rst
rename to docs/speech/alternative.rst
diff --git a/docs/speech-client.rst b/docs/speech/client.rst
similarity index 100%
rename from docs/speech-client.rst
rename to docs/speech/client.rst
diff --git a/docs/speech-encoding.rst b/docs/speech/encoding.rst
similarity index 100%
rename from docs/speech-encoding.rst
rename to docs/speech/encoding.rst
diff --git a/docs/speech-operation.rst b/docs/speech/operation.rst
similarity index 100%
rename from docs/speech-operation.rst
rename to docs/speech/operation.rst
diff --git a/docs/speech-result.rst b/docs/speech/result.rst
similarity index 100%
rename from docs/speech-result.rst
rename to docs/speech/result.rst
diff --git a/docs/speech-sample.rst b/docs/speech/sample.rst
similarity index 100%
rename from docs/speech-sample.rst
rename to docs/speech/sample.rst
diff --git a/docs/speech-usage.rst b/docs/speech/usage.rst
similarity index 98%
rename from docs/speech-usage.rst
rename to docs/speech/usage.rst
index 81f5cdd0cb0c4..a651965e9e189 100644
--- a/docs/speech-usage.rst
+++ b/docs/speech/usage.rst
@@ -1,5 +1,16 @@
-Using the API
-=============
+Speech
+======
+
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  client
+  encoding
+  operation
+  result
+  sample
+  alternative
 
 The `Google Speech`_ API enables developers to convert audio to text.
 The API recognizes over 80 languages and variants, to support your global user
@@ -15,7 +26,7 @@ means to configure your application. Each instance holds
 an authenticated connection to the Cloud Speech Service.
 
 For an overview of authentication in ``google-cloud-python``, see
-:doc:`google-cloud-auth`.
+:doc:`/core/auth`.
 
 Assuming your environment is set up as described in that document,
 create an instance of :class:`~google.cloud.speech.client.Client`.
diff --git a/docs/storage-client.rst b/docs/storage-client.rst
deleted file mode 100644
index 1358bbfe664c7..0000000000000
--- a/docs/storage-client.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Storage Client
-==============
-
-.. automodule:: google.cloud.storage.client
-  :members:
-  :show-inheritance:
diff --git a/docs/storage-acl.rst b/docs/storage/acl.rst
similarity index 100%
rename from docs/storage-acl.rst
rename to docs/storage/acl.rst
diff --git a/docs/storage-batch.rst b/docs/storage/batch.rst
similarity index 100%
rename from docs/storage-batch.rst
rename to docs/storage/batch.rst
diff --git a/docs/storage-blobs.rst b/docs/storage/blobs.rst
similarity index 100%
rename from docs/storage-blobs.rst
rename to docs/storage/blobs.rst
diff --git a/docs/storage-buckets.rst b/docs/storage/buckets.rst
similarity index 100%
rename from docs/storage-buckets.rst
rename to docs/storage/buckets.rst
diff --git a/docs/storage/client.rst b/docs/storage/client.rst
new file mode 100644
index 0000000000000..a72de7af9f8e5
--- /dev/null
+++ b/docs/storage/client.rst
@@ -0,0 +1,16 @@
+Storage
+=======
+
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  blobs
+  buckets
+  acl
+  batch
+
+
+.. automodule:: google.cloud.storage.client
+  :members:
+  :show-inheritance:
diff --git a/docs/storage_snippets.py b/docs/storage/snippets.py
similarity index 100%
rename from docs/storage_snippets.py
rename to docs/storage/snippets.py
diff --git a/docs/translate-client.rst b/docs/translate/client.rst
similarity index 100%
rename from docs/translate-client.rst
rename to docs/translate/client.rst
diff --git a/docs/translate-usage.rst b/docs/translate/usage.rst
similarity index 97%
rename from docs/translate-usage.rst
rename to docs/translate/usage.rst
index 91d0d4a8bfc16..21723a93d6dbd 100644
--- a/docs/translate-usage.rst
+++ b/docs/translate/usage.rst
@@ -1,5 +1,11 @@
-Using the API
-=============
+Translation
+===========
+
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  client
 
 With `Google Cloud Translation`_, you can dynamically translate text
 between thousands of language pairs. The Google Cloud Translation API
diff --git a/docs/vision-annotations.rst b/docs/vision/annotations.rst
similarity index 100%
rename from docs/vision-annotations.rst
rename to docs/vision/annotations.rst
diff --git a/docs/vision-batch.rst b/docs/vision/batch.rst
similarity index 100%
rename from docs/vision-batch.rst
rename to docs/vision/batch.rst
diff --git a/docs/vision-client.rst b/docs/vision/client.rst
similarity index 100%
rename from docs/vision-client.rst
rename to docs/vision/client.rst
diff --git a/docs/vision-color.rst b/docs/vision/color.rst
similarity index 100%
rename from docs/vision-color.rst
rename to docs/vision/color.rst
diff --git a/docs/vision-crop-hint.rst b/docs/vision/crop-hint.rst
similarity index 100%
rename from docs/vision-crop-hint.rst
rename to docs/vision/crop-hint.rst
diff --git a/docs/vision-entity.rst b/docs/vision/entity.rst
similarity index 100%
rename from docs/vision-entity.rst
rename to docs/vision/entity.rst
diff --git a/docs/vision-face.rst b/docs/vision/face.rst
similarity index 100%
rename from docs/vision-face.rst
rename to docs/vision/face.rst
diff --git a/docs/vision-feature.rst b/docs/vision/feature.rst
similarity index 100%
rename from docs/vision-feature.rst
rename to docs/vision/feature.rst
diff --git a/docs/vision-image.rst b/docs/vision/image.rst
similarity index 100%
rename from docs/vision-image.rst
rename to docs/vision/image.rst
diff --git a/docs/vision-safe-search.rst b/docs/vision/safe-search.rst
similarity index 100%
rename from docs/vision-safe-search.rst
rename to docs/vision/safe-search.rst
diff --git a/docs/vision-text.rst b/docs/vision/text.rst
similarity index 100%
rename from docs/vision-text.rst
rename to docs/vision/text.rst
diff --git a/docs/vision-usage.rst b/docs/vision/usage.rst
similarity index 98%
rename from docs/vision-usage.rst
rename to docs/vision/usage.rst
index ffa31fb94562c..07775aaef9a90 100644
--- a/docs/vision-usage.rst
+++ b/docs/vision/usage.rst
@@ -1,14 +1,30 @@
-####################
-Using the Vision API
-####################
-
+######
+Vision
+######
+
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  annotations
+  batch
+  client
+  color
+  crop-hint
+  entity
+  feature
+  face
+  image
+  safe-search
+  text
+  web
 
 ********************************
 Authentication and Configuration
 ********************************
 
 - For an overview of authentication in ``google-cloud-python``,
-  see :doc:`google-cloud-auth`.
+  see :doc:`/core/auth`.
 
 - In addition to any authentication configuration, you should also set the
   :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd
diff --git a/docs/vision-web.rst b/docs/vision/web.rst
similarity index 100%
rename from docs/vision-web.rst
rename to docs/vision/web.rst
diff --git a/pubsub/google/cloud/pubsub/client.py b/pubsub/google/cloud/pubsub/client.py
index 1df95a2400de1..17bb67cb66e20 100644
--- a/pubsub/google/cloud/pubsub/client.py
+++ b/pubsub/google/cloud/pubsub/client.py
@@ -141,7 +141,7 @@ def list_topics(self, page_size=None, page_token=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START client_list_topics]
            :end-before: [END client_list_topics]
 
@@ -170,7 +170,7 @@ def list_subscriptions(self, page_size=None, page_token=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START client_list_subscriptions]
            :end-before: [END client_list_subscriptions]
 
@@ -223,7 +223,7 @@ def topic(self, name, timestamp_messages=False):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START client_topic]
            :end-before: [END client_topic]
 
@@ -245,7 +245,7 @@ def subscription(self, name, ack_deadline=None, push_endpoint=None,
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START client_subscription]
            :end-before: [END client_subscription]
 
diff --git a/pubsub/google/cloud/pubsub/subscription.py b/pubsub/google/cloud/pubsub/subscription.py
index 538913cca33ef..22f93246924c2 100644
--- a/pubsub/google/cloud/pubsub/subscription.py
+++ b/pubsub/google/cloud/pubsub/subscription.py
@@ -200,7 +200,7 @@ def create(self, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START subscription_create]
            :end-before: [END subscription_create]
 
@@ -225,7 +225,7 @@ def exists(self, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START subscription_exists]
            :end-before: [END subscription_exists]
 
@@ -258,7 +258,7 @@ def reload(self, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START subscription_reload]
            :end-before: [END subscription_reload]
 
@@ -285,7 +285,7 @@ def delete(self, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START subscription_delete]
            :end-before: [END subscription_delete]
 
@@ -306,11 +306,11 @@ def modify_push_configuration(self, push_endpoint, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START subscription_push_pull]
            :end-before: [END subscription_push_pull]
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START subscription_pull_push]
            :end-before: [END subscription_pull_push]
 
@@ -337,7 +337,7 @@ def pull(self, return_immediately=False, max_messages=1, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START subscription_pull]
            :end-before: [END subscription_pull]
 
@@ -376,7 +376,7 @@ def acknowledge(self, ack_ids, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START subscription_acknowledge]
            :end-before: [END subscription_acknowledge]
 
@@ -460,7 +460,7 @@ def get_iam_policy(self, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START subscription_get_iam_policy]
            :end-before: [END subscription_get_iam_policy]
 
@@ -486,7 +486,7 @@ def set_iam_policy(self, policy, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START subscription_set_iam_policy]
            :end-before: [END subscription_set_iam_policy]
 
@@ -517,7 +517,7 @@ def check_iam_permissions(self, permissions, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START subscription_check_iam_permissions]
            :end-before: [END subscription_check_iam_permissions]
 
diff --git a/pubsub/google/cloud/pubsub/topic.py b/pubsub/google/cloud/pubsub/topic.py
index f16c9d99baed5..f9a8c28a3a09c 100644
--- a/pubsub/google/cloud/pubsub/topic.py
+++ b/pubsub/google/cloud/pubsub/topic.py
@@ -59,19 +59,19 @@ def subscription(self, name, ack_deadline=None, push_endpoint=None,
 
         Example:  pull-mode subcription, default parameter values
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START topic_subscription_defaults]
            :end-before: [END topic_subscription_defaults]
 
         Example:  pull-mode subcription, override ``ack_deadline`` default
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START topic_subscription_ack90]
            :end-before: [END topic_subscription_ack90]
 
         Example:  push-mode subcription
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START topic_subscription_push]
            :end-before: [END topic_subscription_push]
 
@@ -160,7 +160,7 @@ def create(self, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START topic_create]
            :end-before: [END topic_create]
 
@@ -181,7 +181,7 @@ def exists(self, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START topic_exists]
            :end-before: [END topic_exists]
 
@@ -211,7 +211,7 @@ def delete(self, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START topic_delete]
            :end-before: [END topic_delete]
 
@@ -242,13 +242,13 @@ def publish(self, message, client=None, **attrs):
 
         Example without message attributes:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START topic_publish_simple_message]
            :end-before: [END topic_publish_simple_message]
 
         With message attributes:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START topic_publish_message_with_attrs]
            :end-before: [END topic_publish_message_with_attrs]
 
@@ -279,7 +279,7 @@ def batch(self, client=None, **kwargs):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START topic_batch]
            :end-before: [END topic_batch]
 
@@ -312,7 +312,7 @@ def list_subscriptions(self, page_size=None, page_token=None, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START topic_list_subscriptions]
            :end-before: [END topic_list_subscriptions]
 
@@ -347,7 +347,7 @@ def get_iam_policy(self, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START topic_get_iam_policy]
            :end-before: [END topic_get_iam_policy]
 
@@ -373,7 +373,7 @@ def set_iam_policy(self, policy, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START topic_set_iam_policy]
            :end-before: [END topic_set_iam_policy]
 
@@ -404,7 +404,7 @@ def check_iam_permissions(self, permissions, client=None):
 
         Example:
 
-        .. literalinclude:: pubsub_snippets.py
+        .. literalinclude:: snippets.py
            :start-after: [START topic_check_iam_permissions]
            :end-before: [END topic_check_iam_permissions]
 
diff --git a/storage/google/cloud/storage/__init__.py b/storage/google/cloud/storage/__init__.py
index 433f711025f68..bc6fccc971c27 100644
--- a/storage/google/cloud/storage/__init__.py
+++ b/storage/google/cloud/storage/__init__.py
@@ -16,7 +16,7 @@
 
 You'll typically use these to get started with the API:
 
-.. literalinclude:: storage_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START storage_get_started]
     :end-before: [END storage_get_started]
 
diff --git a/storage/google/cloud/storage/acl.py b/storage/google/cloud/storage/acl.py
index 3424f24c66ef2..389a312fb219b 100644
--- a/storage/google/cloud/storage/acl.py
+++ b/storage/google/cloud/storage/acl.py
@@ -18,7 +18,7 @@
 an ACL object under the hood, and you can interact with that using
 :func:`google.cloud.storage.bucket.Bucket.acl`:
 
-.. literalinclude:: storage_snippets.py
+.. literalinclude:: snippets.py
     :start-after: [START client_bucket_acl]
     :end-before: [END client_bucket_acl]
 
@@ -49,14 +49,14 @@
 You can use any of these like any other factory method (these happen to
 be :class:`_ACLEntity` factories):
 
-.. literalinclude:: storage_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START acl_user_settings]
    :end-before: [END acl_user_settings]
 
 After that, you can save any changes you make with the
 :func:`google.cloud.storage.acl.ACL.save` method:
 
-.. literalinclude:: storage_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START acl_save]
    :end-before: [END acl_save]
 
@@ -64,14 +64,14 @@
 object (whether it was created by a factory method or not) from a
 :class:`google.cloud.storage.bucket.Bucket`:
 
-.. literalinclude:: storage_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START acl_save_bucket]
    :end-before: [END acl_save_bucket]
 
 To get the list of ``entity`` and ``role`` for each unique pair, the
 :class:`ACL` class is iterable:
 
-.. literalinclude:: storage_snippets.py
+.. literalinclude:: snippets.py
    :start-after: [START acl_print]
    :end-before: [END acl_print]
 
diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index 7163b7d0d3b5c..671cda3052a18 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -439,7 +439,7 @@ def download_to_file(self, file_obj, client=None):
         Downloading a file that has been encrypted with a `customer-supplied`_
         encryption key:
 
-         .. literalinclude:: storage_snippets.py
+         .. literalinclude:: snippets.py
             :start-after: [START download_to_file]
             :end-before: [END download_to_file]
 
@@ -840,7 +840,7 @@ def upload_from_file(self, file_obj, rewind=False, size=None,
 
         Uploading a file with a `customer-supplied`_ encryption key:
 
-        .. literalinclude:: storage_snippets.py
+        .. literalinclude:: snippets.py
             :start-after: [START upload_from_file]
             :end-before: [END upload_from_file]
 
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index efb45934f5488..f0f040e0627e0 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -233,7 +233,7 @@ def get_blob(self, blob_name, client=None):
 
         This will return None if the blob doesn't exist:
 
-        .. literalinclude:: storage_snippets.py
+        .. literalinclude:: snippets.py
           :start-after: [START get_blob]
           :end-before: [END get_blob]
 
@@ -392,7 +392,7 @@ def delete_blob(self, blob_name, client=None):
 
         For example:
 
-        .. literalinclude:: storage_snippets.py
+        .. literalinclude:: snippets.py
           :start-after: [START delete_blob]
           :end-before: [END delete_blob]
 
@@ -408,7 +408,7 @@ def delete_blob(self, blob_name, client=None):
                  the exception, call ``delete_blobs``, passing a no-op
                  ``on_error`` callback, e.g.:
 
-        .. literalinclude:: storage_snippets.py
+        .. literalinclude:: snippets.py
             :start-after: [START delete_blobs]
             :end-before: [END delete_blobs]
 
@@ -768,13 +768,13 @@ def configure_website(self, main_page_suffix=None, not_found_page=None):
         If you want this bucket to host a website, just provide the name
         of an index page and a page to use when a blob isn't found:
 
-        .. literalinclude:: storage_snippets.py
+        .. literalinclude:: snippets.py
           :start-after: [START configure_website]
           :end-before: [END configure_website]
 
         You probably should also make the whole bucket public:
 
-        .. literalinclude:: storage_snippets.py
+        .. literalinclude:: snippets.py
             :start-after: [START make_public]
             :end-before: [END make_public]
 
@@ -939,7 +939,7 @@ def generate_upload_policy(
 
         For example:
 
-        .. literalinclude:: storage_snippets.py
+        .. literalinclude:: snippets.py
             :start-after: [START policy_document]
             :end-before: [END policy_document]
 
diff --git a/storage/google/cloud/storage/client.py b/storage/google/cloud/storage/client.py
index 24e073bc72dd1..93785e05269fc 100644
--- a/storage/google/cloud/storage/client.py
+++ b/storage/google/cloud/storage/client.py
@@ -156,7 +156,7 @@ def get_bucket(self, bucket_name):
 
         For example:
 
-        .. literalinclude:: storage_snippets.py
+        .. literalinclude:: snippets.py
             :start-after: [START get_bucket]
             :end-before: [END get_bucket]
 
@@ -179,7 +179,7 @@ def lookup_bucket(self, bucket_name):
         You can use this if you would rather check for a None value
         than catching an exception:
 
-        .. literalinclude:: storage_snippets.py
+        .. literalinclude:: snippets.py
             :start-after: [START lookup_bucket]
             :end-before: [END lookup_bucket]
 
@@ -199,7 +199,7 @@ def create_bucket(self, bucket_name):
 
         For example:
 
-        .. literalinclude:: storage_snippets.py
+        .. literalinclude:: snippets.py
             :start-after: [START create_bucket]
             :end-before: [END create_bucket]
 
@@ -225,7 +225,7 @@ def list_buckets(self, max_results=None, page_token=None, prefix=None,
         This will not populate the list of blobs available in each
         bucket.
 
-        .. literalinclude:: storage_snippets.py
+        .. literalinclude:: snippets.py
             :start-after: [START list_buckets]
             :end-before: [END list_buckets]
 

From 85fd45a9558f9347dd87abb40a4ce1872b730aec Mon Sep 17 00:00:00 2001
From: Ricardo Lui Geh <ricardo.geh@gmail.com>
Date: Thu, 1 Jun 2017 14:11:48 -0300
Subject: [PATCH 006/211] Someone changed auth link and broke this link (#3464)

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index dc2d9ace2f91a..b2fcb47df468d 100644
--- a/README.rst
+++ b/README.rst
@@ -123,7 +123,7 @@ Check out the `Authentication section`_ in our documentation to learn more.
 You may also find the `authentication document`_ shared by all the
 ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Contributing

From 72e6e522067a7d54c5d4416a6e073e0c9566be3d Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 2 Jun 2017 14:36:29 -0700
Subject: [PATCH 007/211] Vision semi-GAPIC (#3373)

---
 .gitignore                                    |    1 +
 bigquery/google/cloud/bigquery/client.py      |   14 +-
 bigquery/google/cloud/bigquery/dataset.py     |    8 +-
 bigquery/google/cloud/bigquery/job.py         |   60 +-
 bigquery/google/cloud/bigquery/query.py       |   38 +-
 bigquery/google/cloud/bigquery/table.py       |   12 +-
 bigquery/tests/system.py                      |    6 +-
 bigtable/tests/unit/test_row_data.py          |    2 +-
 core/google/cloud/exceptions.py               |    4 +-
 core/google/cloud/iam.py                      |    2 +-
 core/google/cloud/operation.py                |    2 +-
 datastore/google/cloud/datastore/query.py     |   12 +-
 dns/google/cloud/dns/changes.py               |    4 +-
 dns/google/cloud/dns/client.py                |    4 +-
 dns/google/cloud/dns/resource_record_set.py   |    2 +-
 dns/google/cloud/dns/zone.py                  |   12 +-
 docs/bigquery/snippets.py                     |    2 +-
 docs/conf.py                                  |   15 +-
 docs/index.rst                                |    2 +-
 docs/vision/annotations.rst                   |    7 -
 docs/vision/batch.rst                         |   10 -
 docs/vision/client.rst                        |   10 -
 docs/vision/color.rst                         |   10 -
 docs/vision/crop-hint.rst                     |   10 -
 docs/vision/entity.rst                        |   10 -
 docs/vision/face.rst                          |   10 -
 docs/vision/feature.rst                       |   10 -
 docs/vision/gapic/api.rst                     |    6 +
 docs/vision/gapic/types.rst                   |    5 +
 docs/vision/image.rst                         |   26 -
 docs/vision/index.rst                         |  131 ++
 docs/vision/safe-search.rst                   |   10 -
 docs/vision/text.rst                          |   10 -
 docs/vision/usage.rst                         |  414 ----
 docs/vision/web.rst                           |   10 -
 .../google/cloud/error_reporting/client.py    |    2 +-
 logging/google/cloud/logging/_gax.py          |    6 +-
 logging/google/cloud/logging/_http.py         |   34 +-
 logging/google/cloud/logging/client.py        |   14 +-
 logging/google/cloud/logging/entries.py       |    6 +-
 .../cloud/logging/handlers/app_engine.py      |    2 +-
 .../google/cloud/logging/handlers/handlers.py |    4 +-
 logging/google/cloud/logging/logger.py        |   14 +-
 logging/google/cloud/logging/metric.py        |    4 +-
 logging/google/cloud/logging/sink.py          |    4 +-
 .../google/cloud/monitoring/timeseries.py     |    2 +-
 nox.py                                        |    2 +-
 pubsub/google/cloud/pubsub/_gax.py            |   36 +-
 pubsub/google/cloud/pubsub/_http.py           |   42 +-
 pubsub/google/cloud/pubsub/client.py          |    6 +-
 pubsub/google/cloud/pubsub/iam.py             |    2 +-
 pubsub/google/cloud/pubsub/message.py         |    2 +-
 pubsub/google/cloud/pubsub/snapshot.py        |    4 +-
 pubsub/google/cloud/pubsub/subscription.py    |   26 +-
 pubsub/google/cloud/pubsub/topic.py           |   16 +-
 .../google/cloud/resource_manager/client.py   |    2 +-
 .../google/cloud/resource_manager/project.py  |    4 +-
 .../google/cloud/runtimeconfig/_helpers.py    |    4 +-
 .../google/cloud/runtimeconfig/config.py      |    8 +-
 .../google/cloud/runtimeconfig/variable.py    |   18 +-
 setup.py                                      |    5 +-
 spanner/google/cloud/spanner/client.py        |    6 +-
 spanner/google/cloud/spanner/database.py      |   18 +-
 spanner/google/cloud/spanner/instance.py      |   12 +-
 spanner/google/cloud/spanner/session.py       |   10 +-
 spanner/google/cloud/spanner/snapshot.py      |    4 +-
 spanner/tests/unit/test_streamed.py           |    2 +-
 speech/google/cloud/speech/_gax.py            |    4 +-
 speech/google/cloud/speech/encoding.py        |    2 +-
 speech/google/cloud/speech/sample.py          |    2 +-
 storage/google/cloud/storage/acl.py           |    2 +-
 storage/google/cloud/storage/batch.py         |    2 +-
 storage/google/cloud/storage/blob.py          |   54 +-
 storage/google/cloud/storage/bucket.py        |   46 +-
 translate/google/cloud/translate/client.py    |    6 +-
 vision/MANIFEST.in                            |    2 +-
 vision/google/cloud/gapic/__init__.py         |    1 +
 vision/google/cloud/gapic/vision/__init__.py  |    1 +
 .../google/cloud/gapic/vision/v1/__init__.py  |    0
 vision/google/cloud/gapic/vision/v1/enums.py  |  195 ++
 .../gapic/vision/v1/image_annotator_client.py |  179 ++
 .../v1/image_annotator_client_config.json     |   33 +
 vision/google/cloud/proto/__init__.py         |    1 +
 vision/google/cloud/proto/vision/__init__.py  |    1 +
 .../google/cloud/proto/vision/v1/__init__.py  |    1 +
 .../cloud/proto/vision/v1/geometry_pb2.py     |  211 ++
 .../proto/vision/v1/geometry_pb2_grpc.py      |    3 +
 .../proto/vision/v1/image_annotator_pb2.py    | 1996 +++++++++++++++++
 .../vision/v1/image_annotator_pb2_grpc.py     |   50 +
 .../proto/vision/v1/text_annotation_pb2.py    |  742 ++++++
 .../vision/v1/text_annotation_pb2_grpc.py     |    3 +
 .../proto/vision/v1/web_detection_pb2.py      |  290 +++
 .../proto/vision/v1/web_detection_pb2_grpc.py |    3 +
 vision/google/cloud/vision/__init__.py        |   33 +-
 vision/google/cloud/vision/client.py          |    9 +
 vision/google/cloud/vision/decorators.py      |  116 +
 vision/google/cloud/vision/face.py            |    2 +-
 vision/google/cloud/vision/feature.py         |    4 +-
 vision/google/cloud/vision/geometry.py        |    4 +-
 vision/google/cloud/vision/helpers.py         |   85 +
 vision/google/cloud/vision/image.py           |    2 +-
 vision/google/cloud/vision/likelihood.py      |    2 +-
 vision/google/cloud/vision_v1/__init__.py     |   35 +
 vision/google/cloud/vision_v1/types.py        |   35 +
 vision/nox.py                                 |   53 +-
 vision/setup.py                               |   62 +-
 .../v1/test_image_annotator_client_v1.py      |   75 +
 vision/tests/system.py                        |  797 +------
 vision/tests/system_old.py                    |  744 ++++++
 vision/tests/unit/__init__.py                 |   13 -
 vision/tests/unit/test_decorators.py          |   69 +
 vision/tests/unit/test_helpers.py             |  136 ++
 112 files changed, 5649 insertions(+), 1669 deletions(-)
 delete mode 100644 docs/vision/annotations.rst
 delete mode 100644 docs/vision/batch.rst
 delete mode 100644 docs/vision/client.rst
 delete mode 100644 docs/vision/color.rst
 delete mode 100644 docs/vision/crop-hint.rst
 delete mode 100644 docs/vision/entity.rst
 delete mode 100644 docs/vision/face.rst
 delete mode 100644 docs/vision/feature.rst
 create mode 100644 docs/vision/gapic/api.rst
 create mode 100644 docs/vision/gapic/types.rst
 delete mode 100644 docs/vision/image.rst
 create mode 100644 docs/vision/index.rst
 delete mode 100644 docs/vision/safe-search.rst
 delete mode 100644 docs/vision/text.rst
 delete mode 100644 docs/vision/usage.rst
 delete mode 100644 docs/vision/web.rst
 create mode 100644 vision/google/cloud/gapic/__init__.py
 create mode 100644 vision/google/cloud/gapic/vision/__init__.py
 create mode 100644 vision/google/cloud/gapic/vision/v1/__init__.py
 create mode 100644 vision/google/cloud/gapic/vision/v1/enums.py
 create mode 100644 vision/google/cloud/gapic/vision/v1/image_annotator_client.py
 create mode 100644 vision/google/cloud/gapic/vision/v1/image_annotator_client_config.json
 create mode 100644 vision/google/cloud/proto/__init__.py
 create mode 100644 vision/google/cloud/proto/vision/__init__.py
 create mode 100644 vision/google/cloud/proto/vision/v1/__init__.py
 create mode 100644 vision/google/cloud/proto/vision/v1/geometry_pb2.py
 create mode 100644 vision/google/cloud/proto/vision/v1/geometry_pb2_grpc.py
 create mode 100644 vision/google/cloud/proto/vision/v1/image_annotator_pb2.py
 create mode 100644 vision/google/cloud/proto/vision/v1/image_annotator_pb2_grpc.py
 create mode 100644 vision/google/cloud/proto/vision/v1/text_annotation_pb2.py
 create mode 100644 vision/google/cloud/proto/vision/v1/text_annotation_pb2_grpc.py
 create mode 100644 vision/google/cloud/proto/vision/v1/web_detection_pb2.py
 create mode 100644 vision/google/cloud/proto/vision/v1/web_detection_pb2_grpc.py
 create mode 100644 vision/google/cloud/vision/decorators.py
 create mode 100644 vision/google/cloud/vision/helpers.py
 create mode 100644 vision/google/cloud/vision_v1/__init__.py
 create mode 100644 vision/google/cloud/vision_v1/types.py
 create mode 100644 vision/tests/gapic/v1/test_image_annotator_client_v1.py
 create mode 100644 vision/tests/system_old.py
 create mode 100644 vision/tests/unit/test_decorators.py
 create mode 100644 vision/tests/unit/test_helpers.py

diff --git a/.gitignore b/.gitignore
index cf78b1e3e91a9..df4fe06fa5aee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ pip-log.txt
 .nox
 .tox
 .cache
+htmlcov
 
 # Translations
 *.mo
diff --git a/bigquery/google/cloud/bigquery/client.py b/bigquery/google/cloud/bigquery/client.py
index bf0b0a31dcc03..5f0101f35de53 100644
--- a/bigquery/google/cloud/bigquery/client.py
+++ b/bigquery/google/cloud/bigquery/client.py
@@ -86,7 +86,7 @@ def __init__(self, project=None, credentials=None, _http=None):
     def list_projects(self, max_results=None, page_token=None):
         """List projects for the project associated with this client.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/projects/list
 
         :type max_results: int
@@ -111,7 +111,7 @@ def list_datasets(self, include_all=False, max_results=None,
                       page_token=None):
         """List datasets for the project associated with this client.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/datasets/list
 
         :type include_all: bool
@@ -183,7 +183,7 @@ def list_jobs(self, max_results=None, page_token=None, all_users=None,
                   state_filter=None):
         """List jobs for the project associated with this client.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/list
 
         :type max_results: int
@@ -227,7 +227,7 @@ def list_jobs(self, max_results=None, page_token=None, all_users=None,
     def load_table_from_storage(self, job_name, destination, *source_uris):
         """Construct a job for loading data into a table from CloudStorage.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load
 
         :type job_name: str
@@ -249,7 +249,7 @@ def load_table_from_storage(self, job_name, destination, *source_uris):
     def copy_table(self, job_name, destination, *sources):
         """Construct a job for copying one or more tables into another table.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.copy
 
         :type job_name: str
@@ -269,7 +269,7 @@ def copy_table(self, job_name, destination, *sources):
     def extract_table_to_storage(self, job_name, source, *destination_uris):
         """Construct a job for extracting a table into Cloud Storage files.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.extract
 
         :type job_name: str
@@ -293,7 +293,7 @@ def run_async_query(self, job_name, query,
                         udf_resources=(), query_parameters=()):
         """Construct a job for running a SQL query asynchronously.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.query
 
         :type job_name: str
diff --git a/bigquery/google/cloud/bigquery/dataset.py b/bigquery/google/cloud/bigquery/dataset.py
index f98bb95b10988..bce74ca9f3664 100644
--- a/bigquery/google/cloud/bigquery/dataset.py
+++ b/bigquery/google/cloud/bigquery/dataset.py
@@ -89,7 +89,7 @@ def __repr__(self):
 class Dataset(object):
     """Datasets are containers for tables.
 
-    See:
+    See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/datasets
 
     :type name: str
@@ -417,7 +417,7 @@ def _build_resource(self):
     def create(self, client=None):
         """API call:  create the dataset via a PUT request.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tables/insert
 
         :type client: :class:`~google.cloud.bigquery.client.Client` or
@@ -530,7 +530,7 @@ def update(self, client=None):
     def delete(self, client=None):
         """API call:  delete the dataset via a DELETE request.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tables/delete
 
         :type client: :class:`~google.cloud.bigquery.client.Client` or
@@ -544,7 +544,7 @@ def delete(self, client=None):
     def list_tables(self, max_results=None, page_token=None):
         """List tables for the project associated with this client.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tables/list
 
         :type max_results: int
diff --git a/bigquery/google/cloud/bigquery/job.py b/bigquery/google/cloud/bigquery/job.py
index c6ee642dfc7cd..4f791bdbea0c9 100644
--- a/bigquery/google/cloud/bigquery/job.py
+++ b/bigquery/google/cloud/bigquery/job.py
@@ -301,7 +301,7 @@ def _get_resource_config(cls, resource):
     def begin(self, client=None):
         """API call:  begin the job via a POST request
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/insert
 
         :type client: :class:`~google.cloud.bigquery.client.Client` or
@@ -497,57 +497,57 @@ def output_rows(self):
             return int(statistics['load']['outputRows'])
 
     allow_jagged_rows = _TypedProperty('allow_jagged_rows', bool)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.allowJaggedRows
     """
 
     allow_quoted_newlines = _TypedProperty('allow_quoted_newlines', bool)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.allowQuotedNewlines
     """
 
     create_disposition = CreateDisposition('create_disposition')
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.createDisposition
     """
 
     encoding = Encoding('encoding')
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.encoding
     """
 
     field_delimiter = _TypedProperty('field_delimiter', six.string_types)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.fieldDelimiter
     """
 
     ignore_unknown_values = _TypedProperty('ignore_unknown_values', bool)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.ignoreUnknownValues
     """
 
     max_bad_records = _TypedProperty('max_bad_records', six.integer_types)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.maxBadRecords
     """
 
     quote_character = _TypedProperty('quote_character', six.string_types)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.quote
     """
 
     skip_leading_rows = _TypedProperty('skip_leading_rows', six.integer_types)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.skipLeadingRows
     """
 
     source_format = SourceFormat('source_format')
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.sourceFormat
     """
 
     write_disposition = WriteDisposition('write_disposition')
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.writeDisposition
     """
 
@@ -672,12 +672,12 @@ def __init__(self, name, destination, sources, client):
         self._configuration = _CopyConfiguration()
 
     create_disposition = CreateDisposition('create_disposition')
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.copy.createDisposition
     """
 
     write_disposition = WriteDisposition('write_disposition')
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.copy.writeDisposition
     """
 
@@ -795,22 +795,22 @@ def __init__(self, name, source, destination_uris, client):
         self._configuration = _ExtractConfiguration()
 
     compression = Compression('compression')
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.extract.compression
     """
 
     destination_format = DestinationFormat('destination_format')
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.extract.destinationFormat
     """
 
     field_delimiter = _TypedProperty('field_delimiter', six.string_types)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.extract.fieldDelimiter
     """
 
     print_header = _TypedProperty('print_header', bool)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.extract.printHeader
     """
 
@@ -936,32 +936,32 @@ def __init__(self, name, query, client,
         self._configuration = _AsyncQueryConfiguration()
 
     allow_large_results = _TypedProperty('allow_large_results', bool)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.query.allowLargeResults
     """
 
     create_disposition = CreateDisposition('create_disposition')
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.query.createDisposition
     """
 
     default_dataset = _TypedProperty('default_dataset', Dataset)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.query.defaultDataset
     """
 
     destination = _TypedProperty('destination', Table)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.query.destinationTable
     """
 
     flatten_results = _TypedProperty('flatten_results', bool)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.query.flattenResults
     """
 
     priority = QueryPriority('priority')
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.query.priority
     """
 
@@ -970,34 +970,34 @@ def __init__(self, name, query, client,
     udf_resources = UDFResourcesProperty()
 
     use_query_cache = _TypedProperty('use_query_cache', bool)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.query.useQueryCache
     """
 
     use_legacy_sql = _TypedProperty('use_legacy_sql', bool)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/\
     reference/v2/jobs#configuration.query.useLegacySql
     """
 
     dry_run = _TypedProperty('dry_run', bool)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/\
     reference/rest/v2/jobs#configuration.dryRun
     """
 
     write_disposition = WriteDisposition('write_disposition')
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.query.writeDisposition
     """
 
     maximum_billing_tier = _TypedProperty('maximum_billing_tier', int)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.query.maximumBillingTier
     """
 
     maximum_bytes_billed = _TypedProperty('maximum_bytes_billed', int)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.query.maximumBytesBilled
     """
 
diff --git a/bigquery/google/cloud/bigquery/query.py b/bigquery/google/cloud/bigquery/query.py
index ee24d8397b736..ea704bf4a8e5f 100644
--- a/bigquery/google/cloud/bigquery/query.py
+++ b/bigquery/google/cloud/bigquery/query.py
@@ -123,7 +123,7 @@ def _require_client(self, client):
     def cache_hit(self):
         """Query results served from cache.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#cacheHit
 
         :rtype: bool or ``NoneType``
@@ -136,7 +136,7 @@ def cache_hit(self):
     def complete(self):
         """Server completed query.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#jobComplete
 
         :rtype: bool or ``NoneType``
@@ -149,7 +149,7 @@ def complete(self):
     def errors(self):
         """Errors generated by the query.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#errors
 
         :rtype: list of mapping, or ``NoneType``
@@ -162,7 +162,7 @@ def errors(self):
     def name(self):
         """Job name, generated by the back-end.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#jobReference
 
         :rtype: list of mapping, or ``NoneType``
@@ -190,7 +190,7 @@ def job(self):
     def page_token(self):
         """Token for fetching next bach of results.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#pageToken
 
         :rtype: str, or ``NoneType``
@@ -202,7 +202,7 @@ def page_token(self):
     def total_rows(self):
         """Total number of rows returned by the query.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#totalRows
 
         :rtype: int, or ``NoneType``
@@ -216,7 +216,7 @@ def total_rows(self):
     def total_bytes_processed(self):
         """Total number of bytes processed by the query.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#totalBytesProcessed
 
         :rtype: int, or ``NoneType``
@@ -230,7 +230,7 @@ def total_bytes_processed(self):
     def num_dml_affected_rows(self):
         """Total number of rows affected by a DML query.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#numDmlAffectedRows
 
         :rtype: int, or ``NoneType``
@@ -244,7 +244,7 @@ def num_dml_affected_rows(self):
     def rows(self):
         """Query results.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#rows
 
         :rtype: list of tuples of row values, or ``NoneType``
@@ -256,7 +256,7 @@ def rows(self):
     def schema(self):
         """Schema for query results.
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#schema
 
         :rtype: list of :class:`SchemaField`, or ``NoneType``
@@ -265,41 +265,41 @@ def schema(self):
         return _parse_schema_resource(self._properties.get('schema', {}))
 
     default_dataset = _TypedProperty('default_dataset', Dataset)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#defaultDataset
     """
 
     dry_run = _TypedProperty('dry_run', bool)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#dryRun
     """
 
     max_results = _TypedProperty('max_results', six.integer_types)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#maxResults
     """
 
     preserve_nulls = _TypedProperty('preserve_nulls', bool)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#preserveNulls
     """
 
     query_parameters = QueryParametersProperty()
 
     timeout_ms = _TypedProperty('timeout_ms', six.integer_types)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#timeoutMs
     """
 
     udf_resources = UDFResourcesProperty()
 
     use_query_cache = _TypedProperty('use_query_cache', bool)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#useQueryCache
     """
 
     use_legacy_sql = _TypedProperty('use_legacy_sql', bool)
-    """See:
+    """See
     https://cloud.google.com/bigquery/docs/\
     reference/v2/jobs/query#useLegacySql
     """
@@ -361,7 +361,7 @@ def _build_resource(self):
     def run(self, client=None):
         """API call:  run the query via a POST request
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query
 
         :type client: :class:`~google.cloud.bigquery.client.Client` or
@@ -382,7 +382,7 @@ def fetch_data(self, max_results=None, page_token=None, start_index=None,
                    timeout_ms=None, client=None):
         """API call:  fetch a page of query result data via a GET request
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/getQueryResults
 
         :type max_results: int
diff --git a/bigquery/google/cloud/bigquery/table.py b/bigquery/google/cloud/bigquery/table.py
index d7b80dc257739..92ebfebb2d6ec 100644
--- a/bigquery/google/cloud/bigquery/table.py
+++ b/bigquery/google/cloud/bigquery/table.py
@@ -43,7 +43,7 @@
 class Table(object):
     """Tables represent a set of rows whose values correspond to a schema.
 
-    See:
+    See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/tables
 
     :type name: str
@@ -480,7 +480,7 @@ def _build_resource(self):
     def create(self, client=None):
         """API call:  create the dataset via a PUT request
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tables/insert
 
         :type client: :class:`~google.cloud.bigquery.client.Client` or
@@ -630,7 +630,7 @@ def update(self, client=None):
     def delete(self, client=None):
         """API call:  delete the table via a DELETE request
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tables/delete
 
         :type client: :class:`~google.cloud.bigquery.client.Client` or
@@ -644,7 +644,7 @@ def delete(self, client=None):
     def fetch_data(self, max_results=None, page_token=None, client=None):
         """API call:  fetch the table data via a GET request
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tabledata/list
 
         .. note::
@@ -696,7 +696,7 @@ def insert_data(self,
                     client=None):
         """API call:  insert table data via a POST request
 
-        See:
+        See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tabledata/insertAll
 
         :type rows: list of tuples
@@ -718,7 +718,7 @@ def insert_data(self,
         :param template_suffix:
             (Optional) treat ``name`` as a template table and provide a suffix.
             BigQuery will create the table ``<name> + <template_suffix>`` based
-            on the schema of the template table. See:
+            on the schema of the template table. See
             https://cloud.google.com/bigquery/streaming-data-into-bigquery#template-tables
 
         :type client: :class:`~google.cloud.bigquery.client.Client` or
diff --git a/bigquery/tests/system.py b/bigquery/tests/system.py
index baad4a2405075..86e376a2ccb1f 100644
--- a/bigquery/tests/system.py
+++ b/bigquery/tests/system.py
@@ -59,7 +59,7 @@ def _rate_limit_exceeded(forbidden):
 # We need to wait to stay within the rate limits.
 # The alternative outcome is a 403 Forbidden response from upstream, which
 # they return instead of the more appropriate 429.
-# See: https://cloud.google.com/bigquery/quota-policy
+# See https://cloud.google.com/bigquery/quota-policy
 retry_403 = RetryErrors(Forbidden, error_predicate=_rate_limit_exceeded)
 
 
@@ -326,7 +326,7 @@ def test_insert_data_then_dump_table(self):
 
         rows = ()
 
-        # Allow for "warm up" before rows visible.  See:
+        # Allow for "warm up" before rows visible.  See
         # https://cloud.google.com/bigquery/streaming-data-into-bigquery#dataavailability
         # 8 tries -> 1 + 2 + 4 + 8 + 16 + 32 + 64 = 127 seconds
         retry = RetryResult(_has_rows, max_tries=8)
@@ -495,7 +495,7 @@ def test_load_table_from_storage_then_dump_table(self):
         def _job_done(instance):
             return instance.state in ('DONE', 'done')
 
-        # Allow for 90 seconds of "warm up" before rows visible.  See:
+        # Allow for 90 seconds of "warm up" before rows visible.  See
         # https://cloud.google.com/bigquery/streaming-data-into-bigquery#dataavailability
         # 8 tries -> 1 + 2 + 4 + 8 + 16 + 32 + 64 = 127 seconds
         retry = RetryInstanceState(_job_done, max_tries=8)
diff --git a/bigtable/tests/unit/test_row_data.py b/bigtable/tests/unit/test_row_data.py
index eed5e77c56309..51534138b66c6 100644
--- a/bigtable/tests/unit/test_row_data.py
+++ b/bigtable/tests/unit/test_row_data.py
@@ -709,7 +709,7 @@ def _generate_cell_chunks(chunk_text_pbs):
 def _parse_readrows_acceptance_tests(filename):
     """Parse acceptance tests from JSON
 
-    See:
+    See
     https://github.com/GoogleCloudPlatform/cloud-bigtable-client/blob/\
     4d3185662ca61bc9fa1bdf1ec0166f6e5ecf86c6/bigtable-client-core/src/\
     test/resources/com/google/cloud/bigtable/grpc/scanner/v2/
diff --git a/core/google/cloud/exceptions.py b/core/google/cloud/exceptions.py
index ab0ede688ef3f..32080de7ff501 100644
--- a/core/google/cloud/exceptions.py
+++ b/core/google/cloud/exceptions.py
@@ -14,7 +14,7 @@
 
 """Custom exceptions for :mod:`google.cloud` package.
 
-See: https://cloud.google.com/storage/docs/json_api/v1/status-codes
+See https://cloud.google.com/storage/docs/json_api/v1/status-codes
 """
 
 # Avoid the grpc and google.cloud.grpc collision.
@@ -48,7 +48,7 @@ class GoogleCloudError(Exception):
     code = None
     """HTTP status code.  Concrete subclasses *must* define.
 
-    See: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
+    See http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
     """
 
     def __init__(self, message, errors=()):
diff --git a/core/google/cloud/iam.py b/core/google/cloud/iam.py
index eefc084a5f5c5..49bb11266ceef 100644
--- a/core/google/cloud/iam.py
+++ b/core/google/cloud/iam.py
@@ -38,7 +38,7 @@
 class Policy(collections.MutableMapping):
     """IAM Policy
 
-    See:
+    See
     https://cloud.google.com/iam/reference/rest/v1/Policy
 
     :type etag: str
diff --git a/core/google/cloud/operation.py b/core/google/cloud/operation.py
index 8bc848e7facb1..4e700a553e4fd 100644
--- a/core/google/cloud/operation.py
+++ b/core/google/cloud/operation.py
@@ -43,7 +43,7 @@ def _compute_type_url(klass, prefix=_GOOGLE_APIS_PREFIX):
 def register_type(klass, type_url=None):
     """Register a klass as the factory for a given type URL.
 
-    :type klass: type
+    :type klass: :class:`type`
     :param klass: class to be used as a factory for the given type
 
     :type type_url: str
diff --git a/datastore/google/cloud/datastore/query.py b/datastore/google/cloud/datastore/query.py
index 726e3acc49206..2ab65064f85e1 100644
--- a/datastore/google/cloud/datastore/query.py
+++ b/datastore/google/cloud/datastore/query.py
@@ -63,14 +63,15 @@ class Query(object):
         (Optional) key of the ancestor to which this query's results are
         restricted.
 
-    :type filters: sequence of (property_name, operator, value) tuples
-    :param filters: property filters applied by this query.
+    :type filters: tuple[str, str, str]
+    :param filters: Property filters applied by this query. The sequence
+        is ``(property_name, operator, value)``.
 
     :type projection: sequence of string
     :param projection:  fields returned as part of query results.
 
     :type order: sequence of string
-    :param order:  field names used to order query results. Prepend '-'
+    :param order:  field names used to order query results. Prepend ``-``
                    to a field name to sort it in descending order.
 
     :type distinct_on: sequence of string
@@ -198,8 +199,9 @@ def ancestor(self):
     def filters(self):
         """Filters set on the query.
 
-        :rtype: sequence of (property_name, operator, value) tuples.
-        :returns: The filters set on the query.
+        :rtype: tuple[str, str, str]
+        :returns: The filters set on the query. The sequence is
+            ``(property_name, operator, value)``.
         """
         return self._filters[:]
 
diff --git a/dns/google/cloud/dns/changes.py b/dns/google/cloud/dns/changes.py
index e900cbcebd226..c393d0b23431c 100644
--- a/dns/google/cloud/dns/changes.py
+++ b/dns/google/cloud/dns/changes.py
@@ -26,7 +26,7 @@ class Changes(object):
 
     Changes are owned by a :class:`google.cloud.dns.zone.ManagedZone` instance.
 
-    See:
+    See
     https://cloud.google.com/dns/api/v1/changes
 
     :type zone: :class:`google.cloud.dns.zone.ManagedZone`
@@ -205,7 +205,7 @@ def _build_resource(self):
     def create(self, client=None):
         """API call:  create the change set via a POST request.
 
-        See:
+        See
         https://cloud.google.com/dns/api/v1/changes/create
 
         :type client: :class:`google.cloud.dns.client.Client`
diff --git a/dns/google/cloud/dns/client.py b/dns/google/cloud/dns/client.py
index fcc0bb48b72d2..1984c3d1a247b 100644
--- a/dns/google/cloud/dns/client.py
+++ b/dns/google/cloud/dns/client.py
@@ -57,7 +57,7 @@ def __init__(self, project=None, credentials=None, _http=None):
     def quotas(self):
         """Return DNS quotas for the project associated with this client.
 
-        See:
+        See
         https://cloud.google.com/dns/api/v1/projects/get
 
         :rtype: mapping
@@ -74,7 +74,7 @@ def quotas(self):
     def list_zones(self, max_results=None, page_token=None):
         """List zones for the project associated with this client.
 
-        See:
+        See
         https://cloud.google.com/dns/api/v1/managedZones/list
 
         :type max_results: int
diff --git a/dns/google/cloud/dns/resource_record_set.py b/dns/google/cloud/dns/resource_record_set.py
index 994dcf01ca4d9..458625f1b4bd6 100644
--- a/dns/google/cloud/dns/resource_record_set.py
+++ b/dns/google/cloud/dns/resource_record_set.py
@@ -20,7 +20,7 @@ class ResourceRecordSet(object):
 
     RRS are owned by a :class:`google.cloud.dns.zone.ManagedZone` instance.
 
-    See:
+    See
     https://cloud.google.com/dns/api/v1/resourceRecordSets
 
     :type name: str
diff --git a/dns/google/cloud/dns/zone.py b/dns/google/cloud/dns/zone.py
index 3eecf079bccf4..3c589d493311e 100644
--- a/dns/google/cloud/dns/zone.py
+++ b/dns/google/cloud/dns/zone.py
@@ -26,7 +26,7 @@
 class ManagedZone(object):
     """ManagedZones are containers for DNS resource records.
 
-    See:
+    See
     https://cloud.google.com/dns/api/v1/managedZones
 
     :type name: str
@@ -152,7 +152,7 @@ def name_server_set(self):
 
         Most users will leave this blank.
 
-        See:
+        See
         https://cloud.google.com/dns/api/v1/managedZones#nameServerSet
 
         :rtype: str, or ``NoneType``
@@ -250,7 +250,7 @@ def _build_resource(self):
     def create(self, client=None):
         """API call:  create the zone via a PUT request
 
-        See:
+        See
         https://cloud.google.com/dns/api/v1/managedZones/create
 
         :type client: :class:`google.cloud.dns.client.Client`
@@ -308,7 +308,7 @@ def reload(self, client=None):
     def delete(self, client=None):
         """API call:  delete the zone via a DELETE request
 
-        See:
+        See
         https://cloud.google.com/dns/api/v1/managedZones/delete
 
         :type client: :class:`google.cloud.dns.client.Client`
@@ -323,7 +323,7 @@ def list_resource_record_sets(self, max_results=None, page_token=None,
                                   client=None):
         """List resource record sets for this zone.
 
-        See:
+        See
         https://cloud.google.com/dns/api/v1/resourceRecordSets/list
 
         :type max_results: int
@@ -357,7 +357,7 @@ def list_resource_record_sets(self, max_results=None, page_token=None,
     def list_changes(self, max_results=None, page_token=None, client=None):
         """List change sets for this zone.
 
-        See:
+        See
         https://cloud.google.com/dns/api/v1/resourceRecordSets/list
 
         :type max_results: int
diff --git a/docs/bigquery/snippets.py b/docs/bigquery/snippets.py
index 204d7dc3a5aa6..6e395add09fc3 100644
--- a/docs/bigquery/snippets.py
+++ b/docs/bigquery/snippets.py
@@ -336,7 +336,7 @@ def table_update(client, to_delete):
 
 
 def _warm_up_inserted_table_data(table):
-    # Allow for 90 seconds of "warm up" before rows visible.  See:
+    # Allow for 90 seconds of "warm up" before rows visible.  See
     # https://cloud.google.com/bigquery/streaming-data-into-bigquery#dataavailability
     rows = ()
     counter = 18
diff --git a/docs/conf.py b/docs/conf.py
index dd50c4807e365..89c2cb7a3d3bc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,6 +51,7 @@
     'sphinx.ext.autosummary',
     'sphinx.ext.doctest',
     'sphinx.ext.intersphinx',
+    'sphinx.ext.napoleon',
     'sphinx.ext.todo',
     'sphinx.ext.viewcode',
 ]
@@ -244,6 +245,12 @@
 #latex_domain_indices = True
 
 
+# -- Options for warnings ------------------------------------------------------
+
+
+suppress_warnings = []
+
+
 # -- Options for manual page output --------------------------------------------
 
 # One entry per manual page. List of tuples
@@ -285,9 +292,11 @@
 # Refer to the Python standard library and the oauth2client and
 # httplib2 libraries.
 intersphinx_mapping = {
+    'google-auth': ('https://google-auth.readthedocs.io/en/stable', None),
+    'google-gax': ('https://gax-python.readthedocs.io/en/latest/', None),
+    'grpc': ('http://www.grpc.io/grpc/python/', None),
     'httplib2': ('http://httplib2.readthedocs.io/en/latest/', None),
-    'oauth2client': ('http://oauth2client.readthedocs.io/en/latest', None),
     'pandas': ('http://pandas.pydata.org/pandas-docs/stable/', None),
-    'python': ('https://docs.python.org/2', None),
-    'google-auth': ('https://google-auth.readthedocs.io/en/stable', None),
+    'python': ('https://docs.python.org/3', None),
+    'oauth2client': ('http://oauth2client.readthedocs.io/en/latest', None),
 }
diff --git a/docs/index.rst b/docs/index.rst
index 88a39b4c9a945..3402e3e629fef 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -18,7 +18,7 @@
   logging/usage
   storage/client
   translate/usage
-  vision/usage
+  vision/index
 
 Google Cloud Client Library for Python
 ======================================
diff --git a/docs/vision/annotations.rst b/docs/vision/annotations.rst
deleted file mode 100644
index 57ac2acbe8069..0000000000000
--- a/docs/vision/annotations.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Vision Annotations
-==================
-
-.. automodule:: google.cloud.vision.annotations
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/vision/batch.rst b/docs/vision/batch.rst
deleted file mode 100644
index 38d4ec340c471..0000000000000
--- a/docs/vision/batch.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Vision Batch
-============
-
-Batch
-~~~~~
-
-.. automodule:: google.cloud.vision.batch
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/vision/client.rst b/docs/vision/client.rst
deleted file mode 100644
index 36977d9729312..0000000000000
--- a/docs/vision/client.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Vision Client
-=============
-
-Client
-~~~~~~
-
-.. automodule:: google.cloud.vision.client
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/vision/color.rst b/docs/vision/color.rst
deleted file mode 100644
index f2a9a53f1d8a3..0000000000000
--- a/docs/vision/color.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Vision Image Properties
-=======================
-
-Image Properties Annotation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: google.cloud.vision.color
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/vision/crop-hint.rst b/docs/vision/crop-hint.rst
deleted file mode 100644
index 14be33de2761c..0000000000000
--- a/docs/vision/crop-hint.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Vision Crop Hint
-================
-
-Crop Hint
-~~~~~~~~~
-
-.. automodule:: google.cloud.vision.crop_hint
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/vision/entity.rst b/docs/vision/entity.rst
deleted file mode 100644
index 7c5145f54d7d1..0000000000000
--- a/docs/vision/entity.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Vision Entity
-=============
-
-Entity
-~~~~~~
-
-.. automodule:: google.cloud.vision.entity
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/vision/face.rst b/docs/vision/face.rst
deleted file mode 100644
index 56f5413991322..0000000000000
--- a/docs/vision/face.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Vision Face
-===========
-
-Face
-~~~~
-
-.. automodule:: google.cloud.vision.face
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/vision/feature.rst b/docs/vision/feature.rst
deleted file mode 100644
index 325b0caad717b..0000000000000
--- a/docs/vision/feature.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Vision Feature
-==============
-
-Feature
-~~~~~~~
-
-.. automodule:: google.cloud.vision.feature
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/vision/gapic/api.rst b/docs/vision/gapic/api.rst
new file mode 100644
index 0000000000000..6a5aca57a3b2a
--- /dev/null
+++ b/docs/vision/gapic/api.rst
@@ -0,0 +1,6 @@
+Vision Client API
+=================
+
+.. automodule:: google.cloud.vision_v1
+  :members:
+  :inherited-members:
diff --git a/docs/vision/gapic/types.rst b/docs/vision/gapic/types.rst
new file mode 100644
index 0000000000000..136dfde585767
--- /dev/null
+++ b/docs/vision/gapic/types.rst
@@ -0,0 +1,5 @@
+Vision Client Types
+===================
+
+.. automodule:: google.cloud.vision_v1.types
+  :members:
diff --git a/docs/vision/image.rst b/docs/vision/image.rst
deleted file mode 100644
index 491097c3ff31b..0000000000000
--- a/docs/vision/image.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-Vision Image
-============
-
-Image
-~~~~~
-
-.. automodule:: google.cloud.vision.image
-  :members:
-  :undoc-members:
-  :show-inheritance:
-
-Geometry
-~~~~~~~~
-
-.. automodule:: google.cloud.vision.geometry
-  :members:
-  :undoc-members:
-  :show-inheritance:
-
-Likelihood
-~~~~~~~~~~
-
-.. automodule:: google.cloud.vision.likelihood
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/vision/index.rst b/docs/vision/index.rst
new file mode 100644
index 0000000000000..49f90d502d46c
--- /dev/null
+++ b/docs/vision/index.rst
@@ -0,0 +1,131 @@
+######
+Vision
+######
+
+The Google Cloud `Vision`_ (`Vision API docs`_) API enables developers to
+understand the content of an image by encapsulating powerful machine
+learning models in an easy to use REST API. It quickly classifies images
+into thousands of categories (e.g., "sailboat", "lion", "Eiffel Tower"),
+detects individual objects and faces within images, and finds and reads
+printed words contained within images. You can build metadata on your
+image catalog, moderate offensive content, or enable new marketing
+scenarios through image sentiment analysis. Analyze images uploaded
+in the request or integrate with your image storage on Google Cloud
+Storage.
+
+.. _Vision: https://cloud.google.com/vision/
+.. _Vision API docs: https://cloud.google.com/vision/reference/rest/
+
+
+********************************
+Authentication and Configuration
+********************************
+
+- For an overview of authentication in ``google-cloud-python``,
+  see :doc:`/core/auth`.
+
+- In addition to any authentication configuration, you should also set the
+  :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd
+  like to interact with. If the :envvar:`GOOGLE_CLOUD_PROJECT` environment
+  variable is not present, the project ID from JSON file credentials is used.
+
+  If you are using Google App Engine or Google Compute Engine
+  this will be detected automatically.
+
+- After configuring your environment, create a
+  :class:`~google.cloud.vision.client.Client`.
+
+.. code-block:: python
+
+     >>> from google.cloud import vision
+     >>> client = vision.ImageAnnotatorClient()
+
+or pass in ``credentials`` and ``project`` explicitly.
+
+.. code-block:: python
+
+     >>> from google.cloud import vision
+     >>> client = vision.Client(project='my-project', credentials=creds)
+
+
+*****************
+Annotate an Image
+*****************
+
+You can call the :meth:`annotate_image` method directly:
+
+.. code-block:: python
+
+    >>> from google.cloud import vision
+    >>> client = vision.ImageAnnotatorClient()
+    >>> response = client.annotate_image({
+    ...   'image': {'source': {'image_uri': 'gs://my-test-bucket/image.jpg'}},
+    ...   'features': [{'type': vision.enums.Feature.Type.FACE_DETECTOIN}],
+    ... })
+    >>> len(response.annotations)
+    2
+    >>> for face in response.annotations[0].faces:
+    ...     print(face.joy)
+    Likelihood.VERY_LIKELY
+    Likelihood.VERY_LIKELY
+    Likelihood.VERY_LIKELY
+    >>> for logo in response.annotations[0].logos:
+    ...     print(logo.description)
+    'google'
+    'github'
+
+
+************************
+Single-feature Shortcuts
+************************
+
+If you are only requesting a single feature, you may find it easier to ask
+for it using our direct methods:
+
+.. code-block:: python
+
+    >>> from google.cloud import vision
+    >>> client = vision.ImageAnnotatorClient()
+    >>> response = client.face_detection({
+    ...   'source': {'image_uri': 'gs://my-test-bucket/image.jpg'},
+    ... })
+    >>> len(response.annotations)
+    1
+    >>> for face in resposne.annotations[0].faces:
+    ...     print(face.joy)
+    Likelihood.VERY_LIKELY
+    Likelihood.VERY_LIKELY
+    Likelihood.VERY_LIKELY
+
+
+****************
+No results found
+****************
+
+If no results for the detection performed can be extracted from the image, then
+an empty list is returned. This behavior is similiar with all detection types.
+
+
+Example with :meth:`~google.cloud.vision.ImageAnnotatorClient.logo_detection`:
+
+.. code-block:: python
+
+    >>> from google.cloud import vision
+    >>> client = vision.ImageAnnotatorClient()
+    >>> with open('./image.jpg', 'rb') as image_file:
+    ...     content = image_file.read()
+    >>> response = client.logo_detection({
+    ...     'content': content,
+    ... })
+    >>> len(response.annotations)
+    0
+
+*************
+API Reference
+*************
+
+.. toctree::
+  :maxdepth: 2
+
+  gapic/api
+  gapic/types
diff --git a/docs/vision/safe-search.rst b/docs/vision/safe-search.rst
deleted file mode 100644
index 8f84bc5a9d192..0000000000000
--- a/docs/vision/safe-search.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Vision Safe Search
-==================
-
-Safe Search Annotation
-~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: google.cloud.vision.safe_search
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/vision/text.rst b/docs/vision/text.rst
deleted file mode 100644
index 85f162494a42c..0000000000000
--- a/docs/vision/text.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Vision Full Text
-================
-
-Full Text Annotation
-~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: google.cloud.vision.text
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/vision/usage.rst b/docs/vision/usage.rst
deleted file mode 100644
index 07775aaef9a90..0000000000000
--- a/docs/vision/usage.rst
+++ /dev/null
@@ -1,414 +0,0 @@
-######
-Vision
-######
-
-.. toctree::
-  :maxdepth: 2
-  :hidden:
-
-  annotations
-  batch
-  client
-  color
-  crop-hint
-  entity
-  feature
-  face
-  image
-  safe-search
-  text
-  web
-
-********************************
-Authentication and Configuration
-********************************
-
-- For an overview of authentication in ``google-cloud-python``,
-  see :doc:`/core/auth`.
-
-- In addition to any authentication configuration, you should also set the
-  :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd
-  like to interact with. If the GOOGLE_CLOUD_PROJECT environment variable is
-  not present, the project ID from JSON file credentials is used.
-
-  If you are using Google App Engine or Google Compute Engine
-  this will be detected automatically.
-
-- After configuring your environment, create a
-  :class:`~google.cloud.vision.client.Client`.
-
-.. code-block:: python
-
-     >>> from google.cloud import vision
-     >>> client = vision.Client()
-
-or pass in ``credentials`` and ``project`` explicitly.
-
-.. code-block:: python
-
-     >>> from google.cloud import vision
-     >>> client = vision.Client(project='my-project', credentials=creds)
-
-
-*****************************************************
-Creating an :class:`~google.cloud.vision.image.Image`
-*****************************************************
-
-The :class:`~google.cloud.vision.image.Image` class is used to load image
-data from sources such as a Google Cloud Storage URI, raw bytes, or a file.
-
-
-From a Google Cloud Storage URI
-===============================
-
-.. code-block:: python
-
-    >>> from google.cloud import vision
-    >>> client = vision.Client()
-    >>> image = client.image(source_uri='gs://my-test-bucket/image.jpg')
-
-
-From a filename
-===============
-
-.. code-block:: python
-
-    >>> image = client.image(filename='image.jpg')
-
-From raw bytes
-==============
-
-.. code-block:: python
-
-    >>> with open('./image.jpg', 'rb') as image_file:
-    ...     bytes_image = client.image(content=image_file.read())
-
-
-****************
-Manual Detection
-****************
-
-You can call the detection method manually.
-
-.. code-block:: python
-
-    >>> from google.cloud import vision
-    >>> from google.cloud.vision.feature import Feature
-    >>> from google.cloud.vision.feature import FeatureTypes
-    >>> client = vision.Client()
-    >>> image = client.image(source_uri='gs://my-test-bucket/image.jpg')
-    >>> features = [Feature(FeatureTypes.FACE_DETECTION, 5),
-    ...             Feature(FeatureTypes.LOGO_DETECTION, 3)]
-    >>> annotations = image.detect(features)
-    >>> len(annotations)
-    2
-    >>> for face in annotations[0].faces:
-    ...     print(face.joy)
-    Likelihood.VERY_LIKELY
-    Likelihood.VERY_LIKELY
-    Likelihood.VERY_LIKELY
-    >>> for logo in annotations[0].logos:
-    ...     print(logo.description)
-    'google'
-    'github'
-
-
-**********
-Crop Hints
-**********
-
-:meth:`~google.cloud.vision.image.Image.detect_crop_hints` will attempt to find
-boundaries that contain interesting data which can be used to crop an image.
-
-.. code-block:: python
-
-    >>> from google.cloud import vision
-    >>> client = vision.Client()
-    >>> image = client.image(source_uri='gs://my-test-bucket/image.jpg')
-    >>> crop_hints = image.detect_crop_hints(aspect_ratios=[1.3333], limit=2)
-    >>> first_hint = crop_hints[0]
-    >>> first_hint.bounds.vertices[0].x_coordinate
-    77
-    >>> first_hint.bounds.vertices[0].y_coordinate
-    102
-    >>> first_hint.confidence
-    0.5
-    >>> first_hint.importance_fraction
-    1.22000002861
-
-
-**************
-Face Detection
-**************
-
-:meth:`~google.cloud.vision.image.Image.detect_faces` will search for faces in
-an image and return the coordinates in the image of each `landmark type`_ that
-was detected.
-
-.. _landmark type: https://cloud.google.com/vision/docs/reference/rest/v1/images/annotate#type_1
-
-.. code-block:: python
-
-    >>> from google.cloud import vision
-    >>> client = vision.Client()
-    >>> image = client.image(source_uri='gs://my-test-bucket/image.jpg')
-    >>> faces = image.detect_faces(limit=10)
-    >>> first_face = faces[0]
-    >>> first_face.landmarks.left_eye.landmark_type
-    LandmarkTypes.LEFT_EYE
-    >>> first_face.landmarks.left_eye.position.x_coordinate
-    1301.2404
-    >>> first_face.detection_confidence
-    0.9863683
-    >>> first_face.joy
-    Likelihood.VERY_UNLIKELY
-    >>> first_face.anger
-    Likelihood.VERY_UNLIKELY
-
-
-***************
-Label Detection
-***************
-
-:meth:`~google.cloud.vision.image.Image.detect_labels` will attempt to label
-objects in an image. If there is a car, person and a dog in the image, label
-detection will attempt to identify those objects and score the level of
-certainty from ``0.0 to 1.0``.
-
-.. code-block:: python
-
-    >>> from google.cloud import vision
-    >>> client = vision.Client()
-    >>> image = client.image(source_uri='gs://my-storage-bucket/image.jpg')
-    >>> labels = image.detect_labels(limit=3)
-    >>> labels[0].description
-    'automobile'
-    >>> labels[0].score
-    0.9863683
-
-
-******************
-Landmark Detection
-******************
-
-:meth:`~google.cloud.vision.image.Image.detect_landmarks` will attempt to
-detect landmarks such as "Mount Rushmore" and the "Sydney Opera House". The API
-will also provide their known geographical locations if available.
-
-.. code-block:: python
-
-    >>> from google.cloud import vision
-    >>> client = vision.Client()
-    >>> with open('./image.jpg', 'rb') as image_file:
-    ...     image = client.image(content=image_file.read())
-    >>> landmarks = image.detect_landmarks()
-    >>> landmarks[0].description
-    'Sydney Opera House'
-    >>> landmarks[0].locations[0].latitude
-    -33.857123
-    >>> landmarks[0].locations[0].longitude
-    151.213921
-    >>> landmarks[0].bounds.vertices[0].x_coordinate
-    78
-    >>> landmarks[0].bounds.vertices[0].y_coordinate
-    162
-
-
-**************
-Logo Detection
-**************
-
-With :meth:`~google.cloud.vision.image.Image.detect_logos`, you can identify
-brand logos in an image. Their shape and location in the image can be found by
-iterating through the detected logo's ``vertices``.
-
-.. code-block:: python
-
-    >>> from google.cloud import vision
-    >>> client = vision.Client()
-    >>> with open('./image.jpg', 'rb') as image_file:
-    ...     image = client.image(content=image_file.read())
-    >>> logos = image.detect_logos(limit=3)
-    >>> print(len(logos))
-    3
-    >>> first_logo = logos[0]
-    >>> first_logo.description
-    'Google'
-    >>> first_logo.score
-    0.9795432
-    >>> print(len(first_logo.bounds.vertices))
-    4
-    >>> first_logo.bounds.vertices[0].x_coordinate
-    78
-    >>> first_logo.bounds.vertices[0].y_coordinate
-    62
-
-
-*********************
-Safe Search Detection
-*********************
-
-:meth:`~google.cloud.vision.image.Image.detect_safe_search` will try to
-categorize the entire contents of the image under four categories.
-
-- adult: Represents the likelihood that the image contains adult content.
-- spoof: The likelihood that an obvious modification was made to the image's
-  canonical version to make it appear funny or offensive.
-- medical: Likelihood this is a medical image.
-- violence: Violence likelihood.
-
-.. code-block:: python
-
-    >>> from google.cloud import vision
-    >>> client = vision.Client()
-    >>> with open('./image.jpg', 'rb') as image_file:
-    ...     image = client.image(content=image_file.read())
-    >>> safe_search = image.detect_safe_search()
-    >>> safe_search.adult
-    Likelihood.VERY_UNLIKELY
-    >>> safe_search.spoof
-    Likelihood.POSSIBLE
-    >>> safe_search.medical
-    Likelihood.VERY_LIKELY
-    >>> safe_search.violence
-    Likelihood.LIKELY
-
-
-**************
-Text Detection
-**************
-
-:meth:`~google.cloud.vision.image.Image.detect_text` performs OCR to find text
-in an image.
-
-.. code-block:: python
-
-    >>> from google.cloud import vision
-    >>> client = vision.Client()
-    >>> with open('./image.jpg', 'rb') as image_file:
-    ...     image = client.image(content=image_file.read())
-    >>> texts = image.detect_text()
-    >>> texts[0].locale
-    'en'
-    >>> texts[0].description
-    'some text in the image'
-    >>> texts[1].description
-    'some other text in the image'
-
-
-****************
-Image Properties
-****************
-
-:meth:`~google.cloud.vision.image.Image.detect_properties` will process the
-image and determine the dominant colors in the image.
-
-.. code-block:: python
-
-    >>> from google.cloud import vision
-    >>> client = vision.Client()
-    >>> with open('./image.jpg', 'rb') as image_file:
-    ...     image = client.image(content=image_file.read())
-    >>> properties = image.detect_properties()
-    >>> colors = properties.colors
-    >>> first_color = colors[0]
-    >>> first_color.color.red
-    244.0
-    >>> first_color.color.blue
-    134.0
-    >>> first_color.score
-    0.65519291
-    >>> first_color.pixel_fraction
-    0.758658
-
-
-*********************
-Batch image detection
-*********************
-
-Multiple images can be processed with a single request by passing
-:class:`~google.cloud.vision.image.Image` to
-:meth:`~google.cloud.vision.client.Client.batch()`.
-
-.. code-block:: python
-
-    >>> from google.cloud import vision
-    >>> from google.cloud.vision.feature import Feature
-    >>> from google.cloud.vision.feature import FeatureTypes
-    >>>
-    >>> client = vision.Client()
-    >>> batch = client.batch()
-    >>>
-    >>> image_one = client.image(source_uri='gs://my-test-bucket/image1.jpg')
-    >>> image_two = client.image(source_uri='gs://my-test-bucket/image2.jpg')
-    >>> face_feature = Feature(FeatureTypes.FACE_DETECTION, 2)
-    >>> logo_feature = Feature(FeatureTypes.LOGO_DETECTION, 2)
-    >>> batch.add_image(image_one, [face_feature, logo_feature])
-    >>> batch.add_image(image_two, [logo_feature])
-    >>> results = batch.detect()
-    >>> for image in results:
-    ...     for face in image.faces:
-    ...         print('=' * 40)
-    ...         print(face.joy)
-    ========================================
-    <Likelihood.VERY_LIKELY: 'VERY_LIKELY'>
-    ========================================
-    <Likelihood.VERY_LIKELY: 'POSSIBLE'>
-
-
-*************
-Web Detection
-*************
-
-:meth:`~google.cloud.vision.image.Image.detect_web` search for images on the
-web that are similar to the image you have.
-
-.. code-block:: python
-
-    >>> from google.cloud import vision
-    >>> client = vision.Client()
-    >>> with open('./image.jpg', 'rb') as image_file:
-    ...     image = client.image(content=image_file.read())
-    >>> web_images = image.detect_web(limit=2)
-    >>> for full_matching_image in web_images.full_matching_images:
-    ...     print('=' * 20)
-    ...     print(full_matching_image.url)
-    ====================
-    'https://example.com/image.jpg'
-    >>> for partial_matching_image in web_images.partial_matching_images:
-    ...     print('=' * 20)
-    ...     print(partial_matching_image.url)
-    ====================
-    >>> for page_with_matching_images in web_images.pages_with_matching_images:
-    ...     print('=' * 20)
-    ...     print(page_with_matching_images.url)
-    ====================
-    'https://example.com/portfolio/'
-    >>> for entity in web_images.web_entities:
-    ...     print('=' * 20)
-    ...     print(entity.description)
-    ====================
-    'Mount Rushmore National Memorial'
-    ====================
-    'Landmark'
-
-
-****************
-No results found
-****************
-
-If no results for the detection performed can be extracted from the image, then
-an empty list is returned. This behavior is similiar with all detection types.
-
-
-Example with :meth:`~google.cloud.vision.image.Image.detect_logos`:
-
-.. code-block:: python
-
-    >>> from google.cloud import vision
-    >>> client = vision.Client()
-    >>> with open('./image.jpg', 'rb') as image_file:
-    ...     image = client.image(content=image_file.read())
-    >>> logos = image.detect_logos(limit=3)
-    >>> logos
-    []
diff --git a/docs/vision/web.rst b/docs/vision/web.rst
deleted file mode 100644
index e4df464c12c7f..0000000000000
--- a/docs/vision/web.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Vision Web Annotations
-======================
-
-Web Annotations
-~~~~~~~~~~~~~~~
-
-.. automodule:: google.cloud.vision.web
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/error_reporting/google/cloud/error_reporting/client.py b/error_reporting/google/cloud/error_reporting/client.py
index 18138826fc373..77c2da631f20e 100644
--- a/error_reporting/google/cloud/error_reporting/client.py
+++ b/error_reporting/google/cloud/error_reporting/client.py
@@ -149,7 +149,7 @@ def __init__(self, project=None,
     def report_errors_api(self):
         """Helper for logging-related API calls.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/entries
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.logs
 
diff --git a/logging/google/cloud/logging/_gax.py b/logging/google/cloud/logging/_gax.py
index d1e6196bbebb5..3fb648d98f7fc 100644
--- a/logging/google/cloud/logging/_gax.py
+++ b/logging/google/cloud/logging/_gax.py
@@ -68,7 +68,7 @@ def list_entries(self, projects, filter_='', order_by='',
 
         :type filter_: str
         :param filter_:
-            a filter expression. See:
+            a filter expression. See
             https://cloud.google.com/logging/docs/view/advanced_filters
 
         :type order_by: str
@@ -193,7 +193,7 @@ def list_sinks(self, project, page_size=0, page_token=None):
     def sink_create(self, project, sink_name, filter_, destination):
         """API call:  create a sink resource.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.sinks/create
 
         :type project: str
@@ -346,7 +346,7 @@ def list_metrics(self, project, page_size=0, page_token=None):
     def metric_create(self, project, metric_name, filter_, description):
         """API call:  create a metric resource.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.metrics/create
 
         :type project: str
diff --git a/logging/google/cloud/logging/_http.py b/logging/google/cloud/logging/_http.py
index 0838e7fe42acc..7ca5c457c25df 100644
--- a/logging/google/cloud/logging/_http.py
+++ b/logging/google/cloud/logging/_http.py
@@ -52,7 +52,7 @@ class Connection(_http.JSONConnection):
 class _LoggingAPI(object):
     """Helper mapping logging-related APIs.
 
-    See:
+    See
     https://cloud.google.com/logging/docs/reference/v2/rest/v2/entries
     https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.logs
 
@@ -68,7 +68,7 @@ def list_entries(self, projects, filter_=None, order_by=None,
                      page_size=None, page_token=None):
         """Return a page of log entry resources.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/entries/list
 
         :type projects: list of strings
@@ -77,7 +77,7 @@ def list_entries(self, projects, filter_=None, order_by=None,
 
         :type filter_: str
         :param filter_:
-            a filter expression. See:
+            a filter expression. See
             https://cloud.google.com/logging/docs/view/advanced_filters
 
         :type order_by: str
@@ -127,7 +127,7 @@ def write_entries(self, entries, logger_name=None, resource=None,
                       labels=None):
         """API call:  log an entry resource via a POST request
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/entries/write
 
         :type entries: sequence of mapping
@@ -161,7 +161,7 @@ def write_entries(self, entries, logger_name=None, resource=None,
     def logger_delete(self, project, logger_name):
         """API call:  delete all entries in a logger via a DELETE request
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.logs/delete
 
         :type project: str
@@ -177,7 +177,7 @@ def logger_delete(self, project, logger_name):
 class _SinksAPI(object):
     """Helper mapping sink-related APIs.
 
-    See:
+    See
     https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.sinks
 
     :type client: :class:`~google.cloud.logging.client.Client`
@@ -190,7 +190,7 @@ def __init__(self, client):
     def list_sinks(self, project, page_size=None, page_token=None):
         """List sinks for the project associated with this client.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.sinks/list
 
         :type project: str
@@ -224,7 +224,7 @@ def list_sinks(self, project, page_size=None, page_token=None):
     def sink_create(self, project, sink_name, filter_, destination):
         """API call:  create a sink resource.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.sinks/create
 
         :type project: str
@@ -252,7 +252,7 @@ def sink_create(self, project, sink_name, filter_, destination):
     def sink_get(self, project, sink_name):
         """API call:  retrieve a sink resource.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.sinks/get
 
         :type project: str
@@ -270,7 +270,7 @@ def sink_get(self, project, sink_name):
     def sink_update(self, project, sink_name, filter_, destination):
         """API call:  update a sink resource.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.sinks/update
 
         :type project: str
@@ -301,7 +301,7 @@ def sink_update(self, project, sink_name, filter_, destination):
     def sink_delete(self, project, sink_name):
         """API call:  delete a sink resource.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.sinks/delete
 
         :type project: str
@@ -317,7 +317,7 @@ def sink_delete(self, project, sink_name):
 class _MetricsAPI(object):
     """Helper mapping sink-related APIs.
 
-    See:
+    See
     https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.metrics
 
     :type client: :class:`~google.cloud.logging.client.Client`
@@ -330,7 +330,7 @@ def __init__(self, client):
     def list_metrics(self, project, page_size=None, page_token=None):
         """List metrics for the project associated with this client.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.metrics/list
 
         :type project: str
@@ -364,7 +364,7 @@ def list_metrics(self, project, page_size=None, page_token=None):
     def metric_create(self, project, metric_name, filter_, description=None):
         """API call:  create a metric resource.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.metrics/create
 
         :type project: str
@@ -391,7 +391,7 @@ def metric_create(self, project, metric_name, filter_, description=None):
     def metric_get(self, project, metric_name):
         """API call:  retrieve a metric resource.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.metrics/get
 
         :type project: str
@@ -409,7 +409,7 @@ def metric_get(self, project, metric_name):
     def metric_update(self, project, metric_name, filter_, description):
         """API call:  update a metric resource.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.metrics/update
 
         :type project: str
@@ -439,7 +439,7 @@ def metric_update(self, project, metric_name, filter_, description):
     def metric_delete(self, project, metric_name):
         """API call:  delete a metric resource.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.metrics/delete
 
         :type project: str
diff --git a/logging/google/cloud/logging/client.py b/logging/google/cloud/logging/client.py
index cb6d9d70fb4f5..ca698dde99def 100644
--- a/logging/google/cloud/logging/client.py
+++ b/logging/google/cloud/logging/client.py
@@ -115,7 +115,7 @@ def __init__(self, project=None, credentials=None,
     def logging_api(self):
         """Helper for logging-related API calls.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/entries
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.logs
         """
@@ -130,7 +130,7 @@ def logging_api(self):
     def sinks_api(self):
         """Helper for log sink-related API calls.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.sinks
         """
         if self._sinks_api is None:
@@ -144,7 +144,7 @@ def sinks_api(self):
     def metrics_api(self):
         """Helper for log metric-related API calls.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.metrics
         """
         if self._metrics_api is None:
@@ -169,7 +169,7 @@ def list_entries(self, projects=None, filter_=None, order_by=None,
                      page_size=None, page_token=None):
         """Return a page of log entries.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/entries/list
 
         :type projects: list of strings
@@ -178,7 +178,7 @@ def list_entries(self, projects=None, filter_=None, order_by=None,
 
         :type filter_: str
         :param filter_:
-            a filter expression. See:
+            a filter expression. See
             https://cloud.google.com/logging/docs/view/advanced_filters
 
         :type order_by: str
@@ -231,7 +231,7 @@ def sink(self, name, filter_=None, destination=None):
     def list_sinks(self, page_size=None, page_token=None):
         """List sinks for the project associated with this client.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.sinks/list
 
         :type page_size: int
@@ -276,7 +276,7 @@ def metric(self, name, filter_=None, description=''):
     def list_metrics(self, page_size=None, page_token=None):
         """List metrics for the project associated with this client.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.metrics/list
 
         :type page_size: int
diff --git a/logging/google/cloud/logging/entries.py b/logging/google/cloud/logging/entries.py
index 24c8392eba147..d39092c3e324a 100644
--- a/logging/google/cloud/logging/entries.py
+++ b/logging/google/cloud/logging/entries.py
@@ -137,7 +137,7 @@ def from_api_repr(cls, resource, client, loggers=None):
 class TextEntry(_BaseEntry):
     """Entry created with ``textPayload``.
 
-    See:
+    See
     https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry
     """
     _PAYLOAD_KEY = 'textPayload'
@@ -146,7 +146,7 @@ class TextEntry(_BaseEntry):
 class StructEntry(_BaseEntry):
     """Entry created with ``jsonPayload``.
 
-    See:
+    See
     https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry
     """
     _PAYLOAD_KEY = 'jsonPayload'
@@ -155,7 +155,7 @@ class StructEntry(_BaseEntry):
 class ProtobufEntry(_BaseEntry):
     """Entry created with ``protoPayload``.
 
-    See:
+    See
     https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry
 
     :type payload: str, dict or any_pb2.Any
diff --git a/logging/google/cloud/logging/handlers/app_engine.py b/logging/google/cloud/logging/handlers/app_engine.py
index c7394f32262d1..7011819f8a2fe 100644
--- a/logging/google/cloud/logging/handlers/app_engine.py
+++ b/logging/google/cloud/logging/handlers/app_engine.py
@@ -38,7 +38,7 @@ class AppEngineHandler(CloudLoggingHandler):
     :param client: The authenticated Google Cloud Logging client for this
                    handler to use.
 
-    :type transport: type
+    :type transport: :class:`type`
     :param transport: The transport class. It should be a subclass
                       of :class:`.Transport`. If unspecified,
                       :class:`.BackgroundThreadTransport` will be used.
diff --git a/logging/google/cloud/logging/handlers/handlers.py b/logging/google/cloud/logging/handlers/handlers.py
index 2269c2858f33a..97afde9f87fbe 100644
--- a/logging/google/cloud/logging/handlers/handlers.py
+++ b/logging/google/cloud/logging/handlers/handlers.py
@@ -46,7 +46,7 @@ class CloudLoggingHandler(logging.StreamHandler):
                  to 'python'. The name of the Python logger will be represented
                  in the ``python_logger`` field.
 
-    :type transport: type
+    :type transport: :class:`type`
     :param transport: Class for creating new transport objects. It should
                       extend from the base :class:`.Transport` type and
                       implement :meth`.Transport.send`. Defaults to
@@ -91,7 +91,7 @@ def emit(self, record):
 
         Overrides the default emit behavior of ``StreamHandler``.
 
-        See: https://docs.python.org/2/library/logging.html#handler-objects
+        See https://docs.python.org/2/library/logging.html#handler-objects
 
         :type record: :class:`logging.LogRecord`
         :param record: The record to be logged.
diff --git a/logging/google/cloud/logging/logger.py b/logging/google/cloud/logging/logger.py
index 874d05014479b..a13b06cd260b5 100644
--- a/logging/google/cloud/logging/logger.py
+++ b/logging/google/cloud/logging/logger.py
@@ -25,7 +25,7 @@
 class Logger(object):
     """Loggers represent named targets for log entries.
 
-    See:
+    See
     https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.logs
 
     :type name: str
@@ -179,7 +179,7 @@ def log_text(self, text, client=None, labels=None, insert_id=None,
                  resource=_GLOBAL_RESOURCE):
         """API call:  log a text message via a POST request
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/entries/write
 
         :type text: str
@@ -221,7 +221,7 @@ def log_struct(self, info, client=None, labels=None, insert_id=None,
                    resource=_GLOBAL_RESOURCE):
         """API call:  log a structured message via a POST request
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/entries/write
 
         :type info: dict
@@ -263,7 +263,7 @@ def log_proto(self, message, client=None, labels=None, insert_id=None,
                   resource=_GLOBAL_RESOURCE):
         """API call:  log a protobuf message via a POST request
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/entries/list
 
         :type message: :class:`~google.protobuf.message.Message`
@@ -304,7 +304,7 @@ def log_proto(self, message, client=None, labels=None, insert_id=None,
     def delete(self, client=None):
         """API call:  delete all entries in a logger via a DELETE request
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.logs/delete
 
         :type client: :class:`~google.cloud.logging.client.Client` or
@@ -319,7 +319,7 @@ def list_entries(self, projects=None, filter_=None, order_by=None,
                      page_size=None, page_token=None):
         """Return a page of log entries.
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/entries/list
 
         :type projects: list of strings
@@ -328,7 +328,7 @@ def list_entries(self, projects=None, filter_=None, order_by=None,
 
         :type filter_: str
         :param filter_:
-            a filter expression. See:
+            a filter expression. See
             https://cloud.google.com/logging/docs/view/advanced_filters
 
         :type order_by: str
diff --git a/logging/google/cloud/logging/metric.py b/logging/google/cloud/logging/metric.py
index 8067fb281b23b..ff0a4748540aa 100644
--- a/logging/google/cloud/logging/metric.py
+++ b/logging/google/cloud/logging/metric.py
@@ -20,7 +20,7 @@
 class Metric(object):
     """Metrics represent named filters for log entries.
 
-    See:
+    See
     https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.metrics
 
     :type name: str
@@ -102,7 +102,7 @@ def _require_client(self, client):
     def create(self, client=None):
         """API call:  create the metric via a PUT request
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.metrics/create
 
         :type client: :class:`~google.cloud.logging.client.Client` or
diff --git a/logging/google/cloud/logging/sink.py b/logging/google/cloud/logging/sink.py
index 184cf36b00e68..3f468e6cf2f08 100644
--- a/logging/google/cloud/logging/sink.py
+++ b/logging/google/cloud/logging/sink.py
@@ -20,7 +20,7 @@
 class Sink(object):
     """Sinks represent filtered exports for log entries.
 
-    See:
+    See
     https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.sinks
 
     :type name: str
@@ -106,7 +106,7 @@ def _require_client(self, client):
     def create(self, client=None):
         """API call:  create the sink via a PUT request
 
-        See:
+        See
         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.sinks/create
 
         :type client: :class:`~google.cloud.logging.client.Client` or
diff --git a/monitoring/google/cloud/monitoring/timeseries.py b/monitoring/google/cloud/monitoring/timeseries.py
index a8b9551f1b6ce..f13b00c3403be 100644
--- a/monitoring/google/cloud/monitoring/timeseries.py
+++ b/monitoring/google/cloud/monitoring/timeseries.py
@@ -152,7 +152,7 @@ def _make_typed_value(value):
     type to send to the API. For example, a Python float will be sent to the
     API with "doubleValue" as its key.
 
-    See: https://cloud.google.com/monitoring/api/ref_v3/rest/v3/TypedValue
+    See https://cloud.google.com/monitoring/api/ref_v3/rest/v3/TypedValue
 
     :type value: bool, int, float, str, or dict
     :param value: value to infer the typed value of.
diff --git a/nox.py b/nox.py
index 0496492572f9b..ba3de939901ad 100644
--- a/nox.py
+++ b/nox.py
@@ -33,7 +33,7 @@ def docs(session):
         'resource_manager/', 'runtimeconfig/', 'spanner/', 'speech/',
         'storage/', 'translate/', 'vision/',
     )
-    session.install('.')
+    session.install('-e', '.')
 
     # Build the docs!
     session.run('bash', './test_utils/scripts/update_docs.sh')
diff --git a/pubsub/google/cloud/pubsub/_gax.py b/pubsub/google/cloud/pubsub/_gax.py
index 7301927552215..d32f8eb069a78 100644
--- a/pubsub/google/cloud/pubsub/_gax.py
+++ b/pubsub/google/cloud/pubsub/_gax.py
@@ -60,7 +60,7 @@ def __init__(self, gax_api, client):
     def list_topics(self, project, page_size=0, page_token=None):
         """List topics for the project associated with this API.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/list
 
         :type project: str
@@ -90,7 +90,7 @@ def list_topics(self, project, page_size=0, page_token=None):
     def topic_create(self, topic_path):
         """API call:  create a topic
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/create
 
         :type topic_path: str
@@ -113,7 +113,7 @@ def topic_create(self, topic_path):
     def topic_get(self, topic_path):
         """API call:  retrieve a topic
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/get
 
         :type topic_path: str
@@ -136,7 +136,7 @@ def topic_get(self, topic_path):
     def topic_delete(self, topic_path):
         """API call:  delete a topic
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/delete
 
         :type topic_path: str
@@ -153,7 +153,7 @@ def topic_delete(self, topic_path):
     def topic_publish(self, topic_path, messages, timeout=30):
         """API call:  publish one or more messages to a topic
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/publish
 
         :type topic_path: str
@@ -186,7 +186,7 @@ def topic_publish(self, topic_path, messages, timeout=30):
     def topic_list_subscriptions(self, topic, page_size=0, page_token=None):
         """API call:  list subscriptions bound to a topic
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics.subscriptions/list
 
         :type topic: :class:`~google.cloud.pubsub.topic.Topic`
@@ -242,7 +242,7 @@ def __init__(self, gax_api, client):
     def list_subscriptions(self, project, page_size=0, page_token=None):
         """List subscriptions for the project associated with this API.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/list
 
         :type project: str
@@ -283,7 +283,7 @@ def subscription_create(self, subscription_path, topic_path,
                             message_retention_duration=None):
         """API call:  create a subscription
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create
 
         :type subscription_path: str
@@ -345,7 +345,7 @@ def subscription_create(self, subscription_path, topic_path,
     def subscription_get(self, subscription_path):
         """API call:  retrieve a subscription
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/get
 
         :type subscription_path: str
@@ -367,7 +367,7 @@ def subscription_get(self, subscription_path):
     def subscription_delete(self, subscription_path):
         """API call:  delete a subscription
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/delete
 
         :type subscription_path: str
@@ -386,7 +386,7 @@ def subscription_modify_push_config(self, subscription_path,
                                         push_endpoint):
         """API call:  update push config of a subscription
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/modifyPushConfig
 
         :type subscription_path: str
@@ -411,7 +411,7 @@ def subscription_pull(self, subscription_path, return_immediately=False,
                           max_messages=1):
         """API call:  retrieve messages for a subscription
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/modifyPushConfig
 
         :type subscription_path: str
@@ -452,7 +452,7 @@ def subscription_pull(self, subscription_path, return_immediately=False,
     def subscription_acknowledge(self, subscription_path, ack_ids):
         """API call:  acknowledge retrieved messages
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/modifyPushConfig
 
         :type subscription_path: str
@@ -474,7 +474,7 @@ def subscription_modify_ack_deadline(self, subscription_path, ack_ids,
                                          ack_deadline):
         """API call:  update ack deadline for retrieved messages
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/modifyAckDeadline
 
         :type subscription_path: str
@@ -500,7 +500,7 @@ def subscription_modify_ack_deadline(self, subscription_path, ack_ids,
     def subscription_seek(self, subscription_path, time=None, snapshot=None):
         """API call:  seek a subscription
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/seek
 
         :type subscription_path: str
@@ -524,7 +524,7 @@ def subscription_seek(self, subscription_path, time=None, snapshot=None):
     def list_snapshots(self, project, page_size=0, page_token=None):
         """List snapshots for the project associated with this API.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.snapshots/list
 
         :type project: str
@@ -561,7 +561,7 @@ def list_snapshots(self, project, page_size=0, page_token=None):
     def snapshot_create(self, snapshot_path, subscription_path):
         """API call:  create a snapshot
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.snapshots/create
 
         :type snapshot_path: str
@@ -594,7 +594,7 @@ def snapshot_create(self, snapshot_path, subscription_path):
     def snapshot_delete(self, snapshot_path):
         """API call:  delete a topic
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.snapshots/delete
 
         :type snapshot_path: str
diff --git a/pubsub/google/cloud/pubsub/_http.py b/pubsub/google/cloud/pubsub/_http.py
index 0c059df7453af..f1d07237d7df8 100644
--- a/pubsub/google/cloud/pubsub/_http.py
+++ b/pubsub/google/cloud/pubsub/_http.py
@@ -116,7 +116,7 @@ def __init__(self, client):
     def list_topics(self, project, page_size=None, page_token=None):
         """API call:  list topics for a given project
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/list
 
         :type project: str
@@ -148,7 +148,7 @@ def list_topics(self, project, page_size=None, page_token=None):
     def topic_create(self, topic_path):
         """API call:  create a topic
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/create
 
         :type topic_path: str
@@ -163,7 +163,7 @@ def topic_create(self, topic_path):
     def topic_get(self, topic_path):
         """API call:  retrieve a topic
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/get
 
         :type topic_path: str
@@ -178,7 +178,7 @@ def topic_get(self, topic_path):
     def topic_delete(self, topic_path):
         """API call:  delete a topic
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/delete
 
         :type topic_path: str
@@ -190,7 +190,7 @@ def topic_delete(self, topic_path):
     def topic_publish(self, topic_path, messages):
         """API call:  publish one or more messages to a topic
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/publish
 
         :type topic_path: str
@@ -213,7 +213,7 @@ def topic_publish(self, topic_path, messages):
     def topic_list_subscriptions(self, topic, page_size=None, page_token=None):
         """API call:  list subscriptions bound to a topic
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics.subscriptions/list
 
         :type topic: :class:`~google.cloud.pubsub.topic.Topic`
@@ -260,7 +260,7 @@ def __init__(self, client):
     def list_subscriptions(self, project, page_size=None, page_token=None):
         """API call:  list subscriptions for a given project
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/list
 
         :type project: str
@@ -302,7 +302,7 @@ def subscription_create(self, subscription_path, topic_path,
                             message_retention_duration=None):
         """API call:  create a subscription
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create
 
         :type subscription_path: str
@@ -364,7 +364,7 @@ def subscription_create(self, subscription_path, topic_path,
     def subscription_get(self, subscription_path):
         """API call:  retrieve a subscription
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/get
 
         :type subscription_path: str
@@ -381,7 +381,7 @@ def subscription_get(self, subscription_path):
     def subscription_delete(self, subscription_path):
         """API call:  delete a subscription
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/delete
 
         :type subscription_path: str
@@ -396,7 +396,7 @@ def subscription_modify_push_config(self, subscription_path,
                                         push_endpoint):
         """API call:  update push config of a subscription
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/modifyPushConfig
 
         :type subscription_path: str
@@ -417,7 +417,7 @@ def subscription_pull(self, subscription_path, return_immediately=False,
                           max_messages=1):
         """API call:  retrieve messages for a subscription
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/modifyPushConfig
 
         :type subscription_path: str
@@ -450,7 +450,7 @@ def subscription_pull(self, subscription_path, return_immediately=False,
     def subscription_acknowledge(self, subscription_path, ack_ids):
         """API call:  acknowledge retrieved messages
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/modifyPushConfig
 
         :type subscription_path: str
@@ -471,7 +471,7 @@ def subscription_modify_ack_deadline(self, subscription_path, ack_ids,
                                          ack_deadline):
         """API call:  update ack deadline for retrieved messages
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/modifyAckDeadline
 
         :type subscription_path: str
@@ -496,7 +496,7 @@ def subscription_modify_ack_deadline(self, subscription_path, ack_ids,
     def subscription_seek(self, subscription_path, time=None, snapshot=None):
         """API call:  seek a subscription
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/seek
 
         :type subscription_path: str
@@ -521,7 +521,7 @@ def subscription_seek(self, subscription_path, time=None, snapshot=None):
     def list_snapshots(self, project, page_size=None, page_token=None):
         """List snapshots for the project associated with this API.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.snapshots/list
 
         :type project: str
@@ -559,7 +559,7 @@ def list_snapshots(self, project, page_size=None, page_token=None):
     def snapshot_create(self, snapshot_path, subscription_path):
         """API call:  create a snapshot
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.snapshots/create
 
         :type snapshot_path: str
@@ -581,7 +581,7 @@ def snapshot_create(self, snapshot_path, subscription_path):
     def snapshot_delete(self, snapshot_path):
         """API call:  delete a topic
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.snapshots/delete
 
         :type snapshot_path: str
@@ -605,7 +605,7 @@ def __init__(self, client):
     def get_iam_policy(self, target_path):
         """API call:  fetch the IAM policy for the target
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/getIamPolicy
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/getIamPolicy
 
@@ -621,7 +621,7 @@ def get_iam_policy(self, target_path):
     def set_iam_policy(self, target_path, policy):
         """API call:  update the IAM policy for the target
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/setIamPolicy
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/setIamPolicy
 
@@ -641,7 +641,7 @@ def set_iam_policy(self, target_path, policy):
     def test_iam_permissions(self, target_path, permissions):
         """API call:  test permissions
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/testIamPermissions
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/testIamPermissions
 
diff --git a/pubsub/google/cloud/pubsub/client.py b/pubsub/google/cloud/pubsub/client.py
index 17bb67cb66e20..902188beaab6e 100644
--- a/pubsub/google/cloud/pubsub/client.py
+++ b/pubsub/google/cloud/pubsub/client.py
@@ -136,7 +136,7 @@ def iam_policy_api(self):
     def list_topics(self, page_size=None, page_token=None):
         """List topics for the project associated with this client.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/list
 
         Example:
@@ -165,7 +165,7 @@ def list_topics(self, page_size=None, page_token=None):
     def list_subscriptions(self, page_size=None, page_token=None):
         """List subscriptions for the project associated with this client.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/list
 
         Example:
@@ -195,7 +195,7 @@ def list_subscriptions(self, page_size=None, page_token=None):
     def list_snapshots(self, page_size=None, page_token=None):
         """List snapshots for the project associated with this API.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.snapshots/list
 
         :type project: str
diff --git a/pubsub/google/cloud/pubsub/iam.py b/pubsub/google/cloud/pubsub/iam.py
index 9c7e46af222aa..7dce1c2c4cfa8 100644
--- a/pubsub/google/cloud/pubsub/iam.py
+++ b/pubsub/google/cloud/pubsub/iam.py
@@ -96,7 +96,7 @@
 class Policy(_BasePolicy):
     """IAM Policy / Bindings.
 
-    See:
+    See
     https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy
     https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Binding
     """
diff --git a/pubsub/google/cloud/pubsub/message.py b/pubsub/google/cloud/pubsub/message.py
index 6b93e3b890ede..e2153d5cb14f6 100644
--- a/pubsub/google/cloud/pubsub/message.py
+++ b/pubsub/google/cloud/pubsub/message.py
@@ -20,7 +20,7 @@
 class Message(object):
     """Messages can be published to a topic and received by subscribers.
 
-    See:
+    See
     https://cloud.google.com/pubsub/docs/reference/rest/v1/PubsubMessage
 
     :type data: bytes
diff --git a/pubsub/google/cloud/pubsub/snapshot.py b/pubsub/google/cloud/pubsub/snapshot.py
index 557ea93818d6e..599cd05d8765e 100644
--- a/pubsub/google/cloud/pubsub/snapshot.py
+++ b/pubsub/google/cloud/pubsub/snapshot.py
@@ -108,7 +108,7 @@ def _require_client(self, client):
     def create(self, client=None):
         """API call:  create the snapshot
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.snapshots/create
 
         :type client: :class:`~google.cloud.pubsub.client.Client` or
@@ -127,7 +127,7 @@ def create(self, client=None):
     def delete(self, client=None):
         """API call:  delete the snapshot
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.snapshots/delete
 
         :type client: :class:`~google.cloud.pubsub.client.Client` or
diff --git a/pubsub/google/cloud/pubsub/subscription.py b/pubsub/google/cloud/pubsub/subscription.py
index 22f93246924c2..86ca1f97c230a 100644
--- a/pubsub/google/cloud/pubsub/subscription.py
+++ b/pubsub/google/cloud/pubsub/subscription.py
@@ -27,7 +27,7 @@
 class Subscription(object):
     """Subscriptions receive messages published to their topics.
 
-    See:
+    See
     https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions
 
     :type name: str
@@ -69,7 +69,7 @@ class Subscription(object):
     _DELETED_TOPIC_PATH = '_deleted-topic_'
     """Value of ``projects.subscriptions.topic`` when topic has been deleted.
 
-    See:
+    See
     https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions#Subscription.FIELDS.topic
     """
 
@@ -195,7 +195,7 @@ def _require_client(self, client):
     def create(self, client=None):
         """API call:  create the subscription via a PUT request
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create
 
         Example:
@@ -280,7 +280,7 @@ def reload(self, client=None):
     def delete(self, client=None):
         """API call:  delete the subscription via a DELETE request.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/delete
 
         Example:
@@ -301,7 +301,7 @@ def delete(self, client=None):
     def modify_push_configuration(self, push_endpoint, client=None):
         """API call:  update the push endpoint for the subscription.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/modifyPushConfig
 
         Example:
@@ -332,7 +332,7 @@ def modify_push_configuration(self, push_endpoint, client=None):
     def pull(self, return_immediately=False, max_messages=1, client=None):
         """API call:  retrieve messages for the subscription.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/pull
 
         Example:
@@ -371,7 +371,7 @@ def pull(self, return_immediately=False, max_messages=1, client=None):
     def acknowledge(self, ack_ids, client=None):
         """API call:  acknowledge retrieved messages for the subscription.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/acknowledge
 
         Example:
@@ -395,7 +395,7 @@ def acknowledge(self, ack_ids, client=None):
     def modify_ack_deadline(self, ack_ids, ack_deadline, client=None):
         """API call:  update acknowledgement deadline for a retrieved message.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/modifyAckDeadline
 
         :type ack_ids: list of string
@@ -428,7 +428,7 @@ def snapshot(self, name, client=None):
     def seek_snapshot(self, snapshot, client=None):
         """API call:  seek a subscription to a given snapshot
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/seek
 
         :type snapshot: :class:`Snapshot`
@@ -441,7 +441,7 @@ def seek_snapshot(self, snapshot, client=None):
     def seek_timestamp(self, timestamp, client=None):
         """API call:  seek a subscription to a given point in time
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/seek
 
         :type time: :class:`datetime.datetime`
@@ -455,7 +455,7 @@ def seek_timestamp(self, timestamp, client=None):
     def get_iam_policy(self, client=None):
         """Fetch the IAM policy for the subscription.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/getIamPolicy
 
         Example:
@@ -481,7 +481,7 @@ def get_iam_policy(self, client=None):
     def set_iam_policy(self, policy, client=None):
         """Update the IAM policy for the subscription.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/setIamPolicy
 
         Example:
@@ -512,7 +512,7 @@ def set_iam_policy(self, policy, client=None):
     def check_iam_permissions(self, permissions, client=None):
         """Verify permissions allowed for the current user.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/testIamPermissions
 
         Example:
diff --git a/pubsub/google/cloud/pubsub/topic.py b/pubsub/google/cloud/pubsub/topic.py
index f9a8c28a3a09c..92c323ed63d72 100644
--- a/pubsub/google/cloud/pubsub/topic.py
+++ b/pubsub/google/cloud/pubsub/topic.py
@@ -32,7 +32,7 @@ class Topic(object):
 
     Subscribers then receive those messages.
 
-    See:
+    See
     https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics
 
     :type name: str
@@ -155,7 +155,7 @@ def _require_client(self, client):
     def create(self, client=None):
         """API call:  create the topic via a PUT request
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/create
 
         Example:
@@ -206,7 +206,7 @@ def exists(self, client=None):
     def delete(self, client=None):
         """API call:  delete the topic via a DELETE request
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/delete
 
         Example:
@@ -237,7 +237,7 @@ def _timestamp_message(self, attrs):
     def publish(self, message, client=None, **attrs):
         """API call:  publish a message to a topic via a POST request
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/publish
 
         Example without message attributes:
@@ -307,7 +307,7 @@ def batch(self, client=None, **kwargs):
     def list_subscriptions(self, page_size=None, page_token=None, client=None):
         """List subscriptions for the project associated with this client.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics.subscriptions/list
 
         Example:
@@ -342,7 +342,7 @@ def list_subscriptions(self, page_size=None, page_token=None, client=None):
     def get_iam_policy(self, client=None):
         """Fetch the IAM policy for the topic.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/getIamPolicy
 
         Example:
@@ -368,7 +368,7 @@ def get_iam_policy(self, client=None):
     def set_iam_policy(self, policy, client=None):
         """Update the IAM policy for the topic.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/setIamPolicy
 
         Example:
@@ -399,7 +399,7 @@ def set_iam_policy(self, policy, client=None):
     def check_iam_permissions(self, permissions, client=None):
         """Verify permissions allowed for the current user.
 
-        See:
+        See
         https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/testIamPermissions
 
         Example:
diff --git a/resource_manager/google/cloud/resource_manager/client.py b/resource_manager/google/cloud/resource_manager/client.py
index c16e095e4cc64..d2cea6cad2cdc 100644
--- a/resource_manager/google/cloud/resource_manager/client.py
+++ b/resource_manager/google/cloud/resource_manager/client.py
@@ -125,7 +125,7 @@ def list_projects(self, filter_params=None, page_size=None):
             >>> for project in client.list_projects(env_filter):
             ...     print(project.project_id)
 
-        See:
+        See
         https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/list
 
         Complete filtering example::
diff --git a/resource_manager/google/cloud/resource_manager/project.py b/resource_manager/google/cloud/resource_manager/project.py
index 40767357a7daf..689bae91dd927 100644
--- a/resource_manager/google/cloud/resource_manager/project.py
+++ b/resource_manager/google/cloud/resource_manager/project.py
@@ -36,7 +36,7 @@ class Project(object):
         >>> project.labels['environment'] = 'production'
         >>> project.update()
 
-    See:
+    See
     https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects
 
     :type project_id: str
@@ -218,7 +218,7 @@ def update(self, client=None):
     def delete(self, client=None, reload_data=False):
         """API call:  delete the project via a ``DELETE`` request.
 
-        See:
+        See
         https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/delete
 
         This actually changes the status (``lifecycleState``) from ``ACTIVE``
diff --git a/runtimeconfig/google/cloud/runtimeconfig/_helpers.py b/runtimeconfig/google/cloud/runtimeconfig/_helpers.py
index e03bb794f605c..5424e3e5243ae 100644
--- a/runtimeconfig/google/cloud/runtimeconfig/_helpers.py
+++ b/runtimeconfig/google/cloud/runtimeconfig/_helpers.py
@@ -25,7 +25,7 @@ def config_name_from_full_name(full_name):
     :param full_name:
         The full resource name of a config. The full resource name looks like
         ``projects/project-name/configs/config-name`` and is returned as the
-        ``name`` field of a config resource.  See:
+        ``name`` field of a config resource.  See
         https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs
 
     :rtype: str
@@ -54,7 +54,7 @@ def variable_name_from_full_name(full_name):
     :param full_name:
         The full resource name of a variable. The full resource name looks like
         ``projects/prj-name/configs/cfg-name/variables/var-name`` and is
-        returned as the ``name`` field of a variable resource.  See:
+        returned as the ``name`` field of a variable resource.  See
         https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs.variables
 
     :rtype: str
diff --git a/runtimeconfig/google/cloud/runtimeconfig/config.py b/runtimeconfig/google/cloud/runtimeconfig/config.py
index 0af33d034d5ae..4b85ff5843bff 100644
--- a/runtimeconfig/google/cloud/runtimeconfig/config.py
+++ b/runtimeconfig/google/cloud/runtimeconfig/config.py
@@ -25,7 +25,7 @@ class Config(object):
 
     This consists of metadata and a hierarchy of variables.
 
-    See:
+    See
     https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs
 
     :type client: :class:`google.cloud.runtimeconfig.client.Client`
@@ -53,7 +53,7 @@ def client(self):
     def description(self):
         """Description of the config object.
 
-        See:
+        See
         https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs#resource-runtimeconfig
 
         :rtype: str, or ``NoneType``
@@ -164,7 +164,7 @@ def reload(self, client=None):
 
         This method will reload the newest data for the config.
 
-        See:
+        See
         https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs/get
 
         :type client: :class:`google.cloud.runtimeconfig.client.Client`
@@ -216,7 +216,7 @@ def list_variables(self, page_size=None, page_token=None, client=None):
 
         This only lists variable names, not the values.
 
-        See:
+        See
         https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs.variables/list
 
         :type page_size: int
diff --git a/runtimeconfig/google/cloud/runtimeconfig/variable.py b/runtimeconfig/google/cloud/runtimeconfig/variable.py
index 602653f5b357b..14241f6f8d3e5 100644
--- a/runtimeconfig/google/cloud/runtimeconfig/variable.py
+++ b/runtimeconfig/google/cloud/runtimeconfig/variable.py
@@ -16,19 +16,19 @@
 
 .. data:: STATE_UNSPECIFIED
 
-    The default variable state.  See:
+    The default variable state.  See
     https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs.variables#VariableState
 
 .. data:: STATE_UPDATED
 
     Indicates the variable was updated, while `variables.watch` was executing.
-    See:
+    See
     https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs.variables#VariableState
 
 .. data:: STATE_DELETED
 
     Indicates the variable was deleted, while `variables.watch`_ was executing.
-    See:
+    See
     https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs.variables#VariableState
 
 .. _variables.watch:
@@ -50,7 +50,7 @@
 class Variable(object):
     """A variable in the Cloud RuntimeConfig service.
 
-    See:
+    See
     https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs.variables
 
     :type name: str
@@ -118,7 +118,7 @@ def client(self):
     def value(self):
         """Value of the variable, as bytes.
 
-        See:
+        See
         https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs.variables
 
         :rtype: bytes or ``NoneType``
@@ -134,7 +134,7 @@ def value(self):
     def state(self):
         """Retrieve the state of the variable.
 
-        See:
+        See
         https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs.variables#VariableState
 
         :rtype: str
@@ -148,7 +148,7 @@ def state(self):
     def update_time(self):
         """Retrieve the timestamp at which the variable was updated.
 
-        See:
+        See
         https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs.variables
 
         :rtype: :class:`datetime.datetime` or ``NoneType``
@@ -190,7 +190,7 @@ def _set_properties(self, resource):
     def exists(self, client=None):
         """API call:  test for the existence of the variable via a GET request
 
-        See:
+        See
         https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs.variables/get
 
         :type client: :class:`~google.cloud.runtimeconfig.client.Client`
@@ -217,7 +217,7 @@ def reload(self, client=None):
 
         This method will reload the newest data for the variable.
 
-        See:
+        See
         https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs/get
 
         :type client: :class:`google.cloud.runtimeconfig.client.Client`
diff --git a/setup.py b/setup.py
index fd21cc0147bee..9570fbb5ef4ee 100644
--- a/setup.py
+++ b/setup.py
@@ -62,10 +62,11 @@
     'google-cloud-pubsub >= 0.25.0, < 0.26dev',
     'google-cloud-resource-manager >= 0.24.0, < 0.25dev',
     'google-cloud-spanner >= 0.24.1, < 0.25dev',
-    'google-cloud-speech >= 0.24.0, < 0.25dev',
+    'google-cloud-speech >= 0.25.0, < 0.26dev',
     'google-cloud-storage >= 1.1.0, < 2.0dev',
     'google-cloud-translate >= 0.24.0, < 0.25dev',
-    'google-cloud-vision >= 0.24.0, < 0.25dev',
+    'google-cloud-videointelligence >= 0.25.0, < 0.26dev',
+    'google-cloud-vision >= 0.25.0, < 0.26dev',
     'google-cloud-runtimeconfig >= 0.24.0, < 0.25dev',
 ]
 
diff --git a/spanner/google/cloud/spanner/client.py b/spanner/google/cloud/spanner/client.py
index b260e7959aa21..c95e16e2c23c9 100644
--- a/spanner/google/cloud/spanner/client.py
+++ b/spanner/google/cloud/spanner/client.py
@@ -191,7 +191,7 @@ def copy(self):
     def list_instance_configs(self, page_size=None, page_token=None):
         """List available instance configurations for the client's project.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.InstanceAdmin.ListInstanceConfigs
 
         :type page_size: int
@@ -250,11 +250,11 @@ def instance(self, instance_id,
     def list_instances(self, filter_='', page_size=None, page_token=None):
         """List instances for the client's project.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.InstanceAdmin.ListInstances
 
         :type filter_: string
-        :param filter_: (Optional) Filter to select instances listed.  See:
+        :param filter_: (Optional) Filter to select instances listed.  See
                         the ``ListInstancesRequest`` docs above for examples.
 
         :type page_size: int
diff --git a/spanner/google/cloud/spanner/database.py b/spanner/google/cloud/spanner/database.py
index 221842c12dca7..12af9ca20edb6 100644
--- a/spanner/google/cloud/spanner/database.py
+++ b/spanner/google/cloud/spanner/database.py
@@ -150,7 +150,7 @@ def name(self):
     def ddl_statements(self):
         """DDL Statements used to define database schema.
 
-        See:
+        See
         cloud.google.com/spanner/docs/data-definition-language
 
         :rtype: sequence of string
@@ -180,7 +180,7 @@ def create(self):
 
         Inclues any configured schema assigned to :attr:`ddl_statements`.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.CreateDatabase
         """
         api = self._instance._client.database_admin_api
@@ -211,7 +211,7 @@ def create(self):
     def exists(self):
         """Test whether this database exists.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.GetDatabaseDDL
         """
         api = self._instance._client.database_admin_api
@@ -230,7 +230,7 @@ def reload(self):
 
         Refresh any configured schema into :attr:`ddl_statements`.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.GetDatabaseDDL
         """
         api = self._instance._client.database_admin_api
@@ -249,7 +249,7 @@ def update_ddl(self, ddl_statements):
 
         Apply any configured schema from :attr:`ddl_statements`.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.UpdateDatabase
 
         :rtype: :class:`google.cloud.operation.Operation`
@@ -273,7 +273,7 @@ def update_ddl(self, ddl_statements):
     def drop(self):
         """Drop this database.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.DropDatabase
         """
         api = self._instance._client.database_admin_api
@@ -343,7 +343,7 @@ def execute_sql(self, sql, params=None, param_types=None, query_mode=None,
 
         :type query_mode:
             :class:`google.spanner.v1.spanner_pb2.ExecuteSqlRequest.QueryMode`
-        :param query_mode: Mode governing return of results / query plan. See:
+        :param query_mode: Mode governing return of results / query plan. See
             https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.ExecuteSqlRequest.QueryMode1
 
         :type resume_token: bytes
@@ -396,7 +396,7 @@ def snapshot(self, read_timestamp=None, min_read_timestamp=None,
         The wrapper *must* be used as a context manager, with the snapshot
         as the value returned by the wrapper.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.TransactionOptions.ReadOnly
 
         If no options are passed, reads will use the ``strong`` model, reading
@@ -519,7 +519,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
 def _check_ddl_statements(value):
     """Validate DDL Statements used to define database schema.
 
-    See:
+    See
     https://cloud.google.com/spanner/docs/data-definition-language
 
     :type value: list of string
diff --git a/spanner/google/cloud/spanner/instance.py b/spanner/google/cloud/spanner/instance.py
index 2935fc2ad57f8..711b8c4898532 100644
--- a/spanner/google/cloud/spanner/instance.py
+++ b/spanner/google/cloud/spanner/instance.py
@@ -188,7 +188,7 @@ def copy(self):
     def create(self):
         """Create this instance.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.CreateInstance
 
         .. note::
@@ -234,7 +234,7 @@ def create(self):
     def exists(self):
         """Test whether this instance exists.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.GetInstanceConfig
         """
         api = self._client.instance_admin_api
@@ -252,7 +252,7 @@ def exists(self):
     def reload(self):
         """Reload the metadata for this instance.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.GetInstanceConfig
         """
         api = self._client.instance_admin_api
@@ -270,7 +270,7 @@ def reload(self):
     def update(self):
         """Update this instance.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.UpdateInstance
 
         .. note::
@@ -315,7 +315,7 @@ def update(self):
     def delete(self):
         """Mark an instance and all of its databases for permanent deletion.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.DeleteInstance
 
         Immediately upon completion of the request:
@@ -360,7 +360,7 @@ def database(self, database_id, ddl_statements=(), pool=None):
     def list_databases(self, page_size=None, page_token=None):
         """List databases for the instance.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.ListDatabases
 
         :type page_size: int
diff --git a/spanner/google/cloud/spanner/session.py b/spanner/google/cloud/spanner/session.py
index 9617ceb111492..45baffa92d43e 100644
--- a/spanner/google/cloud/spanner/session.py
+++ b/spanner/google/cloud/spanner/session.py
@@ -86,7 +86,7 @@ def name(self):
     def create(self):
         """Create this session, bound to its database.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.Spanner.CreateSession
 
         :raises: :exc:`ValueError` if :attr:`session_id` is already set.
@@ -101,7 +101,7 @@ def create(self):
     def exists(self):
         """Test for the existence of this session.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.Spanner.GetSession
 
         :rtype: bool
@@ -123,7 +123,7 @@ def exists(self):
     def delete(self):
         """Delete this session.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.Spanner.GetSession
 
         :raises: :exc:`ValueError` if :attr:`session_id` is not already set.
@@ -143,7 +143,7 @@ def snapshot(self, read_timestamp=None, min_read_timestamp=None,
                  max_staleness=None, exact_staleness=None):
         """Create a snapshot to perform a set of reads with shared staleness.
 
-        See:
+        See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.TransactionOptions.ReadOnly
 
         If no options are passed, reads will use the ``strong`` model, reading
@@ -225,7 +225,7 @@ def execute_sql(self, sql, params=None, param_types=None, query_mode=None,
 
         :type query_mode:
             :class:`google.spanner.v1.spanner_pb2.ExecuteSqlRequest.QueryMode`
-        :param query_mode: Mode governing return of results / query plan. See:
+        :param query_mode: Mode governing return of results / query plan. See
             https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.ExecuteSqlRequest.QueryMode1
 
         :type resume_token: bytes
diff --git a/spanner/google/cloud/spanner/snapshot.py b/spanner/google/cloud/spanner/snapshot.py
index 22b39dbc813de..05fcba63f322e 100644
--- a/spanner/google/cloud/spanner/snapshot.py
+++ b/spanner/google/cloud/spanner/snapshot.py
@@ -101,7 +101,7 @@ def execute_sql(self, sql, params=None, param_types=None, query_mode=None,
 
         :type query_mode:
             :class:`google.cloud.proto.spanner.v1.ExecuteSqlRequest.QueryMode`
-        :param query_mode: Mode governing return of results / query plan. See:
+        :param query_mode: Mode governing return of results / query plan. See
             https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.ExecuteSqlRequest.QueryMode1
 
         :type resume_token: bytes
@@ -134,7 +134,7 @@ def execute_sql(self, sql, params=None, param_types=None, query_mode=None,
 class Snapshot(_SnapshotBase):
     """Allow a set of reads / SQL statements with shared staleness.
 
-    See:
+    See
     https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.TransactionOptions.ReadOnly
 
     If no options are passed, reads will use the ``strong`` model, reading
diff --git a/spanner/tests/unit/test_streamed.py b/spanner/tests/unit/test_streamed.py
index 740a3e0f0ea00..3300e4048cc7d 100644
--- a/spanner/tests/unit/test_streamed.py
+++ b/spanner/tests/unit/test_streamed.py
@@ -982,7 +982,7 @@ def _normalize_results(rows_data, fields):
 def _parse_streaming_read_acceptance_tests(filename):
     """Parse acceptance tests from JSON
 
-    See: streaming-read-acceptance-test.json
+    See streaming-read-acceptance-test.json
     """
     import json
 
diff --git a/speech/google/cloud/speech/_gax.py b/speech/google/cloud/speech/_gax.py
index b643f35aa9c95..c03c085402147 100644
--- a/speech/google/cloud/speech/_gax.py
+++ b/speech/google/cloud/speech/_gax.py
@@ -41,7 +41,7 @@ class GAPICSpeechAPI(object):
     """Manage calls through GAPIC wrappers to the Speech API.
 
     :type client: `~google.cloud.core.client.Client`
-    :param client: Instance of ``Client`.
+    :param client: Instance of ``Client``.
     """
     def __init__(self, client=None):
         self._client = client
@@ -131,7 +131,7 @@ def streaming_recognize(self, sample, language_code,
         .. note::
 
             Streaming recognition requests are limited to 1 minute of audio.
-            See: https://cloud.google.com/speech/limits#content
+            See https://cloud.google.com/speech/limits#content
 
         Yields :class:`~streaming_response.StreamingSpeechResponse` containing
         results and metadata from the streaming request.
diff --git a/speech/google/cloud/speech/encoding.py b/speech/google/cloud/speech/encoding.py
index 529f8e45e889f..d4fa697181cb5 100644
--- a/speech/google/cloud/speech/encoding.py
+++ b/speech/google/cloud/speech/encoding.py
@@ -18,7 +18,7 @@
 class Encoding(object):
     """Audio encoding types.
 
-    See:
+    See
     https://cloud.google.com/speech/reference/rest/v1/RecognitionConfig#AudioEncoding
     """
 
diff --git a/speech/google/cloud/speech/sample.py b/speech/google/cloud/speech/sample.py
index 0380fac125861..9814fcdf92d23 100644
--- a/speech/google/cloud/speech/sample.py
+++ b/speech/google/cloud/speech/sample.py
@@ -179,7 +179,7 @@ def streaming_recognize(self, language_code,
         .. note::
 
             Streaming recognition requests are limited to 1 minute of audio.
-            See: https://cloud.google.com/speech/limits#content
+            See https://cloud.google.com/speech/limits#content
 
         Yields: Instance of
                 :class:`~google.cloud.speech.result.StreamingSpeechResult`
diff --git a/storage/google/cloud/storage/acl.py b/storage/google/cloud/storage/acl.py
index 389a312fb219b..c4525ea887357 100644
--- a/storage/google/cloud/storage/acl.py
+++ b/storage/google/cloud/storage/acl.py
@@ -188,7 +188,7 @@ class ACL(object):
         'bucketOwnerRead',
         'bucketOwnerFullControl',
     ])
-    """See:
+    """See
     https://cloud.google.com/storage/docs/access-control/lists#predefined-acl
     """
 
diff --git a/storage/google/cloud/storage/batch.py b/storage/google/cloud/storage/batch.py
index 146c52a227bcd..0ab95a98743c7 100644
--- a/storage/google/cloud/storage/batch.py
+++ b/storage/google/cloud/storage/batch.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 """Batch updates / deletes of storage buckets / blobs.
 
-See: https://cloud.google.com/storage/docs/json_api/v1/how-tos/batch
+See https://cloud.google.com/storage/docs/json_api/v1/how-tos/batch
 """
 from email.encoders import encode_noop
 from email.generator import Generator
diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index 671cda3052a18..8805cd7342294 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -130,7 +130,7 @@ class Blob(_PropertyMixin):
     )
     """Allowed values for :attr:`storage_class`.
 
-    See:
+    See
     https://cloud.google.com/storage/docs/json_api/v1/objects#storageClass
     https://cloud.google.com/storage/docs/per-object-storage-class
 
@@ -1054,7 +1054,7 @@ def create_resumable_upload_session(
     def get_iam_policy(self, client=None):
         """Retrieve the IAM policy for the object.
 
-        See:
+        See
         https://cloud.google.com/storage/docs/json_api/v1/objects/getIamPolicy
 
         :type client: :class:`~google.cloud.storage.client.Client` or
@@ -1076,7 +1076,7 @@ def get_iam_policy(self, client=None):
     def set_iam_policy(self, policy, client=None):
         """Update the IAM policy for the bucket.
 
-        See:
+        See
         https://cloud.google.com/storage/docs/json_api/v1/objects/setIamPolicy
 
         :type policy: :class:`google.cloud.iam.Policy`
@@ -1104,7 +1104,7 @@ def set_iam_policy(self, policy, client=None):
     def test_iam_permissions(self, permissions, client=None):
         """API call:  test permissions
 
-        See:
+        See
         https://cloud.google.com/storage/docs/json_api/v1/objects/testIamPermissions
 
         :type permissions: list of string
@@ -1217,7 +1217,7 @@ def rewrite(self, source, token=None, client=None):
     def update_storage_class(self, new_class, client=None):
         """Update blob's storage class via a rewrite-in-place.
 
-        See:
+        See
         https://cloud.google.com/storage/docs/per-object-storage-class
 
         :type new_class: str
@@ -1244,7 +1244,7 @@ def update_storage_class(self, new_class, client=None):
     cache_control = _scalar_property('cacheControl')
     """HTTP 'Cache-Control' header for this object.
 
-    See: `RFC 7234`_ and `API reference docs`_.
+    See `RFC 7234`_ and `API reference docs`_.
 
     If the property is not set locally, returns :data:`None`.
 
@@ -1256,7 +1256,7 @@ def update_storage_class(self, new_class, client=None):
     content_disposition = _scalar_property('contentDisposition')
     """HTTP 'Content-Disposition' header for this object.
 
-    See: `RFC 6266`_ and `API reference docs`_.
+    See `RFC 6266`_ and `API reference docs`_.
 
     If the property is not set locally, returns :data:`None`.
 
@@ -1268,7 +1268,7 @@ def update_storage_class(self, new_class, client=None):
     content_encoding = _scalar_property('contentEncoding')
     """HTTP 'Content-Encoding' header for this object.
 
-    See: `RFC 7231`_ and `API reference docs`_.
+    See `RFC 7231`_ and `API reference docs`_.
 
     If the property is not set locally, returns ``None``.
 
@@ -1280,7 +1280,7 @@ def update_storage_class(self, new_class, client=None):
     content_language = _scalar_property('contentLanguage')
     """HTTP 'Content-Language' header for this object.
 
-    See: `BCP47`_ and `API reference docs`_.
+    See `BCP47`_ and `API reference docs`_.
 
     If the property is not set locally, returns :data:`None`.
 
@@ -1292,7 +1292,7 @@ def update_storage_class(self, new_class, client=None):
     content_type = _scalar_property(_CONTENT_TYPE_FIELD)
     """HTTP 'Content-Type' header for this object.
 
-    See: `RFC 2616`_ and `API reference docs`_.
+    See `RFC 2616`_ and `API reference docs`_.
 
     If the property is not set locally, returns :data:`None`.
 
@@ -1304,7 +1304,7 @@ def update_storage_class(self, new_class, client=None):
     crc32c = _scalar_property('crc32c')
     """CRC32C checksum for this object.
 
-    See: `RFC 4960`_ and `API reference docs`_.
+    See `RFC 4960`_ and `API reference docs`_.
 
     If the property is not set locally, returns :data:`None`.
 
@@ -1317,7 +1317,7 @@ def update_storage_class(self, new_class, client=None):
     def component_count(self):
         """Number of underlying components that make up this object.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/objects
+        See https://cloud.google.com/storage/docs/json_api/v1/objects
 
         :rtype: int or ``NoneType``
         :returns: The component count (in case of a composed object) or
@@ -1332,7 +1332,7 @@ def component_count(self):
     def etag(self):
         """Retrieve the ETag for the object.
 
-        See: `RFC 2616 (etags)`_ and `API reference docs`_.
+        See `RFC 2616 (etags)`_ and `API reference docs`_.
 
         :rtype: str or ``NoneType``
         :returns: The blob etag or ``None`` if the property is not set locally.
@@ -1345,7 +1345,7 @@ def etag(self):
     def generation(self):
         """Retrieve the generation for the object.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/objects
+        See https://cloud.google.com/storage/docs/json_api/v1/objects
 
         :rtype: int or ``NoneType``
         :returns: The generation of the blob or ``None`` if the property
@@ -1359,7 +1359,7 @@ def generation(self):
     def id(self):
         """Retrieve the ID for the object.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/objects
+        See https://cloud.google.com/storage/docs/json_api/v1/objects
 
         :rtype: str or ``NoneType``
         :returns: The ID of the blob or ``None`` if the property is not
@@ -1370,7 +1370,7 @@ def id(self):
     md5_hash = _scalar_property('md5Hash')
     """MD5 hash for this object.
 
-    See: `RFC 1321`_ and `API reference docs`_.
+    See `RFC 1321`_ and `API reference docs`_.
 
     If the property is not set locally, returns ``None``.
 
@@ -1383,7 +1383,7 @@ def id(self):
     def media_link(self):
         """Retrieve the media download URI for the object.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/objects
+        See https://cloud.google.com/storage/docs/json_api/v1/objects
 
         :rtype: str or ``NoneType``
         :returns: The media link for the blob or ``None`` if the property is
@@ -1395,7 +1395,7 @@ def media_link(self):
     def metadata(self):
         """Retrieve arbitrary/application specific metadata for the object.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/objects
+        See https://cloud.google.com/storage/docs/json_api/v1/objects
 
         :rtype: dict or ``NoneType``
         :returns: The metadata associated with the blob or ``None`` if the
@@ -1407,7 +1407,7 @@ def metadata(self):
     def metadata(self, value):
         """Update arbitrary/application specific metadata for the object.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/objects
+        See https://cloud.google.com/storage/docs/json_api/v1/objects
 
         :type value: dict
         :param value: (Optional) The blob metadata to set.
@@ -1418,7 +1418,7 @@ def metadata(self, value):
     def metageneration(self):
         """Retrieve the metageneration for the object.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/objects
+        See https://cloud.google.com/storage/docs/json_api/v1/objects
 
         :rtype: int or ``NoneType``
         :returns: The metageneration of the blob or ``None`` if the property
@@ -1432,7 +1432,7 @@ def metageneration(self):
     def owner(self):
         """Retrieve info about the owner of the object.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/objects
+        See https://cloud.google.com/storage/docs/json_api/v1/objects
 
         :rtype: dict or ``NoneType``
         :returns: Mapping of owner's role/ID. If the property is not set
@@ -1444,7 +1444,7 @@ def owner(self):
     def self_link(self):
         """Retrieve the URI for the object.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/objects
+        See https://cloud.google.com/storage/docs/json_api/v1/objects
 
         :rtype: str or ``NoneType``
         :returns: The self link for the blob or ``None`` if the property is
@@ -1456,7 +1456,7 @@ def self_link(self):
     def size(self):
         """Size of the object, in bytes.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/objects
+        See https://cloud.google.com/storage/docs/json_api/v1/objects
 
         :rtype: int or ``NoneType``
         :returns: The size of the blob or ``None`` if the property
@@ -1474,7 +1474,7 @@ def size(self):
     exists in a bucket, call :meth:`update_storage_class` (which uses
     the "storage.objects.rewrite" method).
 
-    See: https://cloud.google.com/storage/docs/storage-classes
+    See https://cloud.google.com/storage/docs/storage-classes
 
     :rtype: str or ``NoneType``
     :returns: If set, one of "MULTI_REGIONAL", "REGIONAL",
@@ -1486,7 +1486,7 @@ def size(self):
     def time_deleted(self):
         """Retrieve the timestamp at which the object was deleted.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/objects
+        See https://cloud.google.com/storage/docs/json_api/v1/objects
 
         :rtype: :class:`datetime.datetime` or ``NoneType``
         :returns: Datetime object parsed from RFC3339 valid timestamp, or
@@ -1501,7 +1501,7 @@ def time_deleted(self):
     def time_created(self):
         """Retrieve the timestamp at which the object was created.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/objects
+        See https://cloud.google.com/storage/docs/json_api/v1/objects
 
         :rtype: :class:`datetime.datetime` or ``NoneType``
         :returns: Datetime object parsed from RFC3339 valid timestamp, or
@@ -1515,7 +1515,7 @@ def time_created(self):
     def updated(self):
         """Retrieve the timestamp at which the object was updated.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/objects
+        See https://cloud.google.com/storage/docs/json_api/v1/objects
 
         :rtype: :class:`datetime.datetime` or ``NoneType``
         :returns: Datetime object parsed from RFC3339 valid timestamp, or
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index f0f040e0627e0..506d1ce6e26d4 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -103,7 +103,7 @@ class Bucket(_PropertyMixin):
     )
     """Allowed values for :attr:`storage_class`.
 
-    See:
+    See
     https://cloud.google.com/storage/docs/json_api/v1/buckets#storageClass
     https://cloud.google.com/storage/docs/storage-classes
     """
@@ -527,7 +527,7 @@ def rename_blob(self, blob, new_name, client=None):
     def cors(self):
         """Retrieve or set CORS policies configured for this bucket.
 
-        See: http://www.w3.org/TR/cors/ and
+        See http://www.w3.org/TR/cors/ and
              https://cloud.google.com/storage/docs/json_api/v1/buckets
 
         :setter: Set CORS policies for this bucket.
@@ -543,7 +543,7 @@ def cors(self):
     def cors(self, entries):
         """Set CORS policies configured for this bucket.
 
-        See: http://www.w3.org/TR/cors/ and
+        See http://www.w3.org/TR/cors/ and
              https://cloud.google.com/storage/docs/json_api/v1/buckets
 
         :type entries: list of dictionaries
@@ -555,7 +555,7 @@ def cors(self, entries):
     def etag(self):
         """Retrieve the ETag for the bucket.
 
-        See: https://tools.ietf.org/html/rfc2616#section-3.11 and
+        See https://tools.ietf.org/html/rfc2616#section-3.11 and
              https://cloud.google.com/storage/docs/json_api/v1/buckets
 
         :rtype: str or ``NoneType``
@@ -568,7 +568,7 @@ def etag(self):
     def id(self):
         """Retrieve the ID for the bucket.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/buckets
+        See https://cloud.google.com/storage/docs/json_api/v1/buckets
 
         :rtype: str or ``NoneType``
         :returns: The ID of the bucket or ``None`` if the property is not
@@ -580,7 +580,7 @@ def id(self):
     def lifecycle_rules(self):
         """Lifecycle rules configured for this bucket.
 
-        See: https://cloud.google.com/storage/docs/lifecycle and
+        See https://cloud.google.com/storage/docs/lifecycle and
              https://cloud.google.com/storage/docs/json_api/v1/buckets
 
         :rtype: list(dict)
@@ -596,7 +596,7 @@ def lifecycle_rules(self, rules):
     location = _scalar_property('location')
     """Retrieve location configured for this bucket.
 
-    See: https://cloud.google.com/storage/docs/json_api/v1/buckets and
+    See https://cloud.google.com/storage/docs/json_api/v1/buckets and
     https://cloud.google.com/storage/docs/bucket-locations
 
     If the property is not set locally, returns ``None``.
@@ -607,7 +607,7 @@ def lifecycle_rules(self, rules):
     def get_logging(self):
         """Return info about access logging for this bucket.
 
-        See: https://cloud.google.com/storage/docs/access-logs#status
+        See https://cloud.google.com/storage/docs/access-logs#status
 
         :rtype: dict or None
         :returns: a dict w/ keys, ``logBucket`` and ``logObjectPrefix``
@@ -619,7 +619,7 @@ def get_logging(self):
     def enable_logging(self, bucket_name, object_prefix=''):
         """Enable access logging for this bucket.
 
-        See: https://cloud.google.com/storage/docs/access-logs
+        See https://cloud.google.com/storage/docs/access-logs
 
         :type bucket_name: str
         :param bucket_name: name of bucket in which to store access logs
@@ -633,7 +633,7 @@ def enable_logging(self, bucket_name, object_prefix=''):
     def disable_logging(self):
         """Disable access logging for this bucket.
 
-        See: https://cloud.google.com/storage/docs/access-logs#disabling
+        See https://cloud.google.com/storage/docs/access-logs#disabling
         """
         self._patch_property('logging', None)
 
@@ -641,7 +641,7 @@ def disable_logging(self):
     def metageneration(self):
         """Retrieve the metageneration for the bucket.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/buckets
+        See https://cloud.google.com/storage/docs/json_api/v1/buckets
 
         :rtype: int or ``NoneType``
         :returns: The metageneration of the bucket or ``None`` if the property
@@ -655,7 +655,7 @@ def metageneration(self):
     def owner(self):
         """Retrieve info about the owner of the bucket.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/buckets
+        See https://cloud.google.com/storage/docs/json_api/v1/buckets
 
         :rtype: dict or ``NoneType``
         :returns: Mapping of owner's role/ID. If the property is not set
@@ -667,7 +667,7 @@ def owner(self):
     def project_number(self):
         """Retrieve the number of the project to which the bucket is assigned.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/buckets
+        See https://cloud.google.com/storage/docs/json_api/v1/buckets
 
         :rtype: int or ``NoneType``
         :returns: The project number that owns the bucket or ``None`` if the
@@ -681,7 +681,7 @@ def project_number(self):
     def self_link(self):
         """Retrieve the URI for the bucket.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/buckets
+        See https://cloud.google.com/storage/docs/json_api/v1/buckets
 
         :rtype: str or ``NoneType``
         :returns: The self link for the bucket or ``None`` if the property is
@@ -693,7 +693,7 @@ def self_link(self):
     def storage_class(self):
         """Retrieve the storage class for the bucket.
 
-        See: https://cloud.google.com/storage/docs/storage-classes
+        See https://cloud.google.com/storage/docs/storage-classes
 
         :rtype: str or ``NoneType``
         :returns: If set, one of "MULTI_REGIONAL", "REGIONAL",
@@ -706,7 +706,7 @@ def storage_class(self):
     def storage_class(self, value):
         """Set the storage class for the bucket.
 
-        See: https://cloud.google.com/storage/docs/storage-classes
+        See https://cloud.google.com/storage/docs/storage-classes
 
         :type value: str
         :param value: one of "MULTI_REGIONAL", "REGIONAL", "NEARLINE",
@@ -720,7 +720,7 @@ def storage_class(self, value):
     def time_created(self):
         """Retrieve the timestamp at which the bucket was created.
 
-        See: https://cloud.google.com/storage/docs/json_api/v1/buckets
+        See https://cloud.google.com/storage/docs/json_api/v1/buckets
 
         :rtype: :class:`datetime.datetime` or ``NoneType``
         :returns: Datetime object parsed from RFC3339 valid timestamp, or
@@ -734,7 +734,7 @@ def time_created(self):
     def versioning_enabled(self):
         """Is versioning enabled for this bucket?
 
-        See:  https://cloud.google.com/storage/docs/object-versioning for
+        See  https://cloud.google.com/storage/docs/object-versioning for
         details.
 
         :rtype: bool
@@ -747,7 +747,7 @@ def versioning_enabled(self):
     def versioning_enabled(self, value):
         """Enable versioning for this bucket.
 
-        See:  https://cloud.google.com/storage/docs/object-versioning for
+        See  https://cloud.google.com/storage/docs/object-versioning for
         details.
 
         :type value: convertible to boolean
@@ -758,7 +758,7 @@ def versioning_enabled(self, value):
     def configure_website(self, main_page_suffix=None, not_found_page=None):
         """Configure website-related properties.
 
-        See: https://cloud.google.com/storage/docs/hosting-static-website
+        See https://cloud.google.com/storage/docs/hosting-static-website
 
         .. note::
           This (apparently) only works
@@ -807,7 +807,7 @@ def disable_website(self):
     def get_iam_policy(self, client=None):
         """Retrieve the IAM policy for the bucket.
 
-        See:
+        See
         https://cloud.google.com/storage/docs/json_api/v1/buckets/getIamPolicy
 
         :type client: :class:`~google.cloud.storage.client.Client` or
@@ -829,7 +829,7 @@ def get_iam_policy(self, client=None):
     def set_iam_policy(self, policy, client=None):
         """Update the IAM policy for the bucket.
 
-        See:
+        See
         https://cloud.google.com/storage/docs/json_api/v1/buckets/setIamPolicy
 
         :type policy: :class:`google.cloud.iam.Policy`
@@ -857,7 +857,7 @@ def set_iam_policy(self, policy, client=None):
     def test_iam_permissions(self, permissions, client=None):
         """API call:  test permissions
 
-        See:
+        See
         https://cloud.google.com/storage/docs/json_api/v1/buckets/testIamPermissions
 
         :type permissions: list of string
diff --git a/translate/google/cloud/translate/client.py b/translate/google/cloud/translate/client.py
index 5945265d8124b..9acd7d65cc470 100644
--- a/translate/google/cloud/translate/client.py
+++ b/translate/google/cloud/translate/client.py
@@ -71,7 +71,7 @@ def get_languages(self, target_language=None):
 
         Response
 
-        See:
+        See
         https://cloud.google.com/translate/docs/discovering-supported-languages
 
         :type target_language: str
@@ -98,7 +98,7 @@ def get_languages(self, target_language=None):
     def detect_language(self, values):
         """Detect the language of a string or list of strings.
 
-        See: https://cloud.google.com/translate/docs/detecting-language
+        See https://cloud.google.com/translate/docs/detecting-language
 
         :type values: str or list
         :param values: String or list of strings that will have
@@ -165,7 +165,7 @@ def translate(self, values, target_language=None, format_=None,
                   model=None):
         """Translate a string or list of strings.
 
-        See: https://cloud.google.com/translate/docs/translating-text
+        See https://cloud.google.com/translate/docs/translating-text
 
         :type values: str or list
         :param values: String or list of strings to translate.
diff --git a/vision/MANIFEST.in b/vision/MANIFEST.in
index 9f7100c9528a7..fc77f8c82ff0a 100644
--- a/vision/MANIFEST.in
+++ b/vision/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/vision/google/cloud/gapic/__init__.py b/vision/google/cloud/gapic/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/vision/google/cloud/gapic/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/vision/google/cloud/gapic/vision/__init__.py b/vision/google/cloud/gapic/vision/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/vision/google/cloud/gapic/vision/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/vision/google/cloud/gapic/vision/v1/__init__.py b/vision/google/cloud/gapic/vision/v1/__init__.py
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/vision/google/cloud/gapic/vision/v1/enums.py b/vision/google/cloud/gapic/vision/v1/enums.py
new file mode 100644
index 0000000000000..80eea7a1729ed
--- /dev/null
+++ b/vision/google/cloud/gapic/vision/v1/enums.py
@@ -0,0 +1,195 @@
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Wrappers for protocol buffer enum types."""
+
+
+class TextAnnotation(object):
+    class DetectedBreak(object):
+        class BreakType(object):
+            """
+            Enum to denote the type of break found. New line, space etc.
+
+            Attributes:
+              UNKNOWN (int): Unknown break label type.
+              SPACE (int): Regular space.
+              SURE_SPACE (int): Sure space (very wide).
+              EOL_SURE_SPACE (int): Line-wrapping break.
+              HYPHEN (int): End-line hyphen that is not present in text; does
+              LINE_BREAK (int): not co-occur with SPACE, LEADER_SPACE, or
+                LINE_BREAK.
+                Line break that ends a paragraph.
+            """
+            UNKNOWN = 0
+            SPACE = 1
+            SURE_SPACE = 2
+            EOL_SURE_SPACE = 3
+            HYPHEN = 4
+            LINE_BREAK = 5
+
+
+class Block(object):
+    class BlockType(object):
+        """
+        Type of a block (text, image etc) as identified by OCR.
+
+        Attributes:
+          UNKNOWN (int): Unknown block type.
+          TEXT (int): Regular text block.
+          TABLE (int): Table block.
+          PICTURE (int): Image block.
+          RULER (int): Horizontal/vertical line box.
+          BARCODE (int): Barcode block.
+        """
+        UNKNOWN = 0
+        TEXT = 1
+        TABLE = 2
+        PICTURE = 3
+        RULER = 4
+        BARCODE = 5
+
+
+class Likelihood(object):
+    """
+    A bucketized representation of likelihood, which is intended to give clients
+    highly stable results across model upgrades.
+
+    Attributes:
+      UNKNOWN (int): Unknown likelihood.
+      VERY_UNLIKELY (int): It is very unlikely that the image belongs to the specified vertical.
+      UNLIKELY (int): It is unlikely that the image belongs to the specified vertical.
+      POSSIBLE (int): It is possible that the image belongs to the specified vertical.
+      LIKELY (int): It is likely that the image belongs to the specified vertical.
+      VERY_LIKELY (int): It is very likely that the image belongs to the specified vertical.
+    """
+    UNKNOWN = 0
+    VERY_UNLIKELY = 1
+    UNLIKELY = 2
+    POSSIBLE = 3
+    LIKELY = 4
+    VERY_LIKELY = 5
+
+
+class Feature(object):
+    class Type(object):
+        """
+        Type of image feature.
+
+        Attributes:
+          TYPE_UNSPECIFIED (int): Unspecified feature type.
+          FACE_DETECTION (int): Run face detection.
+          LANDMARK_DETECTION (int): Run landmark detection.
+          LOGO_DETECTION (int): Run logo detection.
+          LABEL_DETECTION (int): Run label detection.
+          TEXT_DETECTION (int): Run OCR.
+          DOCUMENT_TEXT_DETECTION (int): Run dense text document OCR. Takes precedence when both
+            DOCUMENT_TEXT_DETECTION and TEXT_DETECTION are present.
+          SAFE_SEARCH_DETECTION (int): Run computer vision models to compute image safe-search properties.
+          IMAGE_PROPERTIES (int): Compute a set of image properties, such as the image's dominant colors.
+          CROP_HINTS (int): Run crop hints.
+          WEB_DETECTION (int): Run web detection.
+        """
+        TYPE_UNSPECIFIED = 0
+        FACE_DETECTION = 1
+        LANDMARK_DETECTION = 2
+        LOGO_DETECTION = 3
+        LABEL_DETECTION = 4
+        TEXT_DETECTION = 5
+        DOCUMENT_TEXT_DETECTION = 11
+        SAFE_SEARCH_DETECTION = 6
+        IMAGE_PROPERTIES = 7
+        CROP_HINTS = 9
+        WEB_DETECTION = 10
+
+
+class FaceAnnotation(object):
+    class Landmark(object):
+        class Type(object):
+            """
+            Face landmark (feature) type.
+            Left and right are defined from the vantage of the viewer of the image
+            without considering mirror projections typical of photos. So, ``LEFT_EYE``,
+            typically, is the person's right eye.
+
+            Attributes:
+              UNKNOWN_LANDMARK (int): Unknown face landmark detected. Should not be filled.
+              LEFT_EYE (int): Left eye.
+              RIGHT_EYE (int): Right eye.
+              LEFT_OF_LEFT_EYEBROW (int): Left of left eyebrow.
+              RIGHT_OF_LEFT_EYEBROW (int): Right of left eyebrow.
+              LEFT_OF_RIGHT_EYEBROW (int): Left of right eyebrow.
+              RIGHT_OF_RIGHT_EYEBROW (int): Right of right eyebrow.
+              MIDPOINT_BETWEEN_EYES (int): Midpoint between eyes.
+              NOSE_TIP (int): Nose tip.
+              UPPER_LIP (int): Upper lip.
+              LOWER_LIP (int): Lower lip.
+              MOUTH_LEFT (int): Mouth left.
+              MOUTH_RIGHT (int): Mouth right.
+              MOUTH_CENTER (int): Mouth center.
+              NOSE_BOTTOM_RIGHT (int): Nose, bottom right.
+              NOSE_BOTTOM_LEFT (int): Nose, bottom left.
+              NOSE_BOTTOM_CENTER (int): Nose, bottom center.
+              LEFT_EYE_TOP_BOUNDARY (int): Left eye, top boundary.
+              LEFT_EYE_RIGHT_CORNER (int): Left eye, right corner.
+              LEFT_EYE_BOTTOM_BOUNDARY (int): Left eye, bottom boundary.
+              LEFT_EYE_LEFT_CORNER (int): Left eye, left corner.
+              RIGHT_EYE_TOP_BOUNDARY (int): Right eye, top boundary.
+              RIGHT_EYE_RIGHT_CORNER (int): Right eye, right corner.
+              RIGHT_EYE_BOTTOM_BOUNDARY (int): Right eye, bottom boundary.
+              RIGHT_EYE_LEFT_CORNER (int): Right eye, left corner.
+              LEFT_EYEBROW_UPPER_MIDPOINT (int): Left eyebrow, upper midpoint.
+              RIGHT_EYEBROW_UPPER_MIDPOINT (int): Right eyebrow, upper midpoint.
+              LEFT_EAR_TRAGION (int): Left ear tragion.
+              RIGHT_EAR_TRAGION (int): Right ear tragion.
+              LEFT_EYE_PUPIL (int): Left eye pupil.
+              RIGHT_EYE_PUPIL (int): Right eye pupil.
+              FOREHEAD_GLABELLA (int): Forehead glabella.
+              CHIN_GNATHION (int): Chin gnathion.
+              CHIN_LEFT_GONION (int): Chin left gonion.
+              CHIN_RIGHT_GONION (int): Chin right gonion.
+            """
+            UNKNOWN_LANDMARK = 0
+            LEFT_EYE = 1
+            RIGHT_EYE = 2
+            LEFT_OF_LEFT_EYEBROW = 3
+            RIGHT_OF_LEFT_EYEBROW = 4
+            LEFT_OF_RIGHT_EYEBROW = 5
+            RIGHT_OF_RIGHT_EYEBROW = 6
+            MIDPOINT_BETWEEN_EYES = 7
+            NOSE_TIP = 8
+            UPPER_LIP = 9
+            LOWER_LIP = 10
+            MOUTH_LEFT = 11
+            MOUTH_RIGHT = 12
+            MOUTH_CENTER = 13
+            NOSE_BOTTOM_RIGHT = 14
+            NOSE_BOTTOM_LEFT = 15
+            NOSE_BOTTOM_CENTER = 16
+            LEFT_EYE_TOP_BOUNDARY = 17
+            LEFT_EYE_RIGHT_CORNER = 18
+            LEFT_EYE_BOTTOM_BOUNDARY = 19
+            LEFT_EYE_LEFT_CORNER = 20
+            RIGHT_EYE_TOP_BOUNDARY = 21
+            RIGHT_EYE_RIGHT_CORNER = 22
+            RIGHT_EYE_BOTTOM_BOUNDARY = 23
+            RIGHT_EYE_LEFT_CORNER = 24
+            LEFT_EYEBROW_UPPER_MIDPOINT = 25
+            RIGHT_EYEBROW_UPPER_MIDPOINT = 26
+            LEFT_EAR_TRAGION = 27
+            RIGHT_EAR_TRAGION = 28
+            LEFT_EYE_PUPIL = 29
+            RIGHT_EYE_PUPIL = 30
+            FOREHEAD_GLABELLA = 31
+            CHIN_GNATHION = 32
+            CHIN_LEFT_GONION = 33
+            CHIN_RIGHT_GONION = 34
diff --git a/vision/google/cloud/gapic/vision/v1/image_annotator_client.py b/vision/google/cloud/gapic/vision/v1/image_annotator_client.py
new file mode 100644
index 0000000000000..fb84bbc1aa886
--- /dev/null
+++ b/vision/google/cloud/gapic/vision/v1/image_annotator_client.py
@@ -0,0 +1,179 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# EDITING INSTRUCTIONS
+# This file was generated from the file
+# https://github.com/google/googleapis/blob/master/google/cloud/vision/v1/image_annotator.proto,
+# and updates to that file get reflected here through a refresh process.
+# For the short term, the refresh process will only be runnable by Google engineers.
+#
+# The only allowed edits are to method and file documentation. A 3-way
+# merge preserves those additions if the generated source changes.
+"""Accesses the google.cloud.vision.v1 ImageAnnotator API."""
+
+import collections
+import json
+import os
+import pkg_resources
+import platform
+
+from google.gax import api_callable
+from google.gax import config
+from google.gax import path_template
+import google.gax
+
+from google.cloud.gapic.vision.v1 import enums
+from google.cloud.proto.vision.v1 import image_annotator_pb2
+
+
+class ImageAnnotatorClient(object):
+    """Service that performs Google Cloud Vision API detection tasks over
+    client images, such as face, landmark, logo, label, and text detection. The
+    ImageAnnotator service returns detected entities from the images.
+    """
+
+    SERVICE_ADDRESS = 'vision.googleapis.com'
+    """The default address of the service."""
+
+    DEFAULT_SERVICE_PORT = 443
+    """The default port of the service."""
+
+    # The scopes needed to make gRPC calls to all of the methods defined in
+    # this service
+    _ALL_SCOPES = ('https://www.googleapis.com/auth/cloud-platform', )
+
+    def __init__(self,
+                 service_path=SERVICE_ADDRESS,
+                 port=DEFAULT_SERVICE_PORT,
+                 channel=None,
+                 credentials=None,
+                 ssl_credentials=None,
+                 scopes=None,
+                 client_config=None,
+                 app_name=None,
+                 app_version='',
+                 lib_name=None,
+                 lib_version='',
+                 metrics_headers=()):
+        """Constructor.
+
+        Args:
+          service_path (string): The domain name of the API remote host.
+          port (int): The port on which to connect to the remote host.
+          channel (:class:`grpc.Channel`): A ``Channel`` instance through
+            which to make calls.
+          credentials (object): The authorization credentials to attach to
+            requests. These credentials identify this application to the
+            service.
+          ssl_credentials (:class:`grpc.ChannelCredentials`): A
+            ``ChannelCredentials`` instance for use with an SSL-enabled
+            channel.
+          scopes (list[string]): A list of OAuth2 scopes to attach to requests.
+          client_config (dict):
+            A dictionary for call options for each method. See
+            :func:`google.gax.construct_settings` for the structure of
+            this data. Falls back to the default config if not specified
+            or the specified config is missing data points.
+          app_name (string): The name of the application calling
+            the service. Recommended for analytics purposes.
+          app_version (string): The version of the application calling
+            the service. Recommended for analytics purposes.
+          lib_name (string): The API library software used for calling
+            the service. (Unless you are writing an API client itself,
+            leave this as default.)
+          lib_version (string): The API library software version used
+            for calling the service. (Unless you are writing an API client
+            itself, leave this as default.)
+          metrics_headers (dict): A dictionary of values for tracking
+            client library metrics. Ultimately serializes to a string
+            (e.g. 'foo/1.2.3 bar/3.14.1'). This argument should be
+            considered private.
+
+        Returns:
+          A ImageAnnotatorClient object.
+        """
+        # Unless the calling application specifically requested
+        # OAuth scopes, request everything.
+        if scopes is None:
+            scopes = self._ALL_SCOPES
+
+        # Initialize an empty client config, if none is set.
+        if client_config is None:
+            client_config = {}
+
+        # Initialize metrics_headers as an ordered dictionary
+        # (cuts down on cardinality of the resulting string slightly).
+        metrics_headers = collections.OrderedDict(metrics_headers)
+        metrics_headers['gl-python'] = platform.python_version()
+
+        # The library may or may not be set, depending on what is
+        # calling this client. Newer client libraries set the library name
+        # and version.
+        if lib_name:
+            metrics_headers[lib_name] = lib_version
+
+        # Finally, track the GAPIC package version.
+        metrics_headers['gapic'] = pkg_resources.get_distribution(
+            'google-cloud-vision', ).version
+
+        # Load the configuration defaults.
+        default_client_config = json.loads(
+            pkg_resources.resource_string(
+                __name__, 'image_annotator_client_config.json').decode())
+        defaults = api_callable.construct_settings(
+            'google.cloud.vision.v1.ImageAnnotator',
+            default_client_config,
+            client_config,
+            config.STATUS_CODE_NAMES,
+            metrics_headers=metrics_headers, )
+        self.image_annotator_stub = config.create_stub(
+            image_annotator_pb2.ImageAnnotatorStub,
+            channel=channel,
+            service_path=service_path,
+            service_port=port,
+            credentials=credentials,
+            scopes=scopes,
+            ssl_credentials=ssl_credentials)
+
+        self._batch_annotate_images = api_callable.create_api_call(
+            self.image_annotator_stub.BatchAnnotateImages,
+            settings=defaults['batch_annotate_images'])
+
+    # Service calls
+    def batch_annotate_images(self, requests, options=None):
+        """
+        Run image detection and annotation for a batch of images.
+
+        Example:
+          >>> from google.cloud.gapic.vision.v1 import image_annotator_client
+          >>> client = image_annotator_client.ImageAnnotatorClient()
+          >>> requests = []
+          >>> response = client.batch_annotate_images(requests)
+
+        Args:
+          requests (list[:class:`google.cloud.proto.vision.v1.image_annotator_pb2.AnnotateImageRequest`]): Individual image annotation requests for this batch.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          A :class:`google.cloud.proto.vision.v1.image_annotator_pb2.BatchAnnotateImagesResponse` instance.
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        # Create the request object.
+        request = image_annotator_pb2.BatchAnnotateImagesRequest(
+            requests=requests)
+        return self._batch_annotate_images(request, options)
diff --git a/vision/google/cloud/gapic/vision/v1/image_annotator_client_config.json b/vision/google/cloud/gapic/vision/v1/image_annotator_client_config.json
new file mode 100644
index 0000000000000..b7b8b93a7521a
--- /dev/null
+++ b/vision/google/cloud/gapic/vision/v1/image_annotator_client_config.json
@@ -0,0 +1,33 @@
+{
+  "interfaces": {
+    "google.cloud.vision.v1.ImageAnnotator": {
+      "retry_codes": {
+        "idempotent": [
+          "DEADLINE_EXCEEDED",
+          "UNAVAILABLE"
+        ],
+        "non_idempotent": [
+          "UNAVAILABLE"
+        ]
+      },
+      "retry_params": {
+        "default": {
+          "initial_retry_delay_millis": 100,
+          "retry_delay_multiplier": 1.3,
+          "max_retry_delay_millis": 60000,
+          "initial_rpc_timeout_millis": 60000,
+          "rpc_timeout_multiplier": 1.0,
+          "max_rpc_timeout_millis": 60000,
+          "total_timeout_millis": 600000
+        }
+      },
+      "methods": {
+        "BatchAnnotateImages": {
+          "timeout_millis": 60000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        }
+      }
+    }
+  }
+}
diff --git a/vision/google/cloud/proto/__init__.py b/vision/google/cloud/proto/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/vision/google/cloud/proto/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/vision/google/cloud/proto/vision/__init__.py b/vision/google/cloud/proto/vision/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/vision/google/cloud/proto/vision/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/vision/google/cloud/proto/vision/v1/__init__.py b/vision/google/cloud/proto/vision/v1/__init__.py
new file mode 100644
index 0000000000000..8b137891791fe
--- /dev/null
+++ b/vision/google/cloud/proto/vision/v1/__init__.py
@@ -0,0 +1 @@
+
diff --git a/vision/google/cloud/proto/vision/v1/geometry_pb2.py b/vision/google/cloud/proto/vision/v1/geometry_pb2.py
new file mode 100644
index 0000000000000..f0824ead74be6
--- /dev/null
+++ b/vision/google/cloud/proto/vision/v1/geometry_pb2.py
@@ -0,0 +1,211 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: google/cloud/proto/vision/v1/geometry.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf import descriptor_pb2
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='google/cloud/proto/vision/v1/geometry.proto',
+  package='google.cloud.vision.v1',
+  syntax='proto3',
+  serialized_pb=_b('\n+google/cloud/proto/vision/v1/geometry.proto\x12\x16google.cloud.vision.v1\"\x1e\n\x06Vertex\x12\t\n\x01x\x18\x01 \x01(\x05\x12\t\n\x01y\x18\x02 \x01(\x05\"@\n\x0c\x42oundingPoly\x12\x30\n\x08vertices\x18\x01 \x03(\x0b\x32\x1e.google.cloud.vision.v1.Vertex\"+\n\x08Position\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\x12\t\n\x01z\x18\x03 \x01(\x02\x42n\n\x1a\x63om.google.cloud.vision.v1B\rGeometryProtoP\x01Z<google.golang.org/genproto/googleapis/cloud/vision/v1;vision\xf8\x01\x01\x62\x06proto3')
+)
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+
+
+
+_VERTEX = _descriptor.Descriptor(
+  name='Vertex',
+  full_name='google.cloud.vision.v1.Vertex',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='x', full_name='google.cloud.vision.v1.Vertex.x', index=0,
+      number=1, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='y', full_name='google.cloud.vision.v1.Vertex.y', index=1,
+      number=2, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=71,
+  serialized_end=101,
+)
+
+
+_BOUNDINGPOLY = _descriptor.Descriptor(
+  name='BoundingPoly',
+  full_name='google.cloud.vision.v1.BoundingPoly',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='vertices', full_name='google.cloud.vision.v1.BoundingPoly.vertices', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=103,
+  serialized_end=167,
+)
+
+
+_POSITION = _descriptor.Descriptor(
+  name='Position',
+  full_name='google.cloud.vision.v1.Position',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='x', full_name='google.cloud.vision.v1.Position.x', index=0,
+      number=1, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='y', full_name='google.cloud.vision.v1.Position.y', index=1,
+      number=2, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='z', full_name='google.cloud.vision.v1.Position.z', index=2,
+      number=3, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=169,
+  serialized_end=212,
+)
+
+_BOUNDINGPOLY.fields_by_name['vertices'].message_type = _VERTEX
+DESCRIPTOR.message_types_by_name['Vertex'] = _VERTEX
+DESCRIPTOR.message_types_by_name['BoundingPoly'] = _BOUNDINGPOLY
+DESCRIPTOR.message_types_by_name['Position'] = _POSITION
+
+Vertex = _reflection.GeneratedProtocolMessageType('Vertex', (_message.Message,), dict(
+  DESCRIPTOR = _VERTEX,
+  __module__ = 'google.cloud.proto.vision.v1.geometry_pb2'
+  ,
+  __doc__ = """X coordinate.
+  
+  
+  Attributes:
+      y:
+          Y coordinate.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.Vertex)
+  ))
+_sym_db.RegisterMessage(Vertex)
+
+BoundingPoly = _reflection.GeneratedProtocolMessageType('BoundingPoly', (_message.Message,), dict(
+  DESCRIPTOR = _BOUNDINGPOLY,
+  __module__ = 'google.cloud.proto.vision.v1.geometry_pb2'
+  ,
+  __doc__ = """A bounding polygon for the detected image annotation.
+  
+  
+  Attributes:
+      vertices:
+          The bounding polygon vertices.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.BoundingPoly)
+  ))
+_sym_db.RegisterMessage(BoundingPoly)
+
+Position = _reflection.GeneratedProtocolMessageType('Position', (_message.Message,), dict(
+  DESCRIPTOR = _POSITION,
+  __module__ = 'google.cloud.proto.vision.v1.geometry_pb2'
+  ,
+  __doc__ = """A 3D position in the image, used primarily for Face detection landmarks.
+  A valid Position must have both x and y coordinates. The position
+  coordinates are in the same scale as the original image.
+  
+  
+  Attributes:
+      x:
+          X coordinate.
+      y:
+          Y coordinate.
+      z:
+          Z coordinate (or depth).
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.Position)
+  ))
+_sym_db.RegisterMessage(Position)
+
+
+DESCRIPTOR.has_options = True
+DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\032com.google.cloud.vision.v1B\rGeometryProtoP\001Z<google.golang.org/genproto/googleapis/cloud/vision/v1;vision\370\001\001'))
+try:
+  # THESE ELEMENTS WILL BE DEPRECATED.
+  # Please use the generated *_pb2_grpc.py files instead.
+  import grpc
+  from grpc.beta import implementations as beta_implementations
+  from grpc.beta import interfaces as beta_interfaces
+  from grpc.framework.common import cardinality
+  from grpc.framework.interfaces.face import utilities as face_utilities
+except ImportError:
+  pass
+# @@protoc_insertion_point(module_scope)
diff --git a/vision/google/cloud/proto/vision/v1/geometry_pb2_grpc.py b/vision/google/cloud/proto/vision/v1/geometry_pb2_grpc.py
new file mode 100644
index 0000000000000..a89435267cb22
--- /dev/null
+++ b/vision/google/cloud/proto/vision/v1/geometry_pb2_grpc.py
@@ -0,0 +1,3 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+import grpc
+
diff --git a/vision/google/cloud/proto/vision/v1/image_annotator_pb2.py b/vision/google/cloud/proto/vision/v1/image_annotator_pb2.py
new file mode 100644
index 0000000000000..42b38b1497b18
--- /dev/null
+++ b/vision/google/cloud/proto/vision/v1/image_annotator_pb2.py
@@ -0,0 +1,1996 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: google/cloud/proto/vision/v1/image_annotator.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf.internal import enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf import descriptor_pb2
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from google.cloud.proto.vision.v1 import geometry_pb2 as google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_geometry__pb2
+from google.cloud.proto.vision.v1 import text_annotation_pb2 as google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_text__annotation__pb2
+from google.cloud.proto.vision.v1 import web_detection_pb2 as google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_web__detection__pb2
+from google.rpc import status_pb2 as google_dot_rpc_dot_status__pb2
+from google.type import color_pb2 as google_dot_type_dot_color__pb2
+from google.type import latlng_pb2 as google_dot_type_dot_latlng__pb2
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='google/cloud/proto/vision/v1/image_annotator.proto',
+  package='google.cloud.vision.v1',
+  syntax='proto3',
+  serialized_pb=_b('\n2google/cloud/proto/vision/v1/image_annotator.proto\x12\x16google.cloud.vision.v1\x1a\x1cgoogle/api/annotations.proto\x1a+google/cloud/proto/vision/v1/geometry.proto\x1a\x32google/cloud/proto/vision/v1/text_annotation.proto\x1a\x30google/cloud/proto/vision/v1/web_detection.proto\x1a\x17google/rpc/status.proto\x1a\x17google/type/color.proto\x1a\x18google/type/latlng.proto\"\xcb\x02\n\x07\x46\x65\x61ture\x12\x32\n\x04type\x18\x01 \x01(\x0e\x32$.google.cloud.vision.v1.Feature.Type\x12\x13\n\x0bmax_results\x18\x02 \x01(\x05\"\xf6\x01\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x12\n\x0e\x46\x41\x43\x45_DETECTION\x10\x01\x12\x16\n\x12LANDMARK_DETECTION\x10\x02\x12\x12\n\x0eLOGO_DETECTION\x10\x03\x12\x13\n\x0fLABEL_DETECTION\x10\x04\x12\x12\n\x0eTEXT_DETECTION\x10\x05\x12\x1b\n\x17\x44OCUMENT_TEXT_DETECTION\x10\x0b\x12\x19\n\x15SAFE_SEARCH_DETECTION\x10\x06\x12\x14\n\x10IMAGE_PROPERTIES\x10\x07\x12\x0e\n\nCROP_HINTS\x10\t\x12\x11\n\rWEB_DETECTION\x10\n\"7\n\x0bImageSource\x12\x15\n\rgcs_image_uri\x18\x01 \x01(\t\x12\x11\n\timage_uri\x18\x02 \x01(\t\"M\n\x05Image\x12\x0f\n\x07\x63ontent\x18\x01 \x01(\x0c\x12\x33\n\x06source\x18\x02 \x01(\x0b\x32#.google.cloud.vision.v1.ImageSource\"\xc7\r\n\x0e\x46\x61\x63\x65\x41nnotation\x12;\n\rbounding_poly\x18\x01 \x01(\x0b\x32$.google.cloud.vision.v1.BoundingPoly\x12>\n\x10\x66\x64_bounding_poly\x18\x02 \x01(\x0b\x32$.google.cloud.vision.v1.BoundingPoly\x12\x42\n\tlandmarks\x18\x03 \x03(\x0b\x32/.google.cloud.vision.v1.FaceAnnotation.Landmark\x12\x12\n\nroll_angle\x18\x04 \x01(\x02\x12\x11\n\tpan_angle\x18\x05 \x01(\x02\x12\x12\n\ntilt_angle\x18\x06 \x01(\x02\x12\x1c\n\x14\x64\x65tection_confidence\x18\x07 \x01(\x02\x12\x1e\n\x16landmarking_confidence\x18\x08 \x01(\x02\x12:\n\x0ejoy_likelihood\x18\t \x01(\x0e\x32\".google.cloud.vision.v1.Likelihood\x12=\n\x11sorrow_likelihood\x18\n \x01(\x0e\x32\".google.cloud.vision.v1.Likelihood\x12<\n\x10\x61nger_likelihood\x18\x0b \x01(\x0e\x32\".google.cloud.vision.v1.Likelihood\x12?\n\x13surprise_likelihood\x18\x0c \x01(\x0e\x32\".google.cloud.vision.v1.Likelihood\x12\x44\n\x18under_exposed_likelihood\x18\r \x01(\x0e\x32\".google.cloud.vision.v1.Likelihood\x12>\n\x12\x62lurred_likelihood\x18\x0e \x01(\x0e\x32\".google.cloud.vision.v1.Likelihood\x12?\n\x13headwear_likelihood\x18\x0f \x01(\x0e\x32\".google.cloud.vision.v1.Likelihood\x1a\xb9\x07\n\x08Landmark\x12\x42\n\x04type\x18\x03 \x01(\x0e\x32\x34.google.cloud.vision.v1.FaceAnnotation.Landmark.Type\x12\x32\n\x08position\x18\x04 \x01(\x0b\x32 .google.cloud.vision.v1.Position\"\xb4\x06\n\x04Type\x12\x14\n\x10UNKNOWN_LANDMARK\x10\x00\x12\x0c\n\x08LEFT_EYE\x10\x01\x12\r\n\tRIGHT_EYE\x10\x02\x12\x18\n\x14LEFT_OF_LEFT_EYEBROW\x10\x03\x12\x19\n\x15RIGHT_OF_LEFT_EYEBROW\x10\x04\x12\x19\n\x15LEFT_OF_RIGHT_EYEBROW\x10\x05\x12\x1a\n\x16RIGHT_OF_RIGHT_EYEBROW\x10\x06\x12\x19\n\x15MIDPOINT_BETWEEN_EYES\x10\x07\x12\x0c\n\x08NOSE_TIP\x10\x08\x12\r\n\tUPPER_LIP\x10\t\x12\r\n\tLOWER_LIP\x10\n\x12\x0e\n\nMOUTH_LEFT\x10\x0b\x12\x0f\n\x0bMOUTH_RIGHT\x10\x0c\x12\x10\n\x0cMOUTH_CENTER\x10\r\x12\x15\n\x11NOSE_BOTTOM_RIGHT\x10\x0e\x12\x14\n\x10NOSE_BOTTOM_LEFT\x10\x0f\x12\x16\n\x12NOSE_BOTTOM_CENTER\x10\x10\x12\x19\n\x15LEFT_EYE_TOP_BOUNDARY\x10\x11\x12\x19\n\x15LEFT_EYE_RIGHT_CORNER\x10\x12\x12\x1c\n\x18LEFT_EYE_BOTTOM_BOUNDARY\x10\x13\x12\x18\n\x14LEFT_EYE_LEFT_CORNER\x10\x14\x12\x1a\n\x16RIGHT_EYE_TOP_BOUNDARY\x10\x15\x12\x1a\n\x16RIGHT_EYE_RIGHT_CORNER\x10\x16\x12\x1d\n\x19RIGHT_EYE_BOTTOM_BOUNDARY\x10\x17\x12\x19\n\x15RIGHT_EYE_LEFT_CORNER\x10\x18\x12\x1f\n\x1bLEFT_EYEBROW_UPPER_MIDPOINT\x10\x19\x12 \n\x1cRIGHT_EYEBROW_UPPER_MIDPOINT\x10\x1a\x12\x14\n\x10LEFT_EAR_TRAGION\x10\x1b\x12\x15\n\x11RIGHT_EAR_TRAGION\x10\x1c\x12\x12\n\x0eLEFT_EYE_PUPIL\x10\x1d\x12\x13\n\x0fRIGHT_EYE_PUPIL\x10\x1e\x12\x15\n\x11\x46OREHEAD_GLABELLA\x10\x1f\x12\x11\n\rCHIN_GNATHION\x10 \x12\x14\n\x10\x43HIN_LEFT_GONION\x10!\x12\x15\n\x11\x43HIN_RIGHT_GONION\x10\"\"4\n\x0cLocationInfo\x12$\n\x07lat_lng\x18\x01 \x01(\x0b\x32\x13.google.type.LatLng\"\'\n\x08Property\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"\xa7\x02\n\x10\x45ntityAnnotation\x12\x0b\n\x03mid\x18\x01 \x01(\t\x12\x0e\n\x06locale\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x12\r\n\x05score\x18\x04 \x01(\x02\x12\x12\n\nconfidence\x18\x05 \x01(\x02\x12\x12\n\ntopicality\x18\x06 \x01(\x02\x12;\n\rbounding_poly\x18\x07 \x01(\x0b\x32$.google.cloud.vision.v1.BoundingPoly\x12\x37\n\tlocations\x18\x08 \x03(\x0b\x32$.google.cloud.vision.v1.LocationInfo\x12\x34\n\nproperties\x18\t \x03(\x0b\x32 .google.cloud.vision.v1.Property\"\xe7\x01\n\x14SafeSearchAnnotation\x12\x31\n\x05\x61\x64ult\x18\x01 \x01(\x0e\x32\".google.cloud.vision.v1.Likelihood\x12\x31\n\x05spoof\x18\x02 \x01(\x0e\x32\".google.cloud.vision.v1.Likelihood\x12\x33\n\x07medical\x18\x03 \x01(\x0e\x32\".google.cloud.vision.v1.Likelihood\x12\x34\n\x08violence\x18\x04 \x01(\x0e\x32\".google.cloud.vision.v1.Likelihood\"a\n\x0bLatLongRect\x12(\n\x0bmin_lat_lng\x18\x01 \x01(\x0b\x32\x13.google.type.LatLng\x12(\n\x0bmax_lat_lng\x18\x02 \x01(\x0b\x32\x13.google.type.LatLng\"U\n\tColorInfo\x12!\n\x05\x63olor\x18\x01 \x01(\x0b\x32\x12.google.type.Color\x12\r\n\x05score\x18\x02 \x01(\x02\x12\x16\n\x0epixel_fraction\x18\x03 \x01(\x02\"M\n\x18\x44ominantColorsAnnotation\x12\x31\n\x06\x63olors\x18\x01 \x03(\x0b\x32!.google.cloud.vision.v1.ColorInfo\"\\\n\x0fImageProperties\x12I\n\x0f\x64ominant_colors\x18\x01 \x01(\x0b\x32\x30.google.cloud.vision.v1.DominantColorsAnnotation\"x\n\x08\x43ropHint\x12;\n\rbounding_poly\x18\x01 \x01(\x0b\x32$.google.cloud.vision.v1.BoundingPoly\x12\x12\n\nconfidence\x18\x02 \x01(\x02\x12\x1b\n\x13importance_fraction\x18\x03 \x01(\x02\"K\n\x13\x43ropHintsAnnotation\x12\x34\n\ncrop_hints\x18\x01 \x03(\x0b\x32 .google.cloud.vision.v1.CropHint\"(\n\x0f\x43ropHintsParams\x12\x15\n\raspect_ratios\x18\x01 \x03(\x02\"\xa6\x01\n\x0cImageContext\x12:\n\rlat_long_rect\x18\x01 \x01(\x0b\x32#.google.cloud.vision.v1.LatLongRect\x12\x16\n\x0elanguage_hints\x18\x02 \x03(\t\x12\x42\n\x11\x63rop_hints_params\x18\x04 \x01(\x0b\x32\'.google.cloud.vision.v1.CropHintsParams\"\xb4\x01\n\x14\x41nnotateImageRequest\x12,\n\x05image\x18\x01 \x01(\x0b\x32\x1d.google.cloud.vision.v1.Image\x12\x31\n\x08\x66\x65\x61tures\x18\x02 \x03(\x0b\x32\x1f.google.cloud.vision.v1.Feature\x12;\n\rimage_context\x18\x03 \x01(\x0b\x32$.google.cloud.vision.v1.ImageContext\"\xfc\x05\n\x15\x41nnotateImageResponse\x12@\n\x10\x66\x61\x63\x65_annotations\x18\x01 \x03(\x0b\x32&.google.cloud.vision.v1.FaceAnnotation\x12\x46\n\x14landmark_annotations\x18\x02 \x03(\x0b\x32(.google.cloud.vision.v1.EntityAnnotation\x12\x42\n\x10logo_annotations\x18\x03 \x03(\x0b\x32(.google.cloud.vision.v1.EntityAnnotation\x12\x43\n\x11label_annotations\x18\x04 \x03(\x0b\x32(.google.cloud.vision.v1.EntityAnnotation\x12\x42\n\x10text_annotations\x18\x05 \x03(\x0b\x32(.google.cloud.vision.v1.EntityAnnotation\x12\x44\n\x14\x66ull_text_annotation\x18\x0c \x01(\x0b\x32&.google.cloud.vision.v1.TextAnnotation\x12L\n\x16safe_search_annotation\x18\x06 \x01(\x0b\x32,.google.cloud.vision.v1.SafeSearchAnnotation\x12L\n\x1bimage_properties_annotation\x18\x08 \x01(\x0b\x32\'.google.cloud.vision.v1.ImageProperties\x12J\n\x15\x63rop_hints_annotation\x18\x0b \x01(\x0b\x32+.google.cloud.vision.v1.CropHintsAnnotation\x12;\n\rweb_detection\x18\r \x01(\x0b\x32$.google.cloud.vision.v1.WebDetection\x12!\n\x05\x65rror\x18\t \x01(\x0b\x32\x12.google.rpc.Status\"\\\n\x1a\x42\x61tchAnnotateImagesRequest\x12>\n\x08requests\x18\x01 \x03(\x0b\x32,.google.cloud.vision.v1.AnnotateImageRequest\"_\n\x1b\x42\x61tchAnnotateImagesResponse\x12@\n\tresponses\x18\x01 \x03(\x0b\x32-.google.cloud.vision.v1.AnnotateImageResponse*e\n\nLikelihood\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x11\n\rVERY_UNLIKELY\x10\x01\x12\x0c\n\x08UNLIKELY\x10\x02\x12\x0c\n\x08POSSIBLE\x10\x03\x12\n\n\x06LIKELY\x10\x04\x12\x0f\n\x0bVERY_LIKELY\x10\x05\x32\xb1\x01\n\x0eImageAnnotator\x12\x9e\x01\n\x13\x42\x61tchAnnotateImages\x12\x32.google.cloud.vision.v1.BatchAnnotateImagesRequest\x1a\x33.google.cloud.vision.v1.BatchAnnotateImagesResponse\"\x1e\x82\xd3\xe4\x93\x02\x18\"\x13/v1/images:annotate:\x01*Bt\n\x1a\x63om.google.cloud.vision.v1B\x13ImageAnnotatorProtoP\x01Z<google.golang.org/genproto/googleapis/cloud/vision/v1;vision\xf8\x01\x01\x62\x06proto3')
+  ,
+  dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_geometry__pb2.DESCRIPTOR,google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_text__annotation__pb2.DESCRIPTOR,google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_web__detection__pb2.DESCRIPTOR,google_dot_rpc_dot_status__pb2.DESCRIPTOR,google_dot_type_dot_color__pb2.DESCRIPTOR,google_dot_type_dot_latlng__pb2.DESCRIPTOR,])
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+_LIKELIHOOD = _descriptor.EnumDescriptor(
+  name='Likelihood',
+  full_name='google.cloud.vision.v1.Likelihood',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='VERY_UNLIKELY', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='UNLIKELY', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POSSIBLE', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LIKELY', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='VERY_LIKELY', index=5, number=5,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=5076,
+  serialized_end=5177,
+)
+_sym_db.RegisterEnumDescriptor(_LIKELIHOOD)
+
+Likelihood = enum_type_wrapper.EnumTypeWrapper(_LIKELIHOOD)
+UNKNOWN = 0
+VERY_UNLIKELY = 1
+UNLIKELY = 2
+POSSIBLE = 3
+LIKELY = 4
+VERY_LIKELY = 5
+
+
+_FEATURE_TYPE = _descriptor.EnumDescriptor(
+  name='Type',
+  full_name='google.cloud.vision.v1.Feature.Type',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='TYPE_UNSPECIFIED', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='FACE_DETECTION', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LANDMARK_DETECTION', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LOGO_DETECTION', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LABEL_DETECTION', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='TEXT_DETECTION', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DOCUMENT_TEXT_DETECTION', index=6, number=11,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SAFE_SEARCH_DETECTION', index=7, number=6,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='IMAGE_PROPERTIES', index=8, number=7,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CROP_HINTS', index=9, number=9,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='WEB_DETECTION', index=10, number=10,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=417,
+  serialized_end=663,
+)
+_sym_db.RegisterEnumDescriptor(_FEATURE_TYPE)
+
+_FACEANNOTATION_LANDMARK_TYPE = _descriptor.EnumDescriptor(
+  name='Type',
+  full_name='google.cloud.vision.v1.FaceAnnotation.Landmark.Type',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='UNKNOWN_LANDMARK', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LEFT_EYE', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RIGHT_EYE', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LEFT_OF_LEFT_EYEBROW', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RIGHT_OF_LEFT_EYEBROW', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LEFT_OF_RIGHT_EYEBROW', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RIGHT_OF_RIGHT_EYEBROW', index=6, number=6,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MIDPOINT_BETWEEN_EYES', index=7, number=7,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOSE_TIP', index=8, number=8,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='UPPER_LIP', index=9, number=9,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LOWER_LIP', index=10, number=10,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MOUTH_LEFT', index=11, number=11,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MOUTH_RIGHT', index=12, number=12,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MOUTH_CENTER', index=13, number=13,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOSE_BOTTOM_RIGHT', index=14, number=14,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOSE_BOTTOM_LEFT', index=15, number=15,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOSE_BOTTOM_CENTER', index=16, number=16,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LEFT_EYE_TOP_BOUNDARY', index=17, number=17,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LEFT_EYE_RIGHT_CORNER', index=18, number=18,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LEFT_EYE_BOTTOM_BOUNDARY', index=19, number=19,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LEFT_EYE_LEFT_CORNER', index=20, number=20,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RIGHT_EYE_TOP_BOUNDARY', index=21, number=21,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RIGHT_EYE_RIGHT_CORNER', index=22, number=22,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RIGHT_EYE_BOTTOM_BOUNDARY', index=23, number=23,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RIGHT_EYE_LEFT_CORNER', index=24, number=24,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LEFT_EYEBROW_UPPER_MIDPOINT', index=25, number=25,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RIGHT_EYEBROW_UPPER_MIDPOINT', index=26, number=26,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LEFT_EAR_TRAGION', index=27, number=27,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RIGHT_EAR_TRAGION', index=28, number=28,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LEFT_EYE_PUPIL', index=29, number=29,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RIGHT_EYE_PUPIL', index=30, number=30,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='FOREHEAD_GLABELLA', index=31, number=31,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CHIN_GNATHION', index=32, number=32,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CHIN_LEFT_GONION', index=33, number=33,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CHIN_RIGHT_GONION', index=34, number=34,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=1717,
+  serialized_end=2537,
+)
+_sym_db.RegisterEnumDescriptor(_FACEANNOTATION_LANDMARK_TYPE)
+
+
+_FEATURE = _descriptor.Descriptor(
+  name='Feature',
+  full_name='google.cloud.vision.v1.Feature',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='type', full_name='google.cloud.vision.v1.Feature.type', index=0,
+      number=1, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='max_results', full_name='google.cloud.vision.v1.Feature.max_results', index=1,
+      number=2, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _FEATURE_TYPE,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=332,
+  serialized_end=663,
+)
+
+
+_IMAGESOURCE = _descriptor.Descriptor(
+  name='ImageSource',
+  full_name='google.cloud.vision.v1.ImageSource',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='gcs_image_uri', full_name='google.cloud.vision.v1.ImageSource.gcs_image_uri', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='image_uri', full_name='google.cloud.vision.v1.ImageSource.image_uri', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=665,
+  serialized_end=720,
+)
+
+
+_IMAGE = _descriptor.Descriptor(
+  name='Image',
+  full_name='google.cloud.vision.v1.Image',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='content', full_name='google.cloud.vision.v1.Image.content', index=0,
+      number=1, type=12, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b(""),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='source', full_name='google.cloud.vision.v1.Image.source', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=722,
+  serialized_end=799,
+)
+
+
+_FACEANNOTATION_LANDMARK = _descriptor.Descriptor(
+  name='Landmark',
+  full_name='google.cloud.vision.v1.FaceAnnotation.Landmark',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='type', full_name='google.cloud.vision.v1.FaceAnnotation.Landmark.type', index=0,
+      number=3, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='position', full_name='google.cloud.vision.v1.FaceAnnotation.Landmark.position', index=1,
+      number=4, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _FACEANNOTATION_LANDMARK_TYPE,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1584,
+  serialized_end=2537,
+)
+
+_FACEANNOTATION = _descriptor.Descriptor(
+  name='FaceAnnotation',
+  full_name='google.cloud.vision.v1.FaceAnnotation',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='bounding_poly', full_name='google.cloud.vision.v1.FaceAnnotation.bounding_poly', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='fd_bounding_poly', full_name='google.cloud.vision.v1.FaceAnnotation.fd_bounding_poly', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='landmarks', full_name='google.cloud.vision.v1.FaceAnnotation.landmarks', index=2,
+      number=3, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='roll_angle', full_name='google.cloud.vision.v1.FaceAnnotation.roll_angle', index=3,
+      number=4, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='pan_angle', full_name='google.cloud.vision.v1.FaceAnnotation.pan_angle', index=4,
+      number=5, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='tilt_angle', full_name='google.cloud.vision.v1.FaceAnnotation.tilt_angle', index=5,
+      number=6, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='detection_confidence', full_name='google.cloud.vision.v1.FaceAnnotation.detection_confidence', index=6,
+      number=7, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='landmarking_confidence', full_name='google.cloud.vision.v1.FaceAnnotation.landmarking_confidence', index=7,
+      number=8, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='joy_likelihood', full_name='google.cloud.vision.v1.FaceAnnotation.joy_likelihood', index=8,
+      number=9, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='sorrow_likelihood', full_name='google.cloud.vision.v1.FaceAnnotation.sorrow_likelihood', index=9,
+      number=10, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='anger_likelihood', full_name='google.cloud.vision.v1.FaceAnnotation.anger_likelihood', index=10,
+      number=11, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='surprise_likelihood', full_name='google.cloud.vision.v1.FaceAnnotation.surprise_likelihood', index=11,
+      number=12, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='under_exposed_likelihood', full_name='google.cloud.vision.v1.FaceAnnotation.under_exposed_likelihood', index=12,
+      number=13, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='blurred_likelihood', full_name='google.cloud.vision.v1.FaceAnnotation.blurred_likelihood', index=13,
+      number=14, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='headwear_likelihood', full_name='google.cloud.vision.v1.FaceAnnotation.headwear_likelihood', index=14,
+      number=15, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[_FACEANNOTATION_LANDMARK, ],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=802,
+  serialized_end=2537,
+)
+
+
+_LOCATIONINFO = _descriptor.Descriptor(
+  name='LocationInfo',
+  full_name='google.cloud.vision.v1.LocationInfo',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='lat_lng', full_name='google.cloud.vision.v1.LocationInfo.lat_lng', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=2539,
+  serialized_end=2591,
+)
+
+
+_PROPERTY = _descriptor.Descriptor(
+  name='Property',
+  full_name='google.cloud.vision.v1.Property',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='name', full_name='google.cloud.vision.v1.Property.name', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='value', full_name='google.cloud.vision.v1.Property.value', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=2593,
+  serialized_end=2632,
+)
+
+
+_ENTITYANNOTATION = _descriptor.Descriptor(
+  name='EntityAnnotation',
+  full_name='google.cloud.vision.v1.EntityAnnotation',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='mid', full_name='google.cloud.vision.v1.EntityAnnotation.mid', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='locale', full_name='google.cloud.vision.v1.EntityAnnotation.locale', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='description', full_name='google.cloud.vision.v1.EntityAnnotation.description', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='score', full_name='google.cloud.vision.v1.EntityAnnotation.score', index=3,
+      number=4, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='confidence', full_name='google.cloud.vision.v1.EntityAnnotation.confidence', index=4,
+      number=5, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='topicality', full_name='google.cloud.vision.v1.EntityAnnotation.topicality', index=5,
+      number=6, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='bounding_poly', full_name='google.cloud.vision.v1.EntityAnnotation.bounding_poly', index=6,
+      number=7, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='locations', full_name='google.cloud.vision.v1.EntityAnnotation.locations', index=7,
+      number=8, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='properties', full_name='google.cloud.vision.v1.EntityAnnotation.properties', index=8,
+      number=9, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=2635,
+  serialized_end=2930,
+)
+
+
+_SAFESEARCHANNOTATION = _descriptor.Descriptor(
+  name='SafeSearchAnnotation',
+  full_name='google.cloud.vision.v1.SafeSearchAnnotation',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='adult', full_name='google.cloud.vision.v1.SafeSearchAnnotation.adult', index=0,
+      number=1, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='spoof', full_name='google.cloud.vision.v1.SafeSearchAnnotation.spoof', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='medical', full_name='google.cloud.vision.v1.SafeSearchAnnotation.medical', index=2,
+      number=3, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='violence', full_name='google.cloud.vision.v1.SafeSearchAnnotation.violence', index=3,
+      number=4, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=2933,
+  serialized_end=3164,
+)
+
+
+_LATLONGRECT = _descriptor.Descriptor(
+  name='LatLongRect',
+  full_name='google.cloud.vision.v1.LatLongRect',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='min_lat_lng', full_name='google.cloud.vision.v1.LatLongRect.min_lat_lng', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='max_lat_lng', full_name='google.cloud.vision.v1.LatLongRect.max_lat_lng', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=3166,
+  serialized_end=3263,
+)
+
+
+_COLORINFO = _descriptor.Descriptor(
+  name='ColorInfo',
+  full_name='google.cloud.vision.v1.ColorInfo',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='color', full_name='google.cloud.vision.v1.ColorInfo.color', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='score', full_name='google.cloud.vision.v1.ColorInfo.score', index=1,
+      number=2, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='pixel_fraction', full_name='google.cloud.vision.v1.ColorInfo.pixel_fraction', index=2,
+      number=3, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=3265,
+  serialized_end=3350,
+)
+
+
+_DOMINANTCOLORSANNOTATION = _descriptor.Descriptor(
+  name='DominantColorsAnnotation',
+  full_name='google.cloud.vision.v1.DominantColorsAnnotation',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='colors', full_name='google.cloud.vision.v1.DominantColorsAnnotation.colors', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=3352,
+  serialized_end=3429,
+)
+
+
+_IMAGEPROPERTIES = _descriptor.Descriptor(
+  name='ImageProperties',
+  full_name='google.cloud.vision.v1.ImageProperties',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='dominant_colors', full_name='google.cloud.vision.v1.ImageProperties.dominant_colors', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=3431,
+  serialized_end=3523,
+)
+
+
+_CROPHINT = _descriptor.Descriptor(
+  name='CropHint',
+  full_name='google.cloud.vision.v1.CropHint',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='bounding_poly', full_name='google.cloud.vision.v1.CropHint.bounding_poly', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='confidence', full_name='google.cloud.vision.v1.CropHint.confidence', index=1,
+      number=2, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='importance_fraction', full_name='google.cloud.vision.v1.CropHint.importance_fraction', index=2,
+      number=3, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=3525,
+  serialized_end=3645,
+)
+
+
+_CROPHINTSANNOTATION = _descriptor.Descriptor(
+  name='CropHintsAnnotation',
+  full_name='google.cloud.vision.v1.CropHintsAnnotation',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='crop_hints', full_name='google.cloud.vision.v1.CropHintsAnnotation.crop_hints', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=3647,
+  serialized_end=3722,
+)
+
+
+_CROPHINTSPARAMS = _descriptor.Descriptor(
+  name='CropHintsParams',
+  full_name='google.cloud.vision.v1.CropHintsParams',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='aspect_ratios', full_name='google.cloud.vision.v1.CropHintsParams.aspect_ratios', index=0,
+      number=1, type=2, cpp_type=6, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=3724,
+  serialized_end=3764,
+)
+
+
+_IMAGECONTEXT = _descriptor.Descriptor(
+  name='ImageContext',
+  full_name='google.cloud.vision.v1.ImageContext',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='lat_long_rect', full_name='google.cloud.vision.v1.ImageContext.lat_long_rect', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='language_hints', full_name='google.cloud.vision.v1.ImageContext.language_hints', index=1,
+      number=2, type=9, cpp_type=9, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='crop_hints_params', full_name='google.cloud.vision.v1.ImageContext.crop_hints_params', index=2,
+      number=4, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=3767,
+  serialized_end=3933,
+)
+
+
+_ANNOTATEIMAGEREQUEST = _descriptor.Descriptor(
+  name='AnnotateImageRequest',
+  full_name='google.cloud.vision.v1.AnnotateImageRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='image', full_name='google.cloud.vision.v1.AnnotateImageRequest.image', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='features', full_name='google.cloud.vision.v1.AnnotateImageRequest.features', index=1,
+      number=2, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='image_context', full_name='google.cloud.vision.v1.AnnotateImageRequest.image_context', index=2,
+      number=3, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=3936,
+  serialized_end=4116,
+)
+
+
+_ANNOTATEIMAGERESPONSE = _descriptor.Descriptor(
+  name='AnnotateImageResponse',
+  full_name='google.cloud.vision.v1.AnnotateImageResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='face_annotations', full_name='google.cloud.vision.v1.AnnotateImageResponse.face_annotations', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='landmark_annotations', full_name='google.cloud.vision.v1.AnnotateImageResponse.landmark_annotations', index=1,
+      number=2, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='logo_annotations', full_name='google.cloud.vision.v1.AnnotateImageResponse.logo_annotations', index=2,
+      number=3, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='label_annotations', full_name='google.cloud.vision.v1.AnnotateImageResponse.label_annotations', index=3,
+      number=4, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='text_annotations', full_name='google.cloud.vision.v1.AnnotateImageResponse.text_annotations', index=4,
+      number=5, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='full_text_annotation', full_name='google.cloud.vision.v1.AnnotateImageResponse.full_text_annotation', index=5,
+      number=12, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='safe_search_annotation', full_name='google.cloud.vision.v1.AnnotateImageResponse.safe_search_annotation', index=6,
+      number=6, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='image_properties_annotation', full_name='google.cloud.vision.v1.AnnotateImageResponse.image_properties_annotation', index=7,
+      number=8, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='crop_hints_annotation', full_name='google.cloud.vision.v1.AnnotateImageResponse.crop_hints_annotation', index=8,
+      number=11, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='web_detection', full_name='google.cloud.vision.v1.AnnotateImageResponse.web_detection', index=9,
+      number=13, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='error', full_name='google.cloud.vision.v1.AnnotateImageResponse.error', index=10,
+      number=9, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=4119,
+  serialized_end=4883,
+)
+
+
+_BATCHANNOTATEIMAGESREQUEST = _descriptor.Descriptor(
+  name='BatchAnnotateImagesRequest',
+  full_name='google.cloud.vision.v1.BatchAnnotateImagesRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='requests', full_name='google.cloud.vision.v1.BatchAnnotateImagesRequest.requests', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=4885,
+  serialized_end=4977,
+)
+
+
+_BATCHANNOTATEIMAGESRESPONSE = _descriptor.Descriptor(
+  name='BatchAnnotateImagesResponse',
+  full_name='google.cloud.vision.v1.BatchAnnotateImagesResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='responses', full_name='google.cloud.vision.v1.BatchAnnotateImagesResponse.responses', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=4979,
+  serialized_end=5074,
+)
+
+_FEATURE.fields_by_name['type'].enum_type = _FEATURE_TYPE
+_FEATURE_TYPE.containing_type = _FEATURE
+_IMAGE.fields_by_name['source'].message_type = _IMAGESOURCE
+_FACEANNOTATION_LANDMARK.fields_by_name['type'].enum_type = _FACEANNOTATION_LANDMARK_TYPE
+_FACEANNOTATION_LANDMARK.fields_by_name['position'].message_type = google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_geometry__pb2._POSITION
+_FACEANNOTATION_LANDMARK.containing_type = _FACEANNOTATION
+_FACEANNOTATION_LANDMARK_TYPE.containing_type = _FACEANNOTATION_LANDMARK
+_FACEANNOTATION.fields_by_name['bounding_poly'].message_type = google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_geometry__pb2._BOUNDINGPOLY
+_FACEANNOTATION.fields_by_name['fd_bounding_poly'].message_type = google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_geometry__pb2._BOUNDINGPOLY
+_FACEANNOTATION.fields_by_name['landmarks'].message_type = _FACEANNOTATION_LANDMARK
+_FACEANNOTATION.fields_by_name['joy_likelihood'].enum_type = _LIKELIHOOD
+_FACEANNOTATION.fields_by_name['sorrow_likelihood'].enum_type = _LIKELIHOOD
+_FACEANNOTATION.fields_by_name['anger_likelihood'].enum_type = _LIKELIHOOD
+_FACEANNOTATION.fields_by_name['surprise_likelihood'].enum_type = _LIKELIHOOD
+_FACEANNOTATION.fields_by_name['under_exposed_likelihood'].enum_type = _LIKELIHOOD
+_FACEANNOTATION.fields_by_name['blurred_likelihood'].enum_type = _LIKELIHOOD
+_FACEANNOTATION.fields_by_name['headwear_likelihood'].enum_type = _LIKELIHOOD
+_LOCATIONINFO.fields_by_name['lat_lng'].message_type = google_dot_type_dot_latlng__pb2._LATLNG
+_ENTITYANNOTATION.fields_by_name['bounding_poly'].message_type = google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_geometry__pb2._BOUNDINGPOLY
+_ENTITYANNOTATION.fields_by_name['locations'].message_type = _LOCATIONINFO
+_ENTITYANNOTATION.fields_by_name['properties'].message_type = _PROPERTY
+_SAFESEARCHANNOTATION.fields_by_name['adult'].enum_type = _LIKELIHOOD
+_SAFESEARCHANNOTATION.fields_by_name['spoof'].enum_type = _LIKELIHOOD
+_SAFESEARCHANNOTATION.fields_by_name['medical'].enum_type = _LIKELIHOOD
+_SAFESEARCHANNOTATION.fields_by_name['violence'].enum_type = _LIKELIHOOD
+_LATLONGRECT.fields_by_name['min_lat_lng'].message_type = google_dot_type_dot_latlng__pb2._LATLNG
+_LATLONGRECT.fields_by_name['max_lat_lng'].message_type = google_dot_type_dot_latlng__pb2._LATLNG
+_COLORINFO.fields_by_name['color'].message_type = google_dot_type_dot_color__pb2._COLOR
+_DOMINANTCOLORSANNOTATION.fields_by_name['colors'].message_type = _COLORINFO
+_IMAGEPROPERTIES.fields_by_name['dominant_colors'].message_type = _DOMINANTCOLORSANNOTATION
+_CROPHINT.fields_by_name['bounding_poly'].message_type = google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_geometry__pb2._BOUNDINGPOLY
+_CROPHINTSANNOTATION.fields_by_name['crop_hints'].message_type = _CROPHINT
+_IMAGECONTEXT.fields_by_name['lat_long_rect'].message_type = _LATLONGRECT
+_IMAGECONTEXT.fields_by_name['crop_hints_params'].message_type = _CROPHINTSPARAMS
+_ANNOTATEIMAGEREQUEST.fields_by_name['image'].message_type = _IMAGE
+_ANNOTATEIMAGEREQUEST.fields_by_name['features'].message_type = _FEATURE
+_ANNOTATEIMAGEREQUEST.fields_by_name['image_context'].message_type = _IMAGECONTEXT
+_ANNOTATEIMAGERESPONSE.fields_by_name['face_annotations'].message_type = _FACEANNOTATION
+_ANNOTATEIMAGERESPONSE.fields_by_name['landmark_annotations'].message_type = _ENTITYANNOTATION
+_ANNOTATEIMAGERESPONSE.fields_by_name['logo_annotations'].message_type = _ENTITYANNOTATION
+_ANNOTATEIMAGERESPONSE.fields_by_name['label_annotations'].message_type = _ENTITYANNOTATION
+_ANNOTATEIMAGERESPONSE.fields_by_name['text_annotations'].message_type = _ENTITYANNOTATION
+_ANNOTATEIMAGERESPONSE.fields_by_name['full_text_annotation'].message_type = google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_text__annotation__pb2._TEXTANNOTATION
+_ANNOTATEIMAGERESPONSE.fields_by_name['safe_search_annotation'].message_type = _SAFESEARCHANNOTATION
+_ANNOTATEIMAGERESPONSE.fields_by_name['image_properties_annotation'].message_type = _IMAGEPROPERTIES
+_ANNOTATEIMAGERESPONSE.fields_by_name['crop_hints_annotation'].message_type = _CROPHINTSANNOTATION
+_ANNOTATEIMAGERESPONSE.fields_by_name['web_detection'].message_type = google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_web__detection__pb2._WEBDETECTION
+_ANNOTATEIMAGERESPONSE.fields_by_name['error'].message_type = google_dot_rpc_dot_status__pb2._STATUS
+_BATCHANNOTATEIMAGESREQUEST.fields_by_name['requests'].message_type = _ANNOTATEIMAGEREQUEST
+_BATCHANNOTATEIMAGESRESPONSE.fields_by_name['responses'].message_type = _ANNOTATEIMAGERESPONSE
+DESCRIPTOR.message_types_by_name['Feature'] = _FEATURE
+DESCRIPTOR.message_types_by_name['ImageSource'] = _IMAGESOURCE
+DESCRIPTOR.message_types_by_name['Image'] = _IMAGE
+DESCRIPTOR.message_types_by_name['FaceAnnotation'] = _FACEANNOTATION
+DESCRIPTOR.message_types_by_name['LocationInfo'] = _LOCATIONINFO
+DESCRIPTOR.message_types_by_name['Property'] = _PROPERTY
+DESCRIPTOR.message_types_by_name['EntityAnnotation'] = _ENTITYANNOTATION
+DESCRIPTOR.message_types_by_name['SafeSearchAnnotation'] = _SAFESEARCHANNOTATION
+DESCRIPTOR.message_types_by_name['LatLongRect'] = _LATLONGRECT
+DESCRIPTOR.message_types_by_name['ColorInfo'] = _COLORINFO
+DESCRIPTOR.message_types_by_name['DominantColorsAnnotation'] = _DOMINANTCOLORSANNOTATION
+DESCRIPTOR.message_types_by_name['ImageProperties'] = _IMAGEPROPERTIES
+DESCRIPTOR.message_types_by_name['CropHint'] = _CROPHINT
+DESCRIPTOR.message_types_by_name['CropHintsAnnotation'] = _CROPHINTSANNOTATION
+DESCRIPTOR.message_types_by_name['CropHintsParams'] = _CROPHINTSPARAMS
+DESCRIPTOR.message_types_by_name['ImageContext'] = _IMAGECONTEXT
+DESCRIPTOR.message_types_by_name['AnnotateImageRequest'] = _ANNOTATEIMAGEREQUEST
+DESCRIPTOR.message_types_by_name['AnnotateImageResponse'] = _ANNOTATEIMAGERESPONSE
+DESCRIPTOR.message_types_by_name['BatchAnnotateImagesRequest'] = _BATCHANNOTATEIMAGESREQUEST
+DESCRIPTOR.message_types_by_name['BatchAnnotateImagesResponse'] = _BATCHANNOTATEIMAGESRESPONSE
+DESCRIPTOR.enum_types_by_name['Likelihood'] = _LIKELIHOOD
+
+Feature = _reflection.GeneratedProtocolMessageType('Feature', (_message.Message,), dict(
+  DESCRIPTOR = _FEATURE,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Users describe the type of Google Cloud Vision API tasks to perform over
+  images by using *Feature*\ s. Each Feature indicates a type of image
+  detection task to perform. Features encode the Cloud Vision API vertical
+  to operate on and the number of top-scoring results to return.
+  
+  
+  Attributes:
+      type:
+          The feature type.
+      max_results:
+          Maximum number of results of this type.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.Feature)
+  ))
+_sym_db.RegisterMessage(Feature)
+
+ImageSource = _reflection.GeneratedProtocolMessageType('ImageSource', (_message.Message,), dict(
+  DESCRIPTOR = _IMAGESOURCE,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """External image source (Google Cloud Storage image location).
+  
+  
+  Attributes:
+      gcs_image_uri:
+          NOTE: For new code ``image_uri`` below is preferred. Google
+          Cloud Storage image URI, which must be in the following form:
+          ``gs://bucket_name/object_name`` (for details, see `Google
+          Cloud Storage Request URIs
+          <https://cloud.google.com/storage/docs/reference-uris>`__).
+          NOTE: Cloud Storage object versioning is not supported.
+      image_uri:
+          Image URI which supports: 1) Google Cloud Storage image URI,
+          which must be in the following form:
+          ``gs://bucket_name/object_name`` (for details, see `Google
+          Cloud Storage Request URIs
+          <https://cloud.google.com/storage/docs/reference-uris>`__).
+          NOTE: Cloud Storage object versioning is not supported. 2)
+          Publicly accessible image HTTP/HTTPS URL. This is preferred
+          over the legacy ``gcs_image_uri`` above. When both
+          ``gcs_image_uri`` and ``image_uri`` are specified,
+          ``image_uri`` takes precedence.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.ImageSource)
+  ))
+_sym_db.RegisterMessage(ImageSource)
+
+Image = _reflection.GeneratedProtocolMessageType('Image', (_message.Message,), dict(
+  DESCRIPTOR = _IMAGE,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Client image to perform Google Cloud Vision API tasks over.
+  
+  
+  Attributes:
+      content:
+          Image content, represented as a stream of bytes. Note: as with
+          all ``bytes`` fields, protobuffers use a pure binary
+          representation, whereas JSON representations use base64.
+      source:
+          Google Cloud Storage image location. If both ``content`` and
+          ``source`` are provided for an image, ``content`` takes
+          precedence and is used to perform the image annotation
+          request.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.Image)
+  ))
+_sym_db.RegisterMessage(Image)
+
+FaceAnnotation = _reflection.GeneratedProtocolMessageType('FaceAnnotation', (_message.Message,), dict(
+
+  Landmark = _reflection.GeneratedProtocolMessageType('Landmark', (_message.Message,), dict(
+    DESCRIPTOR = _FACEANNOTATION_LANDMARK,
+    __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+    ,
+    __doc__ = """A face-specific landmark (for example, a face feature). Landmark
+    positions may fall outside the bounds of the image if the face is near
+    one or more edges of the image. Therefore it is NOT guaranteed that
+    ``0 <= x < width`` or ``0 <= y < height``.
+    """,
+    # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.FaceAnnotation.Landmark)
+    ))
+  ,
+  DESCRIPTOR = _FACEANNOTATION,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """A face annotation object contains the results of face detection.
+  
+  
+  Attributes:
+      type:
+          Face landmark type.
+      position:
+          Face landmark position.
+      bounding_poly:
+          The bounding polygon around the face. The coordinates of the
+          bounding box are in the original image's scale, as returned in
+          ``ImageParams``. The bounding box is computed to "frame" the
+          face in accordance with human expectations. It is based on the
+          landmarker results. Note that one or more x and/or y
+          coordinates may not be generated in the ``BoundingPoly`` (the
+          polygon will be unbounded) if only a partial face appears in
+          the image to be annotated.
+      fd_bounding_poly:
+          The ``fd_bounding_poly`` bounding polygon is tighter than the
+          ``boundingPoly``, and encloses only the skin part of the face.
+          Typically, it is used to eliminate the face from any image
+          analysis that detects the "amount of skin" visible in an
+          image. It is not based on the landmarker results, only on the
+          initial face detection, hence the fd (face detection) prefix.
+      landmarks:
+          Detected face landmarks.
+      roll_angle:
+          Roll angle, which indicates the amount of clockwise/anti-
+          clockwise rotation of the face relative to the image vertical
+          about the axis perpendicular to the face. Range [-180,180].
+      pan_angle:
+          Yaw angle, which indicates the leftward/rightward angle that
+          the face is pointing relative to the vertical plane
+          perpendicular to the image. Range [-180,180].
+      tilt_angle:
+          Pitch angle, which indicates the upwards/downwards angle that
+          the face is pointing relative to the image's horizontal plane.
+          Range [-180,180].
+      detection_confidence:
+          Detection confidence. Range [0, 1].
+      landmarking_confidence:
+          Face landmarking confidence. Range [0, 1].
+      joy_likelihood:
+          Joy likelihood.
+      sorrow_likelihood:
+          Sorrow likelihood.
+      anger_likelihood:
+          Anger likelihood.
+      surprise_likelihood:
+          Surprise likelihood.
+      under_exposed_likelihood:
+          Under-exposed likelihood.
+      blurred_likelihood:
+          Blurred likelihood.
+      headwear_likelihood:
+          Headwear likelihood.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.FaceAnnotation)
+  ))
+_sym_db.RegisterMessage(FaceAnnotation)
+_sym_db.RegisterMessage(FaceAnnotation.Landmark)
+
+LocationInfo = _reflection.GeneratedProtocolMessageType('LocationInfo', (_message.Message,), dict(
+  DESCRIPTOR = _LOCATIONINFO,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Detected entity location information.
+  
+  
+  Attributes:
+      lat_lng:
+          lat/long location coordinates.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.LocationInfo)
+  ))
+_sym_db.RegisterMessage(LocationInfo)
+
+Property = _reflection.GeneratedProtocolMessageType('Property', (_message.Message,), dict(
+  DESCRIPTOR = _PROPERTY,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """A ``Property`` consists of a user-supplied name/value pair.
+  
+  
+  Attributes:
+      name:
+          Name of the property.
+      value:
+          Value of the property.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.Property)
+  ))
+_sym_db.RegisterMessage(Property)
+
+EntityAnnotation = _reflection.GeneratedProtocolMessageType('EntityAnnotation', (_message.Message,), dict(
+  DESCRIPTOR = _ENTITYANNOTATION,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Set of detected entity features.
+  
+  
+  Attributes:
+      mid:
+          Opaque entity ID. Some IDs may be available in `Google
+          Knowledge Graph Search API
+          <https://developers.google.com/knowledge-graph/>`__.
+      locale:
+          The language code for the locale in which the entity textual
+          ``description`` is expressed.
+      description:
+          Entity textual description, expressed in its ``locale``
+          language.
+      score:
+          Overall score of the result. Range [0, 1].
+      confidence:
+          The accuracy of the entity detection in an image. For example,
+          for an image in which the "Eiffel Tower" entity is detected,
+          this field represents the confidence that there is a tower in
+          the query image. Range [0, 1].
+      topicality:
+          The relevancy of the ICA (Image Content Annotation) label to
+          the image. For example, the relevancy of "tower" is likely
+          higher to an image containing the detected "Eiffel Tower" than
+          to an image containing a detected distant towering building,
+          even though the confidence that there is a tower in each image
+          may be the same. Range [0, 1].
+      bounding_poly:
+          Image region to which this entity belongs. Currently not
+          produced for ``LABEL_DETECTION`` features. For
+          ``TEXT_DETECTION`` (OCR), ``boundingPoly``\ s are produced for
+          the entire text detected in an image region, followed by
+          ``boundingPoly``\ s for each word within the detected text.
+      locations:
+          The location information for the detected entity. Multiple
+          ``LocationInfo`` elements can be present because one location
+          may indicate the location of the scene in the image, and
+          another location may indicate the location of the place where
+          the image was taken. Location information is usually present
+          for landmarks.
+      properties:
+          Some entities may have optional user-supplied ``Property``
+          (name/value) fields, such a score or string that qualifies the
+          entity.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.EntityAnnotation)
+  ))
+_sym_db.RegisterMessage(EntityAnnotation)
+
+SafeSearchAnnotation = _reflection.GeneratedProtocolMessageType('SafeSearchAnnotation', (_message.Message,), dict(
+  DESCRIPTOR = _SAFESEARCHANNOTATION,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Set of features pertaining to the image, computed by computer vision
+  methods over safe-search verticals (for example, adult, spoof, medical,
+  violence).
+  
+  
+  Attributes:
+      adult:
+          Represents the adult content likelihood for the image.
+      spoof:
+          Spoof likelihood. The likelihood that an modification was made
+          to the image's canonical version to make it appear funny or
+          offensive.
+      medical:
+          Likelihood that this is a medical image.
+      violence:
+          Violence likelihood.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.SafeSearchAnnotation)
+  ))
+_sym_db.RegisterMessage(SafeSearchAnnotation)
+
+LatLongRect = _reflection.GeneratedProtocolMessageType('LatLongRect', (_message.Message,), dict(
+  DESCRIPTOR = _LATLONGRECT,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Rectangle determined by min and max ``LatLng`` pairs.
+  
+  
+  Attributes:
+      min_lat_lng:
+          Min lat/long pair.
+      max_lat_lng:
+          Max lat/long pair.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.LatLongRect)
+  ))
+_sym_db.RegisterMessage(LatLongRect)
+
+ColorInfo = _reflection.GeneratedProtocolMessageType('ColorInfo', (_message.Message,), dict(
+  DESCRIPTOR = _COLORINFO,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Color information consists of RGB channels, score, and the fraction of
+  the image that the color occupies in the image.
+  
+  
+  Attributes:
+      color:
+          RGB components of the color.
+      score:
+          Image-specific score for this color. Value in range [0, 1].
+      pixel_fraction:
+          The fraction of pixels the color occupies in the image. Value
+          in range [0, 1].
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.ColorInfo)
+  ))
+_sym_db.RegisterMessage(ColorInfo)
+
+DominantColorsAnnotation = _reflection.GeneratedProtocolMessageType('DominantColorsAnnotation', (_message.Message,), dict(
+  DESCRIPTOR = _DOMINANTCOLORSANNOTATION,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Set of dominant colors and their corresponding scores.
+  
+  
+  Attributes:
+      colors:
+          RGB color values with their score and pixel fraction.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.DominantColorsAnnotation)
+  ))
+_sym_db.RegisterMessage(DominantColorsAnnotation)
+
+ImageProperties = _reflection.GeneratedProtocolMessageType('ImageProperties', (_message.Message,), dict(
+  DESCRIPTOR = _IMAGEPROPERTIES,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Stores image properties, such as dominant colors.
+  
+  
+  Attributes:
+      dominant_colors:
+          If present, dominant colors completed successfully.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.ImageProperties)
+  ))
+_sym_db.RegisterMessage(ImageProperties)
+
+CropHint = _reflection.GeneratedProtocolMessageType('CropHint', (_message.Message,), dict(
+  DESCRIPTOR = _CROPHINT,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Single crop hint that is used to generate a new crop when serving an
+  image.
+  
+  
+  Attributes:
+      bounding_poly:
+          The bounding polygon for the crop region. The coordinates of
+          the bounding box are in the original image's scale, as
+          returned in ``ImageParams``.
+      confidence:
+          Confidence of this being a salient region. Range [0, 1].
+      importance_fraction:
+          Fraction of importance of this salient region with respect to
+          the original image.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.CropHint)
+  ))
+_sym_db.RegisterMessage(CropHint)
+
+CropHintsAnnotation = _reflection.GeneratedProtocolMessageType('CropHintsAnnotation', (_message.Message,), dict(
+  DESCRIPTOR = _CROPHINTSANNOTATION,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Set of crop hints that are used to generate new crops when serving
+  images.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.CropHintsAnnotation)
+  ))
+_sym_db.RegisterMessage(CropHintsAnnotation)
+
+CropHintsParams = _reflection.GeneratedProtocolMessageType('CropHintsParams', (_message.Message,), dict(
+  DESCRIPTOR = _CROPHINTSPARAMS,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Parameters for crop hints annotation request.
+  
+  
+  Attributes:
+      aspect_ratios:
+          Aspect ratios in floats, representing the ratio of the width
+          to the height of the image. For example, if the desired aspect
+          ratio is 4/3, the corresponding float value should be 1.33333.
+          If not specified, the best possible crop is returned. The
+          number of provided aspect ratios is limited to a maximum of
+          16; any aspect ratios provided after the 16th are ignored.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.CropHintsParams)
+  ))
+_sym_db.RegisterMessage(CropHintsParams)
+
+ImageContext = _reflection.GeneratedProtocolMessageType('ImageContext', (_message.Message,), dict(
+  DESCRIPTOR = _IMAGECONTEXT,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Image context and/or feature-specific parameters.
+  
+  
+  Attributes:
+      lat_long_rect:
+          lat/long rectangle that specifies the location of the image.
+      language_hints:
+          List of languages to use for TEXT\_DETECTION. In most cases,
+          an empty value yields the best results since it enables
+          automatic language detection. For languages based on the Latin
+          alphabet, setting ``language_hints`` is not needed. In rare
+          cases, when the language of the text in the image is known,
+          setting a hint will help get better results (although it will
+          be a significant hindrance if the hint is wrong). Text
+          detection returns an error if one or more of the specified
+          languages is not one of the `supported languages
+          </vision/docs/languages>`__.
+      crop_hints_params:
+          Parameters for crop hints annotation request.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.ImageContext)
+  ))
+_sym_db.RegisterMessage(ImageContext)
+
+AnnotateImageRequest = _reflection.GeneratedProtocolMessageType('AnnotateImageRequest', (_message.Message,), dict(
+  DESCRIPTOR = _ANNOTATEIMAGEREQUEST,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Request for performing Google Cloud Vision API tasks over a
+  user-provided image, with user-requested features.
+  
+  
+  Attributes:
+      image:
+          The image to be processed.
+      features:
+          Requested features.
+      image_context:
+          Additional context that may accompany the image.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.AnnotateImageRequest)
+  ))
+_sym_db.RegisterMessage(AnnotateImageRequest)
+
+AnnotateImageResponse = _reflection.GeneratedProtocolMessageType('AnnotateImageResponse', (_message.Message,), dict(
+  DESCRIPTOR = _ANNOTATEIMAGERESPONSE,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Response to an image annotation request.
+  
+  
+  Attributes:
+      face_annotations:
+          If present, face detection has completed successfully.
+      landmark_annotations:
+          If present, landmark detection has completed successfully.
+      logo_annotations:
+          If present, logo detection has completed successfully.
+      label_annotations:
+          If present, label detection has completed successfully.
+      text_annotations:
+          If present, text (OCR) detection or document (OCR) text
+          detection has completed successfully.
+      full_text_annotation:
+          If present, text (OCR) detection or document (OCR) text
+          detection has completed successfully. This annotation provides
+          the structural hierarchy for the OCR detected text.
+      safe_search_annotation:
+          If present, safe-search annotation has completed successfully.
+      image_properties_annotation:
+          If present, image properties were extracted successfully.
+      crop_hints_annotation:
+          If present, crop hints have completed successfully.
+      web_detection:
+          If present, web detection has completed successfully.
+      error:
+          If set, represents the error message for the operation. Note
+          that filled-in image annotations are guaranteed to be correct,
+          even when ``error`` is set.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.AnnotateImageResponse)
+  ))
+_sym_db.RegisterMessage(AnnotateImageResponse)
+
+BatchAnnotateImagesRequest = _reflection.GeneratedProtocolMessageType('BatchAnnotateImagesRequest', (_message.Message,), dict(
+  DESCRIPTOR = _BATCHANNOTATEIMAGESREQUEST,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Multiple image annotation requests are batched into a single service
+  call.
+  
+  
+  Attributes:
+      requests:
+          Individual image annotation requests for this batch.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.BatchAnnotateImagesRequest)
+  ))
+_sym_db.RegisterMessage(BatchAnnotateImagesRequest)
+
+BatchAnnotateImagesResponse = _reflection.GeneratedProtocolMessageType('BatchAnnotateImagesResponse', (_message.Message,), dict(
+  DESCRIPTOR = _BATCHANNOTATEIMAGESRESPONSE,
+  __module__ = 'google.cloud.proto.vision.v1.image_annotator_pb2'
+  ,
+  __doc__ = """Response to a batch image annotation request.
+  
+  
+  Attributes:
+      responses:
+          Individual responses to image annotation requests within the
+          batch.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.BatchAnnotateImagesResponse)
+  ))
+_sym_db.RegisterMessage(BatchAnnotateImagesResponse)
+
+
+DESCRIPTOR.has_options = True
+DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\032com.google.cloud.vision.v1B\023ImageAnnotatorProtoP\001Z<google.golang.org/genproto/googleapis/cloud/vision/v1;vision\370\001\001'))
+try:
+  # THESE ELEMENTS WILL BE DEPRECATED.
+  # Please use the generated *_pb2_grpc.py files instead.
+  import grpc
+  from grpc.beta import implementations as beta_implementations
+  from grpc.beta import interfaces as beta_interfaces
+  from grpc.framework.common import cardinality
+  from grpc.framework.interfaces.face import utilities as face_utilities
+
+
+  class ImageAnnotatorStub(object):
+    """Service that performs Google Cloud Vision API detection tasks over client
+    images, such as face, landmark, logo, label, and text detection. The
+    ImageAnnotator service returns detected entities from the images.
+    """
+
+    def __init__(self, channel):
+      """Constructor.
+
+      Args:
+        channel: A grpc.Channel.
+      """
+      self.BatchAnnotateImages = channel.unary_unary(
+          '/google.cloud.vision.v1.ImageAnnotator/BatchAnnotateImages',
+          request_serializer=BatchAnnotateImagesRequest.SerializeToString,
+          response_deserializer=BatchAnnotateImagesResponse.FromString,
+          )
+
+
+  class ImageAnnotatorServicer(object):
+    """Service that performs Google Cloud Vision API detection tasks over client
+    images, such as face, landmark, logo, label, and text detection. The
+    ImageAnnotator service returns detected entities from the images.
+    """
+
+    def BatchAnnotateImages(self, request, context):
+      """Run image detection and annotation for a batch of images.
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+
+  def add_ImageAnnotatorServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+        'BatchAnnotateImages': grpc.unary_unary_rpc_method_handler(
+            servicer.BatchAnnotateImages,
+            request_deserializer=BatchAnnotateImagesRequest.FromString,
+            response_serializer=BatchAnnotateImagesResponse.SerializeToString,
+        ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+        'google.cloud.vision.v1.ImageAnnotator', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+
+
+  class BetaImageAnnotatorServicer(object):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This class was generated
+    only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
+    """Service that performs Google Cloud Vision API detection tasks over client
+    images, such as face, landmark, logo, label, and text detection. The
+    ImageAnnotator service returns detected entities from the images.
+    """
+    def BatchAnnotateImages(self, request, context):
+      """Run image detection and annotation for a batch of images.
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+
+
+  class BetaImageAnnotatorStub(object):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This class was generated
+    only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
+    """Service that performs Google Cloud Vision API detection tasks over client
+    images, such as face, landmark, logo, label, and text detection. The
+    ImageAnnotator service returns detected entities from the images.
+    """
+    def BatchAnnotateImages(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+      """Run image detection and annotation for a batch of images.
+      """
+      raise NotImplementedError()
+    BatchAnnotateImages.future = None
+
+
+  def beta_create_ImageAnnotator_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This function was
+    generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
+    request_deserializers = {
+      ('google.cloud.vision.v1.ImageAnnotator', 'BatchAnnotateImages'): BatchAnnotateImagesRequest.FromString,
+    }
+    response_serializers = {
+      ('google.cloud.vision.v1.ImageAnnotator', 'BatchAnnotateImages'): BatchAnnotateImagesResponse.SerializeToString,
+    }
+    method_implementations = {
+      ('google.cloud.vision.v1.ImageAnnotator', 'BatchAnnotateImages'): face_utilities.unary_unary_inline(servicer.BatchAnnotateImages),
+    }
+    server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout)
+    return beta_implementations.server(method_implementations, options=server_options)
+
+
+  def beta_create_ImageAnnotator_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This function was
+    generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
+    request_serializers = {
+      ('google.cloud.vision.v1.ImageAnnotator', 'BatchAnnotateImages'): BatchAnnotateImagesRequest.SerializeToString,
+    }
+    response_deserializers = {
+      ('google.cloud.vision.v1.ImageAnnotator', 'BatchAnnotateImages'): BatchAnnotateImagesResponse.FromString,
+    }
+    cardinalities = {
+      'BatchAnnotateImages': cardinality.Cardinality.UNARY_UNARY,
+    }
+    stub_options = beta_implementations.stub_options(host=host, metadata_transformer=metadata_transformer, request_serializers=request_serializers, response_deserializers=response_deserializers, thread_pool=pool, thread_pool_size=pool_size)
+    return beta_implementations.dynamic_stub(channel, 'google.cloud.vision.v1.ImageAnnotator', cardinalities, options=stub_options)
+except ImportError:
+  pass
+# @@protoc_insertion_point(module_scope)
diff --git a/vision/google/cloud/proto/vision/v1/image_annotator_pb2_grpc.py b/vision/google/cloud/proto/vision/v1/image_annotator_pb2_grpc.py
new file mode 100644
index 0000000000000..e9e49175d4d35
--- /dev/null
+++ b/vision/google/cloud/proto/vision/v1/image_annotator_pb2_grpc.py
@@ -0,0 +1,50 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+import grpc
+
+import google.cloud.proto.vision.v1.image_annotator_pb2 as google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_image__annotator__pb2
+
+
+class ImageAnnotatorStub(object):
+  """Service that performs Google Cloud Vision API detection tasks over client
+  images, such as face, landmark, logo, label, and text detection. The
+  ImageAnnotator service returns detected entities from the images.
+  """
+
+  def __init__(self, channel):
+    """Constructor.
+
+    Args:
+      channel: A grpc.Channel.
+    """
+    self.BatchAnnotateImages = channel.unary_unary(
+        '/google.cloud.vision.v1.ImageAnnotator/BatchAnnotateImages',
+        request_serializer=google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_image__annotator__pb2.BatchAnnotateImagesRequest.SerializeToString,
+        response_deserializer=google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_image__annotator__pb2.BatchAnnotateImagesResponse.FromString,
+        )
+
+
+class ImageAnnotatorServicer(object):
+  """Service that performs Google Cloud Vision API detection tasks over client
+  images, such as face, landmark, logo, label, and text detection. The
+  ImageAnnotator service returns detected entities from the images.
+  """
+
+  def BatchAnnotateImages(self, request, context):
+    """Run image detection and annotation for a batch of images.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+
+def add_ImageAnnotatorServicer_to_server(servicer, server):
+  rpc_method_handlers = {
+      'BatchAnnotateImages': grpc.unary_unary_rpc_method_handler(
+          servicer.BatchAnnotateImages,
+          request_deserializer=google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_image__annotator__pb2.BatchAnnotateImagesRequest.FromString,
+          response_serializer=google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_image__annotator__pb2.BatchAnnotateImagesResponse.SerializeToString,
+      ),
+  }
+  generic_handler = grpc.method_handlers_generic_handler(
+      'google.cloud.vision.v1.ImageAnnotator', rpc_method_handlers)
+  server.add_generic_rpc_handlers((generic_handler,))
diff --git a/vision/google/cloud/proto/vision/v1/text_annotation_pb2.py b/vision/google/cloud/proto/vision/v1/text_annotation_pb2.py
new file mode 100644
index 0000000000000..923a2bc3e0cfd
--- /dev/null
+++ b/vision/google/cloud/proto/vision/v1/text_annotation_pb2.py
@@ -0,0 +1,742 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: google/cloud/proto/vision/v1/text_annotation.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf import descriptor_pb2
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from google.cloud.proto.vision.v1 import geometry_pb2 as google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_geometry__pb2
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='google/cloud/proto/vision/v1/text_annotation.proto',
+  package='google.cloud.vision.v1',
+  syntax='proto3',
+  serialized_pb=_b('\n2google/cloud/proto/vision/v1/text_annotation.proto\x12\x16google.cloud.vision.v1\x1a\x1cgoogle/api/annotations.proto\x1a+google/cloud/proto/vision/v1/geometry.proto\"\x96\x04\n\x0eTextAnnotation\x12+\n\x05pages\x18\x01 \x03(\x0b\x32\x1c.google.cloud.vision.v1.Page\x12\x0c\n\x04text\x18\x02 \x01(\t\x1a=\n\x10\x44\x65tectedLanguage\x12\x15\n\rlanguage_code\x18\x01 \x01(\t\x12\x12\n\nconfidence\x18\x02 \x01(\x02\x1a\xd5\x01\n\rDetectedBreak\x12L\n\x04type\x18\x01 \x01(\x0e\x32>.google.cloud.vision.v1.TextAnnotation.DetectedBreak.BreakType\x12\x11\n\tis_prefix\x18\x02 \x01(\x08\"c\n\tBreakType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\t\n\x05SPACE\x10\x01\x12\x0e\n\nSURE_SPACE\x10\x02\x12\x12\n\x0e\x45OL_SURE_SPACE\x10\x03\x12\n\n\x06HYPHEN\x10\x04\x12\x0e\n\nLINE_BREAK\x10\x05\x1a\xb1\x01\n\x0cTextProperty\x12S\n\x12\x64\x65tected_languages\x18\x01 \x03(\x0b\x32\x37.google.cloud.vision.v1.TextAnnotation.DetectedLanguage\x12L\n\x0e\x64\x65tected_break\x18\x02 \x01(\x0b\x32\x34.google.cloud.vision.v1.TextAnnotation.DetectedBreak\"\x9b\x01\n\x04Page\x12\x45\n\x08property\x18\x01 \x01(\x0b\x32\x33.google.cloud.vision.v1.TextAnnotation.TextProperty\x12\r\n\x05width\x18\x02 \x01(\x05\x12\x0e\n\x06height\x18\x03 \x01(\x05\x12-\n\x06\x62locks\x18\x04 \x03(\x0b\x32\x1d.google.cloud.vision.v1.Block\"\xd2\x02\n\x05\x42lock\x12\x45\n\x08property\x18\x01 \x01(\x0b\x32\x33.google.cloud.vision.v1.TextAnnotation.TextProperty\x12:\n\x0c\x62ounding_box\x18\x02 \x01(\x0b\x32$.google.cloud.vision.v1.BoundingPoly\x12\x35\n\nparagraphs\x18\x03 \x03(\x0b\x32!.google.cloud.vision.v1.Paragraph\x12;\n\nblock_type\x18\x04 \x01(\x0e\x32\'.google.cloud.vision.v1.Block.BlockType\"R\n\tBlockType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04TEXT\x10\x01\x12\t\n\x05TABLE\x10\x02\x12\x0b\n\x07PICTURE\x10\x03\x12\t\n\x05RULER\x10\x04\x12\x0b\n\x07\x42\x41RCODE\x10\x05\"\xbb\x01\n\tParagraph\x12\x45\n\x08property\x18\x01 \x01(\x0b\x32\x33.google.cloud.vision.v1.TextAnnotation.TextProperty\x12:\n\x0c\x62ounding_box\x18\x02 \x01(\x0b\x32$.google.cloud.vision.v1.BoundingPoly\x12+\n\x05words\x18\x03 \x03(\x0b\x32\x1c.google.cloud.vision.v1.Word\"\xba\x01\n\x04Word\x12\x45\n\x08property\x18\x01 \x01(\x0b\x32\x33.google.cloud.vision.v1.TextAnnotation.TextProperty\x12:\n\x0c\x62ounding_box\x18\x02 \x01(\x0b\x32$.google.cloud.vision.v1.BoundingPoly\x12/\n\x07symbols\x18\x03 \x03(\x0b\x32\x1e.google.cloud.vision.v1.Symbol\"\x99\x01\n\x06Symbol\x12\x45\n\x08property\x18\x01 \x01(\x0b\x32\x33.google.cloud.vision.v1.TextAnnotation.TextProperty\x12:\n\x0c\x62ounding_box\x18\x02 \x01(\x0b\x32$.google.cloud.vision.v1.BoundingPoly\x12\x0c\n\x04text\x18\x03 \x01(\tBt\n\x1a\x63om.google.cloud.vision.v1B\x13TextAnnotationProtoP\x01Z<google.golang.org/genproto/googleapis/cloud/vision/v1;vision\xf8\x01\x01\x62\x06proto3')
+  ,
+  dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_geometry__pb2.DESCRIPTOR,])
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+
+
+_TEXTANNOTATION_DETECTEDBREAK_BREAKTYPE = _descriptor.EnumDescriptor(
+  name='BreakType',
+  full_name='google.cloud.vision.v1.TextAnnotation.DetectedBreak.BreakType',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SPACE', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SURE_SPACE', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='EOL_SURE_SPACE', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='HYPHEN', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LINE_BREAK', index=5, number=5,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=409,
+  serialized_end=508,
+)
+_sym_db.RegisterEnumDescriptor(_TEXTANNOTATION_DETECTEDBREAK_BREAKTYPE)
+
+_BLOCK_BLOCKTYPE = _descriptor.EnumDescriptor(
+  name='BlockType',
+  full_name='google.cloud.vision.v1.Block.BlockType',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='TEXT', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='TABLE', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PICTURE', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RULER', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BARCODE', index=5, number=5,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=1105,
+  serialized_end=1187,
+)
+_sym_db.RegisterEnumDescriptor(_BLOCK_BLOCKTYPE)
+
+
+_TEXTANNOTATION_DETECTEDLANGUAGE = _descriptor.Descriptor(
+  name='DetectedLanguage',
+  full_name='google.cloud.vision.v1.TextAnnotation.DetectedLanguage',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='language_code', full_name='google.cloud.vision.v1.TextAnnotation.DetectedLanguage.language_code', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='confidence', full_name='google.cloud.vision.v1.TextAnnotation.DetectedLanguage.confidence', index=1,
+      number=2, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=231,
+  serialized_end=292,
+)
+
+_TEXTANNOTATION_DETECTEDBREAK = _descriptor.Descriptor(
+  name='DetectedBreak',
+  full_name='google.cloud.vision.v1.TextAnnotation.DetectedBreak',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='type', full_name='google.cloud.vision.v1.TextAnnotation.DetectedBreak.type', index=0,
+      number=1, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='is_prefix', full_name='google.cloud.vision.v1.TextAnnotation.DetectedBreak.is_prefix', index=1,
+      number=2, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _TEXTANNOTATION_DETECTEDBREAK_BREAKTYPE,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=295,
+  serialized_end=508,
+)
+
+_TEXTANNOTATION_TEXTPROPERTY = _descriptor.Descriptor(
+  name='TextProperty',
+  full_name='google.cloud.vision.v1.TextAnnotation.TextProperty',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='detected_languages', full_name='google.cloud.vision.v1.TextAnnotation.TextProperty.detected_languages', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='detected_break', full_name='google.cloud.vision.v1.TextAnnotation.TextProperty.detected_break', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=511,
+  serialized_end=688,
+)
+
+_TEXTANNOTATION = _descriptor.Descriptor(
+  name='TextAnnotation',
+  full_name='google.cloud.vision.v1.TextAnnotation',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='pages', full_name='google.cloud.vision.v1.TextAnnotation.pages', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='text', full_name='google.cloud.vision.v1.TextAnnotation.text', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[_TEXTANNOTATION_DETECTEDLANGUAGE, _TEXTANNOTATION_DETECTEDBREAK, _TEXTANNOTATION_TEXTPROPERTY, ],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=154,
+  serialized_end=688,
+)
+
+
+_PAGE = _descriptor.Descriptor(
+  name='Page',
+  full_name='google.cloud.vision.v1.Page',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='property', full_name='google.cloud.vision.v1.Page.property', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='width', full_name='google.cloud.vision.v1.Page.width', index=1,
+      number=2, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='height', full_name='google.cloud.vision.v1.Page.height', index=2,
+      number=3, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='blocks', full_name='google.cloud.vision.v1.Page.blocks', index=3,
+      number=4, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=691,
+  serialized_end=846,
+)
+
+
+_BLOCK = _descriptor.Descriptor(
+  name='Block',
+  full_name='google.cloud.vision.v1.Block',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='property', full_name='google.cloud.vision.v1.Block.property', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='bounding_box', full_name='google.cloud.vision.v1.Block.bounding_box', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='paragraphs', full_name='google.cloud.vision.v1.Block.paragraphs', index=2,
+      number=3, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='block_type', full_name='google.cloud.vision.v1.Block.block_type', index=3,
+      number=4, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _BLOCK_BLOCKTYPE,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=849,
+  serialized_end=1187,
+)
+
+
+_PARAGRAPH = _descriptor.Descriptor(
+  name='Paragraph',
+  full_name='google.cloud.vision.v1.Paragraph',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='property', full_name='google.cloud.vision.v1.Paragraph.property', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='bounding_box', full_name='google.cloud.vision.v1.Paragraph.bounding_box', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='words', full_name='google.cloud.vision.v1.Paragraph.words', index=2,
+      number=3, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1190,
+  serialized_end=1377,
+)
+
+
+_WORD = _descriptor.Descriptor(
+  name='Word',
+  full_name='google.cloud.vision.v1.Word',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='property', full_name='google.cloud.vision.v1.Word.property', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='bounding_box', full_name='google.cloud.vision.v1.Word.bounding_box', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='symbols', full_name='google.cloud.vision.v1.Word.symbols', index=2,
+      number=3, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1380,
+  serialized_end=1566,
+)
+
+
+_SYMBOL = _descriptor.Descriptor(
+  name='Symbol',
+  full_name='google.cloud.vision.v1.Symbol',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='property', full_name='google.cloud.vision.v1.Symbol.property', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='bounding_box', full_name='google.cloud.vision.v1.Symbol.bounding_box', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='text', full_name='google.cloud.vision.v1.Symbol.text', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1569,
+  serialized_end=1722,
+)
+
+_TEXTANNOTATION_DETECTEDLANGUAGE.containing_type = _TEXTANNOTATION
+_TEXTANNOTATION_DETECTEDBREAK.fields_by_name['type'].enum_type = _TEXTANNOTATION_DETECTEDBREAK_BREAKTYPE
+_TEXTANNOTATION_DETECTEDBREAK.containing_type = _TEXTANNOTATION
+_TEXTANNOTATION_DETECTEDBREAK_BREAKTYPE.containing_type = _TEXTANNOTATION_DETECTEDBREAK
+_TEXTANNOTATION_TEXTPROPERTY.fields_by_name['detected_languages'].message_type = _TEXTANNOTATION_DETECTEDLANGUAGE
+_TEXTANNOTATION_TEXTPROPERTY.fields_by_name['detected_break'].message_type = _TEXTANNOTATION_DETECTEDBREAK
+_TEXTANNOTATION_TEXTPROPERTY.containing_type = _TEXTANNOTATION
+_TEXTANNOTATION.fields_by_name['pages'].message_type = _PAGE
+_PAGE.fields_by_name['property'].message_type = _TEXTANNOTATION_TEXTPROPERTY
+_PAGE.fields_by_name['blocks'].message_type = _BLOCK
+_BLOCK.fields_by_name['property'].message_type = _TEXTANNOTATION_TEXTPROPERTY
+_BLOCK.fields_by_name['bounding_box'].message_type = google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_geometry__pb2._BOUNDINGPOLY
+_BLOCK.fields_by_name['paragraphs'].message_type = _PARAGRAPH
+_BLOCK.fields_by_name['block_type'].enum_type = _BLOCK_BLOCKTYPE
+_BLOCK_BLOCKTYPE.containing_type = _BLOCK
+_PARAGRAPH.fields_by_name['property'].message_type = _TEXTANNOTATION_TEXTPROPERTY
+_PARAGRAPH.fields_by_name['bounding_box'].message_type = google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_geometry__pb2._BOUNDINGPOLY
+_PARAGRAPH.fields_by_name['words'].message_type = _WORD
+_WORD.fields_by_name['property'].message_type = _TEXTANNOTATION_TEXTPROPERTY
+_WORD.fields_by_name['bounding_box'].message_type = google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_geometry__pb2._BOUNDINGPOLY
+_WORD.fields_by_name['symbols'].message_type = _SYMBOL
+_SYMBOL.fields_by_name['property'].message_type = _TEXTANNOTATION_TEXTPROPERTY
+_SYMBOL.fields_by_name['bounding_box'].message_type = google_dot_cloud_dot_proto_dot_vision_dot_v1_dot_geometry__pb2._BOUNDINGPOLY
+DESCRIPTOR.message_types_by_name['TextAnnotation'] = _TEXTANNOTATION
+DESCRIPTOR.message_types_by_name['Page'] = _PAGE
+DESCRIPTOR.message_types_by_name['Block'] = _BLOCK
+DESCRIPTOR.message_types_by_name['Paragraph'] = _PARAGRAPH
+DESCRIPTOR.message_types_by_name['Word'] = _WORD
+DESCRIPTOR.message_types_by_name['Symbol'] = _SYMBOL
+
+TextAnnotation = _reflection.GeneratedProtocolMessageType('TextAnnotation', (_message.Message,), dict(
+
+  DetectedLanguage = _reflection.GeneratedProtocolMessageType('DetectedLanguage', (_message.Message,), dict(
+    DESCRIPTOR = _TEXTANNOTATION_DETECTEDLANGUAGE,
+    __module__ = 'google.cloud.proto.vision.v1.text_annotation_pb2'
+    ,
+    __doc__ = """Detected language for a structural component.
+    """,
+    # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.TextAnnotation.DetectedLanguage)
+    ))
+  ,
+
+  DetectedBreak = _reflection.GeneratedProtocolMessageType('DetectedBreak', (_message.Message,), dict(
+    DESCRIPTOR = _TEXTANNOTATION_DETECTEDBREAK,
+    __module__ = 'google.cloud.proto.vision.v1.text_annotation_pb2'
+    ,
+    __doc__ = """Detected start or end of a structural component.
+    """,
+    # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.TextAnnotation.DetectedBreak)
+    ))
+  ,
+
+  TextProperty = _reflection.GeneratedProtocolMessageType('TextProperty', (_message.Message,), dict(
+    DESCRIPTOR = _TEXTANNOTATION_TEXTPROPERTY,
+    __module__ = 'google.cloud.proto.vision.v1.text_annotation_pb2'
+    ,
+    __doc__ = """Additional information detected on the structural component.
+    """,
+    # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.TextAnnotation.TextProperty)
+    ))
+  ,
+  DESCRIPTOR = _TEXTANNOTATION,
+  __module__ = 'google.cloud.proto.vision.v1.text_annotation_pb2'
+  ,
+  __doc__ = """TextAnnotation contains a structured representation of OCR extracted
+  text. The hierarchy of an OCR extracted text structure is like this:
+  TextAnnotation -> Page -> Block -> Paragraph -> Word -> Symbol Each
+  structural component, starting from Page, may further have their own
+  properties. Properties describe detected languages, breaks etc.. Please
+  refer to the
+  [google.cloud.vision.v1.TextAnnotation.TextProperty][google.cloud.vision.v1.TextAnnotation.TextProperty]
+  message definition below for more detail.
+  
+  
+  Attributes:
+      language_code:
+          The BCP-47 language code, such as "en-US" or "sr-Latn". For
+          more information, see http://www.unicode.org/reports/tr35/#Uni
+          code\_locale\_identifier.
+      confidence:
+          Confidence of detected language. Range [0, 1].
+      is_prefix:
+          True if break prepends the element.
+      detected_languages:
+          A list of detected languages together with confidence.
+      detected_break:
+          Detected start or end of a text segment.
+      pages:
+          List of pages detected by OCR.
+      text:
+          UTF-8 text detected on the pages.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.TextAnnotation)
+  ))
+_sym_db.RegisterMessage(TextAnnotation)
+_sym_db.RegisterMessage(TextAnnotation.DetectedLanguage)
+_sym_db.RegisterMessage(TextAnnotation.DetectedBreak)
+_sym_db.RegisterMessage(TextAnnotation.TextProperty)
+
+Page = _reflection.GeneratedProtocolMessageType('Page', (_message.Message,), dict(
+  DESCRIPTOR = _PAGE,
+  __module__ = 'google.cloud.proto.vision.v1.text_annotation_pb2'
+  ,
+  __doc__ = """Detected page from OCR.
+  
+  
+  Attributes:
+      property:
+          Additional information detected on the page.
+      width:
+          Page width in pixels.
+      height:
+          Page height in pixels.
+      blocks:
+          List of blocks of text, images etc on this page.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.Page)
+  ))
+_sym_db.RegisterMessage(Page)
+
+Block = _reflection.GeneratedProtocolMessageType('Block', (_message.Message,), dict(
+  DESCRIPTOR = _BLOCK,
+  __module__ = 'google.cloud.proto.vision.v1.text_annotation_pb2'
+  ,
+  __doc__ = """Logical element on the page.
+  
+  
+  Attributes:
+      property:
+          Additional information detected for the block.
+      bounding_box:
+          The bounding box for the block. The vertices are in the order
+          of top-left, top-right, bottom-right, bottom-left. When a
+          rotation of the bounding box is detected the rotation is
+          represented as around the top-left corner as defined when the
+          text is read in the 'natural' orientation. For example: \*
+          when the text is horizontal it might look like: 0----1 \| \| 3
+          ----2 \* when it's rotated 180 degrees around the top-left
+          corner it becomes: 2----3 \| \| 1----0 and the vertice order
+          will still be (0, 1, 2, 3).
+      paragraphs:
+          List of paragraphs in this block (if this blocks is of type
+          text).
+      block_type:
+          Detected block type (text, image etc) for this block.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.Block)
+  ))
+_sym_db.RegisterMessage(Block)
+
+Paragraph = _reflection.GeneratedProtocolMessageType('Paragraph', (_message.Message,), dict(
+  DESCRIPTOR = _PARAGRAPH,
+  __module__ = 'google.cloud.proto.vision.v1.text_annotation_pb2'
+  ,
+  __doc__ = """Structural unit of text representing a number of words in certain order.
+  
+  
+  Attributes:
+      property:
+          Additional information detected for the paragraph.
+      bounding_box:
+          The bounding box for the paragraph. The vertices are in the
+          order of top-left, top-right, bottom-right, bottom-left. When
+          a rotation of the bounding box is detected the rotation is
+          represented as around the top-left corner as defined when the
+          text is read in the 'natural' orientation. For example: \*
+          when the text is horizontal it might look like: 0----1 \| \| 3
+          ----2 \* when it's rotated 180 degrees around the top-left
+          corner it becomes: 2----3 \| \| 1----0 and the vertice order
+          will still be (0, 1, 2, 3).
+      words:
+          List of words in this paragraph.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.Paragraph)
+  ))
+_sym_db.RegisterMessage(Paragraph)
+
+Word = _reflection.GeneratedProtocolMessageType('Word', (_message.Message,), dict(
+  DESCRIPTOR = _WORD,
+  __module__ = 'google.cloud.proto.vision.v1.text_annotation_pb2'
+  ,
+  __doc__ = """A word representation.
+  
+  
+  Attributes:
+      property:
+          Additional information detected for the word.
+      bounding_box:
+          The bounding box for the word. The vertices are in the order
+          of top-left, top-right, bottom-right, bottom-left. When a
+          rotation of the bounding box is detected the rotation is
+          represented as around the top-left corner as defined when the
+          text is read in the 'natural' orientation. For example: \*
+          when the text is horizontal it might look like: 0----1 \| \| 3
+          ----2 \* when it's rotated 180 degrees around the top-left
+          corner it becomes: 2----3 \| \| 1----0 and the vertice order
+          will still be (0, 1, 2, 3).
+      symbols:
+          List of symbols in the word. The order of the symbols follows
+          the natural reading order.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.Word)
+  ))
+_sym_db.RegisterMessage(Word)
+
+Symbol = _reflection.GeneratedProtocolMessageType('Symbol', (_message.Message,), dict(
+  DESCRIPTOR = _SYMBOL,
+  __module__ = 'google.cloud.proto.vision.v1.text_annotation_pb2'
+  ,
+  __doc__ = """A single symbol representation.
+  
+  
+  Attributes:
+      property:
+          Additional information detected for the symbol.
+      bounding_box:
+          The bounding box for the symbol. The vertices are in the order
+          of top-left, top-right, bottom-right, bottom-left. When a
+          rotation of the bounding box is detected the rotation is
+          represented as around the top-left corner as defined when the
+          text is read in the 'natural' orientation. For example: \*
+          when the text is horizontal it might look like: 0----1 \| \| 3
+          ----2 \* when it's rotated 180 degrees around the top-left
+          corner it becomes: 2----3 \| \| 1----0 and the vertice order
+          will still be (0, 1, 2, 3).
+      text:
+          The actual UTF-8 representation of the symbol.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.Symbol)
+  ))
+_sym_db.RegisterMessage(Symbol)
+
+
+DESCRIPTOR.has_options = True
+DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\032com.google.cloud.vision.v1B\023TextAnnotationProtoP\001Z<google.golang.org/genproto/googleapis/cloud/vision/v1;vision\370\001\001'))
+try:
+  # THESE ELEMENTS WILL BE DEPRECATED.
+  # Please use the generated *_pb2_grpc.py files instead.
+  import grpc
+  from grpc.beta import implementations as beta_implementations
+  from grpc.beta import interfaces as beta_interfaces
+  from grpc.framework.common import cardinality
+  from grpc.framework.interfaces.face import utilities as face_utilities
+except ImportError:
+  pass
+# @@protoc_insertion_point(module_scope)
diff --git a/vision/google/cloud/proto/vision/v1/text_annotation_pb2_grpc.py b/vision/google/cloud/proto/vision/v1/text_annotation_pb2_grpc.py
new file mode 100644
index 0000000000000..a89435267cb22
--- /dev/null
+++ b/vision/google/cloud/proto/vision/v1/text_annotation_pb2_grpc.py
@@ -0,0 +1,3 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+import grpc
+
diff --git a/vision/google/cloud/proto/vision/v1/web_detection_pb2.py b/vision/google/cloud/proto/vision/v1/web_detection_pb2.py
new file mode 100644
index 0000000000000..d8f90ebcdbd9e
--- /dev/null
+++ b/vision/google/cloud/proto/vision/v1/web_detection_pb2.py
@@ -0,0 +1,290 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: google/cloud/proto/vision/v1/web_detection.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf import descriptor_pb2
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='google/cloud/proto/vision/v1/web_detection.proto',
+  package='google.cloud.vision.v1',
+  syntax='proto3',
+  serialized_pb=_b('\n0google/cloud/proto/vision/v1/web_detection.proto\x12\x16google.cloud.vision.v1\x1a\x1cgoogle/api/annotations.proto\"\xd6\x03\n\x0cWebDetection\x12\x44\n\x0cweb_entities\x18\x01 \x03(\x0b\x32..google.cloud.vision.v1.WebDetection.WebEntity\x12K\n\x14\x66ull_matching_images\x18\x02 \x03(\x0b\x32-.google.cloud.vision.v1.WebDetection.WebImage\x12N\n\x17partial_matching_images\x18\x03 \x03(\x0b\x32-.google.cloud.vision.v1.WebDetection.WebImage\x12P\n\x1apages_with_matching_images\x18\x04 \x03(\x0b\x32,.google.cloud.vision.v1.WebDetection.WebPage\x1a\x42\n\tWebEntity\x12\x11\n\tentity_id\x18\x01 \x01(\t\x12\r\n\x05score\x18\x02 \x01(\x02\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x1a&\n\x08WebImage\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\r\n\x05score\x18\x02 \x01(\x02\x1a%\n\x07WebPage\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\r\n\x05score\x18\x02 \x01(\x02\x42r\n\x1a\x63om.google.cloud.vision.v1B\x11WebDetectionProtoP\x01Z<google.golang.org/genproto/googleapis/cloud/vision/v1;vision\xf8\x01\x01\x62\x06proto3')
+  ,
+  dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,])
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+
+
+
+_WEBDETECTION_WEBENTITY = _descriptor.Descriptor(
+  name='WebEntity',
+  full_name='google.cloud.vision.v1.WebDetection.WebEntity',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='entity_id', full_name='google.cloud.vision.v1.WebDetection.WebEntity.entity_id', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='score', full_name='google.cloud.vision.v1.WebDetection.WebEntity.score', index=1,
+      number=2, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='description', full_name='google.cloud.vision.v1.WebDetection.WebEntity.description', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=432,
+  serialized_end=498,
+)
+
+_WEBDETECTION_WEBIMAGE = _descriptor.Descriptor(
+  name='WebImage',
+  full_name='google.cloud.vision.v1.WebDetection.WebImage',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='url', full_name='google.cloud.vision.v1.WebDetection.WebImage.url', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='score', full_name='google.cloud.vision.v1.WebDetection.WebImage.score', index=1,
+      number=2, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=500,
+  serialized_end=538,
+)
+
+_WEBDETECTION_WEBPAGE = _descriptor.Descriptor(
+  name='WebPage',
+  full_name='google.cloud.vision.v1.WebDetection.WebPage',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='url', full_name='google.cloud.vision.v1.WebDetection.WebPage.url', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='score', full_name='google.cloud.vision.v1.WebDetection.WebPage.score', index=1,
+      number=2, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=540,
+  serialized_end=577,
+)
+
+_WEBDETECTION = _descriptor.Descriptor(
+  name='WebDetection',
+  full_name='google.cloud.vision.v1.WebDetection',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='web_entities', full_name='google.cloud.vision.v1.WebDetection.web_entities', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='full_matching_images', full_name='google.cloud.vision.v1.WebDetection.full_matching_images', index=1,
+      number=2, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='partial_matching_images', full_name='google.cloud.vision.v1.WebDetection.partial_matching_images', index=2,
+      number=3, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='pages_with_matching_images', full_name='google.cloud.vision.v1.WebDetection.pages_with_matching_images', index=3,
+      number=4, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[_WEBDETECTION_WEBENTITY, _WEBDETECTION_WEBIMAGE, _WEBDETECTION_WEBPAGE, ],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=107,
+  serialized_end=577,
+)
+
+_WEBDETECTION_WEBENTITY.containing_type = _WEBDETECTION
+_WEBDETECTION_WEBIMAGE.containing_type = _WEBDETECTION
+_WEBDETECTION_WEBPAGE.containing_type = _WEBDETECTION
+_WEBDETECTION.fields_by_name['web_entities'].message_type = _WEBDETECTION_WEBENTITY
+_WEBDETECTION.fields_by_name['full_matching_images'].message_type = _WEBDETECTION_WEBIMAGE
+_WEBDETECTION.fields_by_name['partial_matching_images'].message_type = _WEBDETECTION_WEBIMAGE
+_WEBDETECTION.fields_by_name['pages_with_matching_images'].message_type = _WEBDETECTION_WEBPAGE
+DESCRIPTOR.message_types_by_name['WebDetection'] = _WEBDETECTION
+
+WebDetection = _reflection.GeneratedProtocolMessageType('WebDetection', (_message.Message,), dict(
+
+  WebEntity = _reflection.GeneratedProtocolMessageType('WebEntity', (_message.Message,), dict(
+    DESCRIPTOR = _WEBDETECTION_WEBENTITY,
+    __module__ = 'google.cloud.proto.vision.v1.web_detection_pb2'
+    ,
+    __doc__ = """Entity deduced from similar images on the Internet.
+    """,
+    # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.WebDetection.WebEntity)
+    ))
+  ,
+
+  WebImage = _reflection.GeneratedProtocolMessageType('WebImage', (_message.Message,), dict(
+    DESCRIPTOR = _WEBDETECTION_WEBIMAGE,
+    __module__ = 'google.cloud.proto.vision.v1.web_detection_pb2'
+    ,
+    __doc__ = """Metadata for online images.
+    """,
+    # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.WebDetection.WebImage)
+    ))
+  ,
+
+  WebPage = _reflection.GeneratedProtocolMessageType('WebPage', (_message.Message,), dict(
+    DESCRIPTOR = _WEBDETECTION_WEBPAGE,
+    __module__ = 'google.cloud.proto.vision.v1.web_detection_pb2'
+    ,
+    __doc__ = """Metadata for web pages.
+    """,
+    # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.WebDetection.WebPage)
+    ))
+  ,
+  DESCRIPTOR = _WEBDETECTION,
+  __module__ = 'google.cloud.proto.vision.v1.web_detection_pb2'
+  ,
+  __doc__ = """Relevant information for the image from the Internet.
+  
+  
+  Attributes:
+      entity_id:
+          Opaque entity ID.
+      score:
+          Overall relevancy score for the web page. Not normalized and
+          not comparable across different image queries.
+      description:
+          Canonical description of the entity, in English.
+      url:
+          The result web page URL.
+      web_entities:
+          Deduced entities from similar images on the Internet.
+      full_matching_images:
+          Fully matching images from the Internet. They're definite
+          neardups and most often a copy of the query image with merely
+          a size change.
+      partial_matching_images:
+          Partial matching images from the Internet. Those images are
+          similar enough to share some key-point features. For example
+          an original image will likely have partial matching for its
+          crops.
+      pages_with_matching_images:
+          Web pages containing the matching images from the Internet.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.vision.v1.WebDetection)
+  ))
+_sym_db.RegisterMessage(WebDetection)
+_sym_db.RegisterMessage(WebDetection.WebEntity)
+_sym_db.RegisterMessage(WebDetection.WebImage)
+_sym_db.RegisterMessage(WebDetection.WebPage)
+
+
+DESCRIPTOR.has_options = True
+DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\032com.google.cloud.vision.v1B\021WebDetectionProtoP\001Z<google.golang.org/genproto/googleapis/cloud/vision/v1;vision\370\001\001'))
+try:
+  # THESE ELEMENTS WILL BE DEPRECATED.
+  # Please use the generated *_pb2_grpc.py files instead.
+  import grpc
+  from grpc.beta import implementations as beta_implementations
+  from grpc.beta import interfaces as beta_interfaces
+  from grpc.framework.common import cardinality
+  from grpc.framework.interfaces.face import utilities as face_utilities
+except ImportError:
+  pass
+# @@protoc_insertion_point(module_scope)
diff --git a/vision/google/cloud/proto/vision/v1/web_detection_pb2_grpc.py b/vision/google/cloud/proto/vision/v1/web_detection_pb2_grpc.py
new file mode 100644
index 0000000000000..a89435267cb22
--- /dev/null
+++ b/vision/google/cloud/proto/vision/v1/web_detection_pb2_grpc.py
@@ -0,0 +1,3 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+import grpc
+
diff --git a/vision/google/cloud/vision/__init__.py b/vision/google/cloud/vision/__init__.py
index c4354c17b571b..9867337983cf2 100644
--- a/vision/google/cloud/vision/__init__.py
+++ b/vision/google/cloud/vision/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc.
+# Copyright 2017, Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,13 +12,40 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Google Cloud Vision API package."""
+# -----------------------------------------------------------------------------
+# TRANSITION CODE
+# -----------------------------------------------------------------------------
+# The old Vision manual layer is now deprecated, but to allow
+# users the time to move from the manual layer to the mostly auto-generated
+# layer, they are both living side by side for a few months.
+#
+# Instantiating the old manual layer (`google.cloud.vision.Client`) will
+# issue a DeprecationWarning.
+#
+# When it comes time to remove the old layer, everything in this directory
+# should go away EXCEPT __init__.py, decorators.py, and helpers.py.
+# Additionally, the import and export of `Client` should be removed from this
+# file (along with this note), and the rest should be left intact.
+# -----------------------------------------------------------------------------
 
+from __future__ import absolute_import
 
 from pkg_resources import get_distribution
 __version__ = get_distribution('google-cloud-vision').version
 
 from google.cloud.vision.client import Client
+from google.cloud.vision_v1 import *
+
+
+__all__ = (
+    # Common
+    '__version__',
 
+    # Manual Layer
+    'Client',
 
-__all__ = ['__version__', 'Client']
+    # GAPIC & Partial Manual Layer
+    'enums',
+    'ImageAnnotatorClient',
+    'types',
+)
diff --git a/vision/google/cloud/vision/client.py b/vision/google/cloud/vision/client.py
index bddc8a2e29849..8dc6930069991 100644
--- a/vision/google/cloud/vision/client.py
+++ b/vision/google/cloud/vision/client.py
@@ -15,6 +15,7 @@
 """Client for interacting with the Google Cloud Vision API."""
 
 import os
+import warnings
 
 from google.cloud.client import ClientWithProject
 from google.cloud.environment_vars import DISABLE_GRPC
@@ -67,6 +68,14 @@ class Client(ClientWithProject):
 
     def __init__(self, project=None, credentials=None, _http=None,
                  _use_grpc=None):
+        warnings.warn(
+            'This client class and objects that derive from it have been '
+            'deprecated. Use `google.cloud.vision.ImageAnnotatorClient` '
+            '(provided by this package) instead. This client will be removed '
+            'in a future release.',
+            DeprecationWarning,
+        )
+
         super(Client, self).__init__(
             project=project, credentials=credentials, _http=_http)
         if _use_grpc is None:
diff --git a/vision/google/cloud/vision/decorators.py b/vision/google/cloud/vision/decorators.py
new file mode 100644
index 0000000000000..ae280c579e5e2
--- /dev/null
+++ b/vision/google/cloud/vision/decorators.py
@@ -0,0 +1,116 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+import functools
+import sys
+
+
+def add_single_feature_methods(cls):
+    """Custom decorator intended for :class:`~vision.helpers.VisionHelpers`.
+
+    This metaclass adds a `{feature}` method for every feature
+    defined on the Feature enum.
+    """
+    # Sanity check: This only makes sense if we are building the GAPIC
+    # subclass and have enums already attached.
+    if not hasattr(cls, 'enums'):
+        return cls
+
+    # Iterate over the Feature.Type enum and add get a list of
+    # features which will receive single-feature detection methods.
+    features = [k for k in cls.enums.Feature.Type.__dict__.keys()
+                if k.replace('_', '').isalpha() and k.upper() == k]
+
+    # Add each single-feature method to the class.
+    for feature in features:
+        # Sanity check: Do not make a method for the falsy feature.
+        if feature == 'TYPE_UNSPECIFIED':
+            continue
+
+        # Assign the appropriate metadata to the function.
+        detect = _create_single_feature_method(feature, cls.enums.Feature.Type)
+
+        # Assign a qualified name to the function, and perform module
+        # replacement on the docstring.
+        detect.__qualname__ = '{cls}.{name}'.format(
+            cls=cls.__name__,
+            name=detect.__name__,
+        )
+        detect.__doc__ = detect.__doc__.format(
+            module=cls.__module__,
+        )
+
+        # Place the function on the class being created.
+        setattr(cls, detect.__name__, detect)
+
+    # Done; return the class.
+    return cls
+
+
+def _create_single_feature_method(feature, enum):
+    """Return a function that will detect a single feature.
+
+    Args:
+        feature (str): A specific feature defined as an attribute on
+            :class:`~enums.Feature.Type`.
+        enum (class): The :class:`~enums.Feature.Type` class.
+
+    Returns:
+        function: A helper function to detect just that feature.
+    """
+    # Define the function properties.
+    fx_name = feature.lower()
+    if 'detection' in fx_name:
+        fx_doc = 'Perform {0}.'.format(fx_name.replace('_', ' '))
+    else:
+        fx_doc = 'Return {desc} information.'.format(
+            desc=fx_name.replace('_', ' '),
+        )
+
+    # Provide a complete docstring with argument and return value
+    # information.
+    fx_doc += """
+
+    Args:
+        image (:class:`~.{module}.types.Image`): The image to analyze.
+        options (:class:`google.gax.CallOptions`): Overrides the
+            default settings for this call, e.g, timeout, retries, etc.
+
+    Returns:
+        :class:`~.{module}.types.AnnotateImageResponse`: The API response.
+    """
+
+    # Get the actual feature value to send.
+    feature_value = {'type': enum.__dict__[feature]}
+
+    # Define the function to be returned.
+    def inner(self, image, options=None):
+        """Return a single feature annotation for the given image.
+
+        Intended for use with functools.partial, to create the particular
+        single-feature methods.
+        """
+        request = {
+            'image': image,
+            'features': [feature_value],
+        }
+        return self.annotate_image(request, options=options)
+
+    # Set the appropriate function metadata.
+    inner.__name__ = fx_name
+    inner.__doc__ = fx_doc
+
+    # Return the final function.
+    return inner
diff --git a/vision/google/cloud/vision/face.py b/vision/google/cloud/vision/face.py
index 36f4ed54b4ca5..0a72bb3e0c846 100644
--- a/vision/google/cloud/vision/face.py
+++ b/vision/google/cloud/vision/face.py
@@ -433,7 +433,7 @@ def underexposed(self):
 class LandmarkTypes(Enum):
     """A representation of the face detection landmark types.
 
-    See:
+    See
     https://cloud.google.com/vision/docs/reference/rest/v1/images/annotate#type_1
     """
     UNKNOWN_LANDMARK = 0
diff --git a/vision/google/cloud/vision/feature.py b/vision/google/cloud/vision/feature.py
index 2a2b5b2d6ef7a..da19848282e0f 100644
--- a/vision/google/cloud/vision/feature.py
+++ b/vision/google/cloud/vision/feature.py
@@ -18,7 +18,7 @@
 class FeatureTypes(object):
     """Feature Types to indication which annotations to perform.
 
-    See:
+    See
     https://cloud.google.com/vision/docs/reference/rest/v1/images/annotate#Type
     """
     CROP_HINTS = 'CROP_HINTS'
@@ -44,7 +44,7 @@ class Feature(object):
     :param max_results: Number of results to return for the specified
                         feature type.
 
-    See:
+    See
     https://cloud.google.com/vision/docs/reference/rest/v1/images/annotate#Feature
     """
     def __init__(self, feature_type, max_results=1):
diff --git a/vision/google/cloud/vision/geometry.py b/vision/google/cloud/vision/geometry.py
index 9779282ef2400..d0212100c5f56 100644
--- a/vision/google/cloud/vision/geometry.py
+++ b/vision/google/cloud/vision/geometry.py
@@ -136,7 +136,7 @@ def longitude(self):
 class Position(object):
     """A 3D position in the image.
 
-    See:
+    See
     https://cloud.google.com/vision/docs/reference/rest/v1/images/annotate#Position
 
     :type x_coordinate: float
@@ -212,7 +212,7 @@ def z_coordinate(self):
 class Vertex(object):
     """A vertex represents a 2D point in the image.
 
-    See:
+    See
     https://cloud.google.com/vision/docs/reference/rest/v1/images/annotate#Vertex
 
     :type x_coordinate: float
diff --git a/vision/google/cloud/vision/helpers.py b/vision/google/cloud/vision/helpers.py
new file mode 100644
index 0000000000000..0ce8b0311b220
--- /dev/null
+++ b/vision/google/cloud/vision/helpers.py
@@ -0,0 +1,85 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+import collections
+import io
+import six
+
+from google.gax.utils import protobuf
+
+
+class VisionHelpers(object):
+    """A set of convenience methods to make the Vision GAPIC easier to use.
+
+    This class should be considered abstract; it is used as a superclass
+    in a multiple-inheritance construction alongside the applicable GAPIC.
+    See the :class:`~google.cloud.vision_v1.ImageAnnotatorClient`.
+    """
+    def annotate_image(self, request, options=None):
+        """Run image detection and annotation for an image.
+
+        Example:
+            >>> from google.cloud.vision_v1 import ImageAnnotatorClient
+            >>> client = ImageAnnotatorClient()
+            >>> request = {
+            ...     'image': {
+            ...         'source': {'image_uri': 'https://foo.com/image.jpg'},
+            ...     },
+            ... }
+            >>> response = client.annotate_image(request)
+
+        Args:
+            request (:class:`~.vision_v1.types.AnnotateImageRequest`)
+            options (:class:`google.gax.CallOptions`): Overrides the default
+                settings for this call, e.g, timeout, retries, etc.
+
+        Returns:
+            :class:`~.vision_v1.types.AnnotateImageResponse` The API response.
+        """
+        # If the image is a file handler, set the content.
+        image = protobuf.get(request, 'image')
+        if hasattr(image, 'read'):
+            img_bytes = image.read()
+            protobuf.set(request, 'image', {})
+            protobuf.set(request, 'image.content', img_bytes)
+            image = protobuf.get(request, 'image')
+
+        # If a filename is provided, read the file.
+        filename = protobuf.get(image, 'source.filename', default=None)
+        if filename:
+            with io.open(filename, 'rb') as img_file:
+                protobuf.set(request, 'image.content', img_file.read())
+                protobuf.set(request, 'image.source', None)
+
+        # This method allows features not to be specified, and you get all
+        # of them.
+        protobuf.setdefault(request, 'features', self._get_all_features())
+        r = self.batch_annotate_images([request], options=options)
+        return r.responses[0]
+
+    def _get_all_features(self):
+        """Return a list of all features.
+
+        Returns:
+            list: A list of all available features.
+        """
+        answer = []
+        for key, value in self.enums.Feature.Type.__dict__.items():
+            if key.upper() != key:
+                continue
+            if not isinstance(value, int) or value == 0:
+                continue
+            answer.append({'type': value})
+        return answer
diff --git a/vision/google/cloud/vision/image.py b/vision/google/cloud/vision/image.py
index f96103d6fcdd7..efcf1dcddc16e 100644
--- a/vision/google/cloud/vision/image.py
+++ b/vision/google/cloud/vision/image.py
@@ -186,7 +186,7 @@ def detect_full_text(self, language_hints=None, limit=10):
         """Detect a full document's text.
 
         :type language_hints: list
-        :param language_hints: (Optional) A list of BCP-47 language codes. See:
+        :param language_hints: (Optional) A list of BCP-47 language codes. See
                                https://cloud.google.com/vision/docs/languages
 
         :type limit: int
diff --git a/vision/google/cloud/vision/likelihood.py b/vision/google/cloud/vision/likelihood.py
index 6fffc66407393..d98033ecdcbd5 100644
--- a/vision/google/cloud/vision/likelihood.py
+++ b/vision/google/cloud/vision/likelihood.py
@@ -36,7 +36,7 @@ def _get_pb_likelihood(likelihood):
 class Likelihood(Enum):
     """A representation of likelihood to give stable results across upgrades.
 
-    See:
+    See
     https://cloud.google.com/vision/docs/reference/rest/v1/images/annotate#likelihood
     """
     UNKNOWN = 'UNKNOWN'
diff --git a/vision/google/cloud/vision_v1/__init__.py b/vision/google/cloud/vision_v1/__init__.py
new file mode 100644
index 0000000000000..8dbabb4707240
--- /dev/null
+++ b/vision/google/cloud/vision_v1/__init__.py
@@ -0,0 +1,35 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+
+from google.cloud.gapic.vision.v1 import image_annotator_client as iac
+from google.cloud.gapic.vision.v1 import enums
+
+from google.cloud.vision.decorators import add_single_feature_methods
+from google.cloud.vision.helpers import VisionHelpers
+from google.cloud.vision_v1 import types
+
+
+@add_single_feature_methods
+class ImageAnnotatorClient(VisionHelpers, iac.ImageAnnotatorClient):
+    __doc__ = iac.ImageAnnotatorClient.__doc__
+    enums = enums
+
+
+__all__ = (
+    'enums',
+    'ImageAnnotatorClient',
+    'types',
+)
diff --git a/vision/google/cloud/vision_v1/types.py b/vision/google/cloud/vision_v1/types.py
new file mode 100644
index 0000000000000..b061a06b80be2
--- /dev/null
+++ b/vision/google/cloud/vision_v1/types.py
@@ -0,0 +1,35 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+import sys
+
+from google.cloud.proto.vision.v1 import geometry_pb2
+from google.cloud.proto.vision.v1 import image_annotator_pb2
+from google.cloud.proto.vision.v1 import text_annotation_pb2
+from google.cloud.proto.vision.v1 import web_detection_pb2
+
+from google.gax.utils.messages import get_messages
+
+
+names = []
+for module in (geometry_pb2, image_annotator_pb2,
+               text_annotation_pb2, web_detection_pb2):
+    for name, message in get_messages(module).items():
+        message.__module__ = 'google.cloud.vision_v1.types'
+        setattr(sys.modules[__name__], name, message)
+        names.append(name)
+
+
+__all__ = tuple(sorted(names))
diff --git a/vision/nox.py b/vision/nox.py
index 0008296bdbe37..984adfe7db007 100644
--- a/vision/nox.py
+++ b/vision/nox.py
@@ -19,9 +19,6 @@
 import nox
 
 
-LOCAL_DEPS = ('../core/',)
-
-
 @nox.session
 @nox.parametrize('python_version', ['2.7', '3.4', '3.5', '3.6'])
 def unit_tests(session, python_version):
@@ -31,14 +28,14 @@ def unit_tests(session, python_version):
     session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
-    session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
+    session.install('mock', 'pytest', 'pytest-cov', '../core/')
     session.install('-e', '.')
 
     # Run py.test against the unit tests.
     session.run('py.test', '--quiet',
-        '--cov=google.cloud.vision', '--cov=tests.unit', '--cov-append',
-        '--cov-config=.coveragerc', '--cov-report=', '--cov-fail-under=97',
-        'tests/unit',
+        '--cov=google.cloud.vision', '--cov=google.cloud.vision_v1',
+        '--cov-append', '--cov-config=.coveragerc', '--cov-report=',
+        'tests/',
     )
 
 
@@ -51,19 +48,39 @@ def system_tests(session, python_version):
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
         return
 
-    # Run the system tests against latest Python 2 and Python 3 only.
+    # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
-    # Install all test dependencies, then install this package into the
-    # virutalenv's dist-packages.
-    session.install('mock', 'pytest', *LOCAL_DEPS)
-    session.install('../test_utils/', '../storage/')
-    session.install('.')
+    # Install all test dependencies, then install this package in-place.
+    session.install('pytest', '../core/', '../storage/')
+    session.install('../test_utils/')
+    session.install('-e', '.')
 
-    # Run py.test against the system tests.
+    # Run py.test against the unit tests.
     session.run('py.test', '--quiet', 'tests/system.py')
 
 
+@nox.session
+@nox.parametrize('python_version', ['2.7', '3.6'])
+def system_tests_manual_layer(session, python_version):
+    """Run the system test suite for the old manual layer."""
+
+    # Sanity check: Only run system tests if the environment variable is set.
+    if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
+        return
+
+    # Run unit tests against all supported versions of Python.
+    session.interpreter = 'python{}'.format(python_version)
+
+    # Install all test dependencies, then install this package in-place.
+    session.install('pytest', '../core/', '../storage/')
+    session.install('../test_utils/')
+    session.install('-e', '.')
+
+    # Run py.test against the unit tests.
+    session.run('py.test', '--quiet', 'tests/system_old.py')
+
+
 @nox.session
 def lint(session):
     """Run flake8.
@@ -72,16 +89,16 @@ def lint(session):
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8')
     session.install('.')
-    session.run('flake8', 'google/cloud/vision')
+    session.run('flake8', 'google/cloud/vision.py')
 
 
 @nox.session
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
-    session.install('docutils', 'Pygments')
+    session.install('docutils', 'pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
 
@@ -96,5 +113,5 @@ def cover(session):
     session.interpreter = 'python3.6'
     session.chdir(os.path.dirname(__file__))
     session.install('coverage', 'pytest-cov')
-    session.run('coverage', 'report', '--show-missing', '--fail-under=100')
+    session.run('coverage', 'report', '--show-missing')
     session.run('coverage', 'erase')
diff --git a/vision/setup.py b/vision/setup.py
index 6f007504fead0..3494535bddd70 100644
--- a/vision/setup.py
+++ b/vision/setup.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import io
 import os
 
 from setuptools import find_packages
@@ -20,35 +21,8 @@
 
 PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))
 
-with open(os.path.join(PACKAGE_ROOT, 'README.rst')) as file_obj:
-    README = file_obj.read()
-
-# NOTE: This is duplicated throughout and we should try to
-#       consolidate.
-SETUP_BASE = {
-    'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
-    'scripts': [],
-    'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
-    'license': 'Apache 2.0',
-    'platforms': 'Posix; MacOS X; Windows',
-    'include_package_data': True,
-    'zip_safe': False,
-    'classifiers': [
-        'Development Status :: 4 - Beta',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: Apache Software License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Topic :: Internet',
-    ],
-}
-
+with io.open(os.path.join(PACKAGE_ROOT, 'README.rst'), 'r') as readme_file:
+    readme = readme_file.read()
 
 REQUIREMENTS = [
     'google-cloud-core >= 0.24.0, < 0.25dev',
@@ -59,16 +33,40 @@
 }
 
 setup(
+    author='Google Cloud Platform',
+    author_email='googleapis-packages@google.com',
     name='google-cloud-vision',
-    version='0.24.0',
+    version='0.25.0',
     description='Python Client for Google Cloud Vision',
-    long_description=README,
+    long_description=readme,
     namespace_packages=[
         'google',
         'google.cloud',
+        'google.cloud.gapic',
+        'google.cloud.gapic.vision',
+        'google.cloud.proto',
+        'google.cloud.proto.vision',
     ],
     packages=find_packages(exclude=('tests*',)),
     install_requires=REQUIREMENTS,
     extras_require=EXTRAS_REQUIRE,
-    **SETUP_BASE
+    url='https://github.com/GoogleCloudPlatform/google-cloud-python',
+    license='Apache 2.0',
+    platforms='Posix; MacOS X; Windows',
+    include_package_data=True,
+    zip_safe=False,
+    scripts=[],
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: Apache Software License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Topic :: Internet',
+    ],
 )
diff --git a/vision/tests/gapic/v1/test_image_annotator_client_v1.py b/vision/tests/gapic/v1/test_image_annotator_client_v1.py
new file mode 100644
index 0000000000000..038a3c725f5a3
--- /dev/null
+++ b/vision/tests/gapic/v1/test_image_annotator_client_v1.py
@@ -0,0 +1,75 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Unit tests."""
+
+import mock
+import unittest
+
+from google.gax import errors
+
+from google.cloud.gapic.vision.v1 import image_annotator_client
+from google.cloud.proto.vision.v1 import image_annotator_pb2
+
+
+class CustomException(Exception):
+    pass
+
+
+class TestImageAnnotatorClient(unittest.TestCase):
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_batch_annotate_images(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = image_annotator_client.ImageAnnotatorClient()
+
+        # Mock request
+        requests = []
+
+        # Mock response
+        expected_response = image_annotator_pb2.BatchAnnotateImagesResponse()
+        grpc_stub.BatchAnnotateImages.return_value = expected_response
+
+        response = client.batch_annotate_images(requests)
+        self.assertEqual(expected_response, response)
+
+        grpc_stub.BatchAnnotateImages.assert_called_once()
+        args, kwargs = grpc_stub.BatchAnnotateImages.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_request = args[0]
+
+        expected_request = image_annotator_pb2.BatchAnnotateImagesRequest(
+            requests=requests)
+        self.assertEqual(expected_request, actual_request)
+
+    @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_batch_annotate_images_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = image_annotator_client.ImageAnnotatorClient()
+
+        # Mock request
+        requests = []
+
+        # Mock exception response
+        grpc_stub.BatchAnnotateImages.side_effect = CustomException()
+
+        self.assertRaises(errors.GaxError, client.batch_annotate_images,
+                          requests)
diff --git a/vision/tests/system.py b/vision/tests/system.py
index 65d5909374bc9..0d39df8bb88cc 100644
--- a/vision/tests/system.py
+++ b/vision/tests/system.py
@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc.
+# Copyright 2017, Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
 """System tests for Vision API."""
 
 import functools
+import io
 import os
 import unittest
 
@@ -23,9 +24,6 @@
 from google.cloud import exceptions
 from google.cloud import storage
 from google.cloud import vision
-from google.cloud.vision.entity import EntityAnnotation
-from google.cloud.vision.feature import Feature
-from google.cloud.vision.feature import FeatureTypes
 
 from test_utils.retry import RetryErrors
 from test_utils.retry import RetryResult
@@ -41,757 +39,88 @@
 FULL_TEXT_FILE = os.path.join(_SYS_TESTS_DIR, 'data', 'full-text.jpg')
 
 
-class Config(object):
-    CLIENT = None
-    TEST_BUCKET = None
+class VisionSystemTestBase(unittest.TestCase):
+    client = None
+    test_bucket = None
+
+    def setUp(self):
+        self.to_delete_by_case = []
+
+    def tearDown(self):
+        for value in self.to_delete_by_case:
+            value.delete()
 
 
 def setUpModule():
-    Config.CLIENT = vision.Client()
+    VisionSystemTestBase.client = vision.ImageAnnotatorClient()
     storage_client = storage.Client()
     bucket_name = 'new' + unique_resource_id()
-    Config.TEST_BUCKET = storage_client.bucket(bucket_name)
+    VisionSystemTestBase.test_bucket = storage_client.bucket(bucket_name)
+
     # 429 Too Many Requests in case API requests rate-limited.
     retry_429 = RetryErrors(exceptions.TooManyRequests)
-    retry_429(Config.TEST_BUCKET.create)()
+    retry_429(VisionSystemTestBase.test_bucket.create)()
 
 
 def tearDownModule():
     # 409 Conflict if the bucket is full.
     # 429 Too Many Requests in case API requests rate-limited.
     bucket_retry = RetryErrors(
-        (exceptions.TooManyRequests, exceptions.Conflict))
-    bucket_retry(Config.TEST_BUCKET.delete)(force=True)
-
-
-class BaseVisionTestCase(unittest.TestCase):
-    def _assert_coordinate(self, coordinate):
-        if coordinate is None:
-            return
-        self.assertIsNotNone(coordinate)
-        self.assertIsInstance(coordinate, (int, float))
-
-    def _assert_likelihood(self, likelihood):
-        from google.cloud.vision.likelihood import Likelihood
-
-        levels = [Likelihood.UNKNOWN, Likelihood.VERY_LIKELY,
-                  Likelihood.UNLIKELY, Likelihood.POSSIBLE, Likelihood.LIKELY,
-                  Likelihood.VERY_UNLIKELY]
-        self.assertIn(likelihood, levels)
-
-    def _pb_not_implemented_skip(self, message):
-        if Config.CLIENT._use_grpc:
-            self.skipTest(message)
-
-
-class TestVisionFullText(unittest.TestCase):
-    def setUp(self):
-        self.to_delete_by_case = []
-
-    def tearDown(self):
-        for value in self.to_delete_by_case:
-            value.delete()
-
-    def _assert_full_text(self, full_text):
-        from google.cloud.vision.text import TextAnnotation
-
-        self.assertIsInstance(full_text, TextAnnotation)
-        self.assertIsInstance(full_text.text, six.text_type)
-        self.assertEqual(len(full_text.pages), 1)
-        self.assertIsInstance(full_text.pages[0].width, int)
-        self.assertIsInstance(full_text.pages[0].height, int)
-
-    def test_detect_full_text_content(self):
-        client = Config.CLIENT
-        with open(FULL_TEXT_FILE, 'rb') as image_file:
-            image = client.image(content=image_file.read())
-        full_text = image.detect_full_text(language_hints=['en'])
-        self._assert_full_text(full_text)
-
-    def test_detect_full_text_filename(self):
-        client = Config.CLIENT
-        image = client.image(filename=FULL_TEXT_FILE)
-        full_text = image.detect_full_text(language_hints=['en'])
-        self._assert_full_text(full_text)
-
-    def test_detect_full_text_gcs(self):
-        bucket_name = Config.TEST_BUCKET.name
-        blob_name = 'full-text.jpg'
-        blob = Config.TEST_BUCKET.blob(blob_name)
-        self.to_delete_by_case.append(blob)  # Clean-up.
-        with open(FULL_TEXT_FILE, 'rb') as file_obj:
-            blob.upload_from_file(file_obj)
-
-        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
-
-        client = Config.CLIENT
-        image = client.image(source_uri=source_uri)
-        full_text = image.detect_full_text(language_hints=['en'])
-        self._assert_full_text(full_text)
-
-
-class TestVisionClientCropHint(BaseVisionTestCase):
-    def setUp(self):
-        self.to_delete_by_case = []
-
-    def tearDown(self):
-        for value in self.to_delete_by_case:
-            value.delete()
-
-    def _assert_crop_hint(self, hint):
-        from google.cloud.vision.crop_hint import CropHint
-        from google.cloud.vision.geometry import Bounds
-
-        self.assertIsInstance(hint, CropHint)
-        self.assertIsInstance(hint.bounds, Bounds)
-        self.assertGreater(len(hint.bounds.vertices), 1)
-        self.assertIsInstance(hint.confidence, (int, float))
-        self.assertIsInstance(hint.importance_fraction, float)
-
-    def test_detect_crop_hints_content(self):
-        client = Config.CLIENT
-        with open(FACE_FILE, 'rb') as image_file:
-            image = client.image(content=image_file.read())
-        crop_hints = image.detect_crop_hints(
-            aspect_ratios=[1.3333, 1.7777], limit=2)
-        self.assertEqual(len(crop_hints), 2)
-        for hint in crop_hints:
-            self._assert_crop_hint(hint)
-
-    def test_detect_crop_hints_filename(self):
-        client = Config.CLIENT
-        image = client.image(filename=FACE_FILE)
-        crop_hints = image.detect_crop_hints(
-            aspect_ratios=[1.3333, 1.7777], limit=2)
-        self.assertEqual(len(crop_hints), 2)
-        for hint in crop_hints:
-            self._assert_crop_hint(hint)
-
-    def test_detect_crop_hints_gcs(self):
-        bucket_name = Config.TEST_BUCKET.name
-        blob_name = 'faces.jpg'
-        blob = Config.TEST_BUCKET.blob(blob_name)
-        self.to_delete_by_case.append(blob)  # Clean-up.
-        with open(FACE_FILE, 'rb') as file_obj:
-            blob.upload_from_file(file_obj)
+        (exceptions.TooManyRequests, exceptions.Conflict),
+    )
+    bucket_retry(VisionSystemTestBase.test_bucket.delete)(force=True)
 
-        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
-        client = Config.CLIENT
-        image = client.image(source_uri=source_uri)
-        crop_hints = image.detect_crop_hints(
-            aspect_ratios=[1.3333, 1.7777], limit=2)
-        self.assertEqual(len(crop_hints), 2)
-        for hint in crop_hints:
-            self._assert_crop_hint(hint)
 
+class TestVisionClientLogo(VisionSystemTestBase):
+    def test_detect_logos_content(self):
+        # Read the file.
+        with io.open(LOGO_FILE, 'rb') as image_file:
+            content = image_file.read()
 
-class TestVisionClientLogo(unittest.TestCase):
-    def setUp(self):
-        self.to_delete_by_case = []
+        # Make the request.
+        response = self.client.logo_detection({
+            'content': content,
+        })
 
-    def tearDown(self):
-        for value in self.to_delete_by_case:
-            value.delete()
+        # Check to ensure we got what we expect.
+        assert len(response.logo_annotations) == 1
+        assert response.logo_annotations[0].description == 'Google'
 
-    def _assert_logo(self, logo):
-        self.assertIsInstance(logo, EntityAnnotation)
-        self.assertEqual(logo.description, 'Google')
-        self.assertEqual(len(logo.bounds.vertices), 4)
-        self.assertEqual(logo.bounds.vertices[0].x_coordinate, 40)
-        self.assertEqual(logo.bounds.vertices[0].y_coordinate, 40)
-        self.assertEqual(logo.bounds.vertices[1].x_coordinate, 959)
-        self.assertEqual(logo.bounds.vertices[1].y_coordinate, 40)
-        self.assertEqual(logo.bounds.vertices[2].x_coordinate, 959)
-        self.assertEqual(logo.bounds.vertices[2].y_coordinate, 302)
-        self.assertEqual(logo.bounds.vertices[3].x_coordinate, 40)
-        self.assertEqual(logo.bounds.vertices[3].y_coordinate, 302)
-        self.assertTrue(logo.score > 0.25)
+    def test_detect_logos_file_handler(self):
+        # Get a file handler, and make the request using it.
+        with io.open(LOGO_FILE, 'rb') as image_file:
+            response = self.client.logo_detection(image_file)
 
-    def test_detect_logos_content(self):
-        client = Config.CLIENT
-        with open(LOGO_FILE, 'rb') as image_file:
-            image = client.image(content=image_file.read())
-        logos = image.detect_logos()
-        self.assertEqual(len(logos), 1)
-        logo = logos[0]
-        self._assert_logo(logo)
+        # Check to ensure we got what we expect.
+        assert len(response.logo_annotations) == 1
+        assert response.logo_annotations[0].description == 'Google'
 
     def test_detect_logos_filename(self):
-        client = Config.CLIENT
-        image = client.image(filename=LOGO_FILE)
-        logos = image.detect_logos()
-        self.assertEqual(len(logos), 1)
-        logo = logos[0]
-        self._assert_logo(logo)
+        # Make the request with the filename directly.
+        response = self.client.logo_detection({
+            'source': {'filename': LOGO_FILE},
+        })
+
+        # Check to ensure we got what we expect.
+        assert len(response.logo_annotations) == 1
+        assert response.logo_annotations[0].description == 'Google'
 
     def test_detect_logos_gcs(self):
-        bucket_name = Config.TEST_BUCKET.name
+        # Upload the image to Google Cloud Storage.
         blob_name = 'logo.png'
-        blob = Config.TEST_BUCKET.blob(blob_name)
-        self.to_delete_by_case.append(blob)  # Clean-up.
-        with open(LOGO_FILE, 'rb') as file_obj:
-            blob.upload_from_file(file_obj)
-
-        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
-
-        client = Config.CLIENT
-        image = client.image(source_uri=source_uri)
-        logos = image.detect_logos()
-        self.assertEqual(len(logos), 1)
-        logo = logos[0]
-        self._assert_logo(logo)
-
-
-class TestVisionClientFace(BaseVisionTestCase):
-    def setUp(self):
-        self.to_delete_by_case = []
-
-    def tearDown(self):
-        for value in self.to_delete_by_case:
-            value.delete()
-
-    def _assert_landmarks(self, landmarks):
-        from google.cloud.vision.face import Landmark
-        from google.cloud.vision.face import LandmarkTypes
-        from google.cloud.vision.face import Position
-
-        for landmark in LandmarkTypes:
-            if landmark is not LandmarkTypes.UNKNOWN_LANDMARK:
-                feature = getattr(landmarks, landmark.name.lower())
-                self.assertIsInstance(feature, Landmark)
-                self.assertIsInstance(feature.position, Position)
-                self._assert_coordinate(feature.position.x_coordinate)
-                self._assert_coordinate(feature.position.y_coordinate)
-                self._assert_coordinate(feature.position.z_coordinate)
-
-    def _assert_face(self, face):
-        from google.cloud.vision.face import Bounds
-        from google.cloud.vision.face import FDBounds
-        from google.cloud.vision.face import Face
-        from google.cloud.vision.face import Landmarks
-        from google.cloud.vision.geometry import Vertex
-
-        self.assertIsInstance(face, Face)
-        self.assertGreater(face.detection_confidence, 0.0)
-        self._assert_likelihood(face.anger)
-        self._assert_likelihood(face.joy)
-        self._assert_likelihood(face.sorrow)
-        self._assert_likelihood(face.surprise)
-        self._assert_likelihood(face.image_properties.blurred)
-        self._assert_likelihood(face.image_properties.underexposed)
-        self._assert_likelihood(face.headwear)
-        self.assertNotEqual(face.angles.roll, 0.0)
-        self.assertNotEqual(face.angles.pan, 0.0)
-        self.assertNotEqual(face.angles.tilt, 0.0)
-
-        self.assertIsInstance(face.bounds, Bounds)
-        for vertex in face.bounds.vertices:
-            self.assertIsInstance(vertex, Vertex)
-            self._assert_coordinate(vertex.x_coordinate)
-            self._assert_coordinate(vertex.y_coordinate)
-
-        self.assertIsInstance(face.fd_bounds, FDBounds)
-        for vertex in face.fd_bounds.vertices:
-            self.assertIsInstance(vertex, Vertex)
-            self._assert_coordinate(vertex.x_coordinate)
-            self._assert_coordinate(vertex.y_coordinate)
-
-        self.assertIsInstance(face.landmarks, Landmarks)
-        self._assert_landmarks(face.landmarks)
-
-    def test_detect_faces_content(self):
-        client = Config.CLIENT
-        with open(FACE_FILE, 'rb') as image_file:
-            image = client.image(content=image_file.read())
-        faces = image.detect_faces()
-        self.assertEqual(len(faces), 5)
-        for face in faces:
-            self._assert_face(face)
-
-    def test_detect_faces_gcs(self):
-        bucket_name = Config.TEST_BUCKET.name
-        blob_name = 'faces.jpg'
-        blob = Config.TEST_BUCKET.blob(blob_name)
-        self.to_delete_by_case.append(blob)  # Clean-up.
-        with open(FACE_FILE, 'rb') as file_obj:
-            blob.upload_from_file(file_obj)
-
-        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
-        client = Config.CLIENT
-        image = client.image(source_uri=source_uri)
-        faces = image.detect_faces()
-        self.assertEqual(len(faces), 5)
-        for face in faces:
-            self._assert_face(face)
-
-    def test_detect_faces_filename(self):
-        client = Config.CLIENT
-        image = client.image(filename=FACE_FILE)
-        faces = image.detect_faces()
-        self.assertEqual(len(faces), 5)
-        for face in faces:
-            self._assert_face(face)
-
-
-class TestVisionClientLabel(BaseVisionTestCase):
-    DESCRIPTIONS = (
-        'car',
-        'vehicle',
-        'land vehicle',
-        'automotive design',
-        'wheel',
-        'automobile make',
-        'luxury vehicle',
-        'sports car',
-        'performance car',
-        'automotive exterior',
-    )
-
-    def setUp(self):
-        self.to_delete_by_case = []
-
-    def tearDown(self):
-        for value in self.to_delete_by_case:
-            value.delete()
-
-    def _assert_label(self, label):
-        self.assertIsInstance(label, EntityAnnotation)
-        self.assertIn(label.description, self.DESCRIPTIONS)
-        self.assertIsInstance(label.mid, six.text_type)
-        self.assertGreater(label.score, 0.0)
-
-    def test_detect_labels_content(self):
-        client = Config.CLIENT
-        with open(LABEL_FILE, 'rb') as image_file:
-            image = client.image(content=image_file.read())
-        labels = image.detect_labels()
-        self.assertEqual(len(labels), 10)
-        for label in labels:
-            self._assert_label(label)
-
-    def test_detect_labels_gcs(self):
-        bucket_name = Config.TEST_BUCKET.name
-        blob_name = 'car.jpg'
-        blob = Config.TEST_BUCKET.blob(blob_name)
-        self.to_delete_by_case.append(blob)  # Clean-up.
-        with open(LABEL_FILE, 'rb') as file_obj:
-            blob.upload_from_file(file_obj)
-
-        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
-
-        client = Config.CLIENT
-        image = client.image(source_uri=source_uri)
-        labels = image.detect_labels()
-        self.assertEqual(len(labels), 10)
-        for label in labels:
-            self._assert_label(label)
-
-    def test_detect_labels_filename(self):
-        client = Config.CLIENT
-        image = client.image(filename=LABEL_FILE)
-        labels = image.detect_labels()
-        self.assertEqual(len(labels), 10)
-        for label in labels:
-            self._assert_label(label)
-
-
-class TestVisionClientLandmark(BaseVisionTestCase):
-    DESCRIPTIONS = ('Mount Rushmore',)
-
-    def setUp(self):
-        self.to_delete_by_case = []
-
-    def tearDown(self):
-        for value in self.to_delete_by_case:
-            value.delete()
-
-    def _assert_landmark(self, landmark):
-        self.assertIsInstance(landmark, EntityAnnotation)
-        self.assertIn(landmark.description, self.DESCRIPTIONS)
-        self.assertEqual(len(landmark.locations), 1)
-        location = landmark.locations[0]
-        self._assert_coordinate(location.latitude)
-        self._assert_coordinate(location.longitude)
-        for vertex in landmark.bounds.vertices:
-            self._assert_coordinate(vertex.x_coordinate)
-            self._assert_coordinate(vertex.y_coordinate)
-        self.assertGreater(landmark.score, 0.2)
-        self.assertIsInstance(landmark.mid, six.text_type)
-
-    def test_detect_landmark_content(self):
-        client = Config.CLIENT
-        with open(LANDMARK_FILE, 'rb') as image_file:
-            image = client.image(content=image_file.read())
-        landmarks = image.detect_landmarks()
-        self.assertEqual(len(landmarks), 1)
-        landmark = landmarks[0]
-        self._assert_landmark(landmark)
-
-    def test_detect_landmark_gcs(self):
-        bucket_name = Config.TEST_BUCKET.name
-        blob_name = 'landmark.jpg'
-        blob = Config.TEST_BUCKET.blob(blob_name)
-        self.to_delete_by_case.append(blob)  # Clean-up.
-        with open(LANDMARK_FILE, 'rb') as file_obj:
-            blob.upload_from_file(file_obj)
-
-        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
-
-        client = Config.CLIENT
-        image = client.image(source_uri=source_uri)
-        landmarks = image.detect_landmarks()
-        self.assertEqual(len(landmarks), 1)
-        landmark = landmarks[0]
-        self._assert_landmark(landmark)
-
-    def test_detect_landmark_filename(self):
-        client = Config.CLIENT
-        image = client.image(filename=LANDMARK_FILE)
-        landmarks = image.detect_landmarks()
-        self.assertEqual(len(landmarks), 1)
-        landmark = landmarks[0]
-        self._assert_landmark(landmark)
-
-
-class TestVisionClientSafeSearch(BaseVisionTestCase):
-    def setUp(self):
-        self.to_delete_by_case = []
-
-    def tearDown(self):
-        for value in self.to_delete_by_case:
-            value.delete()
-
-    def _assert_safe_search(self, safe_search):
-        from google.cloud.vision.safe_search import SafeSearchAnnotation
-
-        self.assertIsInstance(safe_search, SafeSearchAnnotation)
-        self._assert_likelihood(safe_search.adult)
-        self._assert_likelihood(safe_search.spoof)
-        self._assert_likelihood(safe_search.medical)
-        self._assert_likelihood(safe_search.violence)
-
-    def test_detect_safe_search_content(self):
-        client = Config.CLIENT
-        with open(FACE_FILE, 'rb') as image_file:
-            image = client.image(content=image_file.read())
-        safe_search = image.detect_safe_search()
-        self._assert_safe_search(safe_search)
-
-    def test_detect_safe_search_gcs(self):
-        bucket_name = Config.TEST_BUCKET.name
-        blob_name = 'faces.jpg'
-        blob = Config.TEST_BUCKET.blob(blob_name)
-        self.to_delete_by_case.append(blob)  # Clean-up.
-        with open(FACE_FILE, 'rb') as file_obj:
-            blob.upload_from_file(file_obj)
-
-        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
-
-        client = Config.CLIENT
-        image = client.image(source_uri=source_uri)
-        safe_search = image.detect_safe_search()
-        self._assert_safe_search(safe_search)
-
-    def test_detect_safe_search_filename(self):
-        client = Config.CLIENT
-        image = client.image(filename=FACE_FILE)
-        safe_search = image.detect_safe_search()
-        self._assert_safe_search(safe_search)
-
-
-class TestVisionClientText(unittest.TestCase):
-    DESCRIPTIONS = (
-        'Do',
-        'what',
-        'is',
-        'right,',
-        'not',
-        'what',
-        'is',
-        'easy',
-        'Do what is\nright, not\nwhat is easy\n',
-    )
-
-    def setUp(self):
-        self.to_delete_by_case = []
-
-    def tearDown(self):
-        for value in self.to_delete_by_case:
-            value.delete()
-
-    def _assert_text(self, text):
-        self.assertIsInstance(text, EntityAnnotation)
-        self.assertIn(text.description, self.DESCRIPTIONS)
-        self.assertIn(text.locale, (None, '', 'en'))
-        self.assertIsInstance(text.score, (type(None), float))
-
-    def test_detect_text_content(self):
-        client = Config.CLIENT
-        with open(TEXT_FILE, 'rb') as image_file:
-            image = client.image(content=image_file.read())
-        texts = image.detect_text()
-        self.assertEqual(len(texts), 9)
-        for text in texts:
-            self._assert_text(text)
-
-    def test_detect_text_gcs(self):
-        bucket_name = Config.TEST_BUCKET.name
-        blob_name = 'text.jpg'
-        blob = Config.TEST_BUCKET.blob(blob_name)
-        self.to_delete_by_case.append(blob)  # Clean-up.
-        with open(TEXT_FILE, 'rb') as file_obj:
-            blob.upload_from_file(file_obj)
-
-        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
-
-        client = Config.CLIENT
-        image = client.image(source_uri=source_uri)
-        texts = image.detect_text()
-        self.assertEqual(len(texts), 9)
-        for text in texts:
-            self._assert_text(text)
-
-    def test_detect_text_filename(self):
-        client = Config.CLIENT
-        image = client.image(filename=TEXT_FILE)
-        texts = image.detect_text()
-        self.assertEqual(len(texts), 9)
-        for text in texts:
-            self._assert_text(text)
-
-
-class TestVisionClientImageProperties(BaseVisionTestCase):
-    def setUp(self):
-        self.to_delete_by_case = []
-
-    def tearDown(self):
-        for value in self.to_delete_by_case:
-            value.delete()
-
-    def _assert_color(self, color):
-        self.assertIsInstance(color.red, float)
-        self.assertIsInstance(color.green, float)
-        self.assertIsInstance(color.blue, float)
-        self.assertIsInstance(color.alpha, float)
-        self.assertNotEqual(color.red, 0.0)
-        self.assertNotEqual(color.green, 0.0)
-        self.assertNotEqual(color.blue, 0.0)
-
-    def _assert_properties(self, image_property):
-        from google.cloud.vision.color import ImagePropertiesAnnotation
-
-        self.assertIsInstance(image_property, ImagePropertiesAnnotation)
-        results = image_property.colors
-        for color_info in results:
-            self._assert_color(color_info.color)
-            self.assertNotEqual(color_info.pixel_fraction, 0.0)
-            self.assertNotEqual(color_info.score, 0.0)
-
-    def test_detect_properties_content(self):
-        client = Config.CLIENT
-        with open(FACE_FILE, 'rb') as image_file:
-            image = client.image(content=image_file.read())
-        properties = image.detect_properties()
-        self._assert_properties(properties)
-
-    def test_detect_properties_gcs(self):
-        client = Config.CLIENT
-        bucket_name = Config.TEST_BUCKET.name
-        blob_name = 'faces.jpg'
-        blob = Config.TEST_BUCKET.blob(blob_name)
-        self.to_delete_by_case.append(blob)  # Clean-up.
-        with open(FACE_FILE, 'rb') as file_obj:
-            blob.upload_from_file(file_obj)
-
-        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
-
-        image = client.image(source_uri=source_uri)
-        properties = image.detect_properties()
-        self._assert_properties(properties)
-
-    def test_detect_properties_filename(self):
-        client = Config.CLIENT
-        image = client.image(filename=FACE_FILE)
-        properties = image.detect_properties()
-        self._assert_properties(properties)
-
-
-class TestVisionBatchProcessing(BaseVisionTestCase):
-    def setUp(self):
-        self.to_delete_by_case = []
-
-    def tearDown(self):
-        for value in self.to_delete_by_case:
-            value.delete()
-
-    def test_batch_detect_gcs(self):
-        client = Config.CLIENT
-        bucket_name = Config.TEST_BUCKET.name
-
-        # Logo GCS image.
-        blob_name = 'logos.jpg'
-        blob = Config.TEST_BUCKET.blob(blob_name)
-        self.to_delete_by_case.append(blob)  # Clean-up.
-        with open(LOGO_FILE, 'rb') as file_obj:
-            blob.upload_from_file(file_obj)
-
-        logo_source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
-
-        image_one = client.image(source_uri=logo_source_uri)
-        logo_feature = Feature(FeatureTypes.LOGO_DETECTION, 2)
-
-        # Faces GCS image.
-        blob_name = 'faces.jpg'
-        blob = Config.TEST_BUCKET.blob(blob_name)
-        self.to_delete_by_case.append(blob)  # Clean-up.
-        with open(FACE_FILE, 'rb') as file_obj:
-            blob.upload_from_file(file_obj)
-
-        face_source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
-
-        image_two = client.image(source_uri=face_source_uri)
-        face_feature = Feature(FeatureTypes.FACE_DETECTION, 2)
-
-        batch = client.batch()
-        batch.add_image(image_one, [logo_feature])
-        batch.add_image(image_two, [face_feature, logo_feature])
-        results = batch.detect()
-        self.assertEqual(len(results), 2)
-        self.assertIsInstance(results[0], vision.annotations.Annotations)
-        self.assertIsInstance(results[1], vision.annotations.Annotations)
-        self.assertEqual(len(results[0].logos), 1)
-        self.assertEqual(len(results[0].faces), 0)
-
-        self.assertEqual(len(results[1].logos), 0)
-        self.assertEqual(len(results[1].faces), 2)
-
-
-class TestVisionWebAnnotation(BaseVisionTestCase):
-    def setUp(self):
-        self.to_delete_by_case = []
-
-    def tearDown(self):
-        for value in self.to_delete_by_case:
-            value.delete()
-
-    def _check_web_entity(self, web_entity):
-        from google.cloud.vision.web import WebEntity
-
-        if not isinstance(web_entity, WebEntity):
-            return False
-        if not isinstance(web_entity.entity_id, six.text_type):
-            return False
-        if not isinstance(web_entity.score, float):
-            return False
-        if not isinstance(web_entity.description, six.text_type):
-            return False
-
-        return True
-
-    def _assert_web_entity(self, web_entity):
-        return_value = self._check_web_entity(web_entity)
-        self.assertTrue(return_value)
-
-    def _check_web_image(self, web_image):
-        from google.cloud.vision.web import WebImage
-
-        if not isinstance(web_image, WebImage):
-            return False
-
-        if not isinstance(web_image.url, six.text_type):
-            return False
-
-        if not isinstance(web_image.score, float):
-            return False
-
-        return True
-
-    def _assert_web_image(self, web_image):
-        return_value = self._check_web_image(web_image)
-        self.assertTrue(return_value)
-
-    def _check_web_page(self, web_page):
-        from google.cloud.vision.web import WebPage
-
-        if not isinstance(web_page, WebPage):
-            return False
-
-        if not isinstance(web_page.url, six.text_type):
-            return False
-
-        if not isinstance(web_page.score, float):
-            return False
-
-        return True
-
-    def _assert_web_page(self, web_page):
-        return_value = self._check_web_page(web_page)
-        self.assertTrue(return_value)
-
-    def _check_web_images(self, web_images, limit):
-        if len(web_images.web_entities) != limit:
-            return False
-        for web_entity in web_images.web_entities:
-            if not self._check_web_entity(web_entity):
-                return False
-
-        if len(web_images.full_matching_images) != limit:
-            return False
-        for web_image in web_images.full_matching_images:
-            if not self._check_web_image(web_image):
-                return False
-
-        if len(web_images.partial_matching_images) != limit:
-            return False
-        for web_image in web_images.partial_matching_images:
-            if not self._check_web_image(web_image):
-                return False
-
-        if len(web_images.pages_with_matching_images) != limit:
-            return False
-        for web_page in web_images.pages_with_matching_images:
-            if not self._check_web_page(web_page):
-                return False
-
-        return True
-
-    def _assert_web_images(self, web_images, limit):
-        return_value = self._check_web_images(web_images, limit)
-        self.assertTrue(return_value)
-
-    @RetryErrors(unittest.TestCase.failureException)
-    def test_detect_web_images_from_content(self):
-        client = Config.CLIENT
-        with open(LANDMARK_FILE, 'rb') as image_file:
-            image = client.image(content=image_file.read())
-        limit = 3
-        web_images = image.detect_web(limit=limit)
-        self._assert_web_images(web_images, limit)
-
-    def test_detect_web_images_from_gcs(self):
-        client = Config.CLIENT
-        bucket_name = Config.TEST_BUCKET.name
-        blob_name = 'landmark.jpg'
-        blob = Config.TEST_BUCKET.blob(blob_name)
-        self.to_delete_by_case.append(blob)  # Clean-up.
-        with open(LANDMARK_FILE, 'rb') as file_obj:
-            blob.upload_from_file(file_obj)
-
-        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
-
-        image = client.image(source_uri=source_uri)
-        limit = 5
-
-        images_good = functools.partial(self._check_web_images, limit=limit)
-        images_good.__name__ = 'images_good'  # partial() has no name.
-        retry = RetryResult(images_good)
-        web_images = retry(image.detect_web)(limit=limit)
-
-        self._assert_web_images(web_images, limit)
-
-    def test_detect_web_images_from_filename(self):
-        client = Config.CLIENT
-        image = client.image(filename=LANDMARK_FILE)
-        limit = 5
-        web_images = image.detect_web(limit=limit)
-        self._assert_web_images(web_images, limit)
+        blob = self.test_bucket.blob(blob_name)
+        self.to_delete_by_case.append(blob)
+        with io.open(LOGO_FILE, 'rb') as image_file:
+            blob.upload_from_file(image_file)
+
+        # Make the request.
+        response = self.client.logo_detection({
+            'source': {'image_uri': 'gs://{bucket}/{blob}'.format(
+                bucket=self.test_bucket.name,
+                blob=blob_name,
+            )},
+        })
+
+        # Check the response.
+        assert len(response.logo_annotations) == 1
+        assert response.logo_annotations[0].description == 'Google'
diff --git a/vision/tests/system_old.py b/vision/tests/system_old.py
new file mode 100644
index 0000000000000..cddf399ddf5f0
--- /dev/null
+++ b/vision/tests/system_old.py
@@ -0,0 +1,744 @@
+# Copyright 2016 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""System tests for Vision API."""
+
+import os
+import unittest
+
+import six
+
+from google.cloud import exceptions
+from google.cloud import storage
+from google.cloud import vision
+from google.cloud.vision.entity import EntityAnnotation
+from google.cloud.vision.feature import Feature
+from google.cloud.vision.feature import FeatureTypes
+
+from test_utils.retry import RetryErrors
+from test_utils.system import unique_resource_id
+
+
+_SYS_TESTS_DIR = os.path.realpath(os.path.dirname(__file__))
+LOGO_FILE = os.path.join(_SYS_TESTS_DIR, 'data', 'logo.png')
+FACE_FILE = os.path.join(_SYS_TESTS_DIR, 'data', 'faces.jpg')
+LABEL_FILE = os.path.join(_SYS_TESTS_DIR, 'data', 'car.jpg')
+LANDMARK_FILE = os.path.join(_SYS_TESTS_DIR, 'data', 'landmark.jpg')
+TEXT_FILE = os.path.join(_SYS_TESTS_DIR, 'data', 'text.jpg')
+FULL_TEXT_FILE = os.path.join(_SYS_TESTS_DIR, 'data', 'full-text.jpg')
+
+
+class Config(object):
+    CLIENT = None
+    TEST_BUCKET = None
+
+
+def setUpModule():
+    Config.CLIENT = vision.Client()
+    storage_client = storage.Client()
+    bucket_name = 'new' + unique_resource_id()
+    Config.TEST_BUCKET = storage_client.bucket(bucket_name)
+    # 429 Too Many Requests in case API requests rate-limited.
+    retry_429 = RetryErrors(exceptions.TooManyRequests)
+    retry_429(Config.TEST_BUCKET.create)()
+
+
+def tearDownModule():
+    # 409 Conflict if the bucket is full.
+    # 429 Too Many Requests in case API requests rate-limited.
+    bucket_retry = RetryErrors(
+        (exceptions.TooManyRequests, exceptions.Conflict))
+    bucket_retry(Config.TEST_BUCKET.delete)(force=True)
+
+
+class BaseVisionTestCase(unittest.TestCase):
+    def _assert_coordinate(self, coordinate):
+        if coordinate is None:
+            return
+        self.assertIsNotNone(coordinate)
+        self.assertIsInstance(coordinate, (int, float))
+
+    def _assert_likelihood(self, likelihood):
+        from google.cloud.vision.likelihood import Likelihood
+
+        levels = [Likelihood.UNKNOWN, Likelihood.VERY_LIKELY,
+                  Likelihood.UNLIKELY, Likelihood.POSSIBLE, Likelihood.LIKELY,
+                  Likelihood.VERY_UNLIKELY]
+        self.assertIn(likelihood, levels)
+
+    def _pb_not_implemented_skip(self, message):
+        if Config.CLIENT._use_grpc:
+            self.skipTest(message)
+
+
+class TestVisionFullText(unittest.TestCase):
+    def setUp(self):
+        self.to_delete_by_case = []
+
+    def tearDown(self):
+        for value in self.to_delete_by_case:
+            value.delete()
+
+    def _assert_full_text(self, full_text):
+        from google.cloud.vision.text import TextAnnotation
+
+        self.assertIsInstance(full_text, TextAnnotation)
+        self.assertIsInstance(full_text.text, six.text_type)
+        self.assertEqual(len(full_text.pages), 1)
+        self.assertIsInstance(full_text.pages[0].width, int)
+        self.assertIsInstance(full_text.pages[0].height, int)
+
+    def test_detect_full_text_content(self):
+        client = Config.CLIENT
+        with open(FULL_TEXT_FILE, 'rb') as image_file:
+            image = client.image(content=image_file.read())
+        full_text = image.detect_full_text(language_hints=['en'])
+        self._assert_full_text(full_text)
+
+    def test_detect_full_text_filename(self):
+        client = Config.CLIENT
+        image = client.image(filename=FULL_TEXT_FILE)
+        full_text = image.detect_full_text(language_hints=['en'])
+        self._assert_full_text(full_text)
+
+    def test_detect_full_text_gcs(self):
+        bucket_name = Config.TEST_BUCKET.name
+        blob_name = 'full-text.jpg'
+        blob = Config.TEST_BUCKET.blob(blob_name)
+        self.to_delete_by_case.append(blob)  # Clean-up.
+        with open(FULL_TEXT_FILE, 'rb') as file_obj:
+            blob.upload_from_file(file_obj)
+
+        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
+
+        client = Config.CLIENT
+        image = client.image(source_uri=source_uri)
+        full_text = image.detect_full_text(language_hints=['en'])
+        self._assert_full_text(full_text)
+
+
+class TestVisionClientCropHint(BaseVisionTestCase):
+    def setUp(self):
+        self.to_delete_by_case = []
+
+    def tearDown(self):
+        for value in self.to_delete_by_case:
+            value.delete()
+
+    def _assert_crop_hint(self, hint):
+        from google.cloud.vision.crop_hint import CropHint
+        from google.cloud.vision.geometry import Bounds
+
+        self.assertIsInstance(hint, CropHint)
+        self.assertIsInstance(hint.bounds, Bounds)
+        self.assertGreater(len(hint.bounds.vertices), 1)
+        self.assertIsInstance(hint.confidence, (int, float))
+        self.assertIsInstance(hint.importance_fraction, float)
+
+    def test_detect_crop_hints_content(self):
+        client = Config.CLIENT
+        with open(FACE_FILE, 'rb') as image_file:
+            image = client.image(content=image_file.read())
+        crop_hints = image.detect_crop_hints(
+            aspect_ratios=[1.3333, 1.7777], limit=2)
+        self.assertEqual(len(crop_hints), 2)
+        for hint in crop_hints:
+            self._assert_crop_hint(hint)
+
+    def test_detect_crop_hints_filename(self):
+        client = Config.CLIENT
+        image = client.image(filename=FACE_FILE)
+        crop_hints = image.detect_crop_hints(
+            aspect_ratios=[1.3333, 1.7777], limit=2)
+        self.assertEqual(len(crop_hints), 2)
+        for hint in crop_hints:
+            self._assert_crop_hint(hint)
+
+    def test_detect_crop_hints_gcs(self):
+        bucket_name = Config.TEST_BUCKET.name
+        blob_name = 'faces.jpg'
+        blob = Config.TEST_BUCKET.blob(blob_name)
+        self.to_delete_by_case.append(blob)  # Clean-up.
+        with open(FACE_FILE, 'rb') as file_obj:
+            blob.upload_from_file(file_obj)
+
+        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
+        client = Config.CLIENT
+        image = client.image(source_uri=source_uri)
+        crop_hints = image.detect_crop_hints(
+            aspect_ratios=[1.3333, 1.7777], limit=2)
+        self.assertEqual(len(crop_hints), 2)
+        for hint in crop_hints:
+            self._assert_crop_hint(hint)
+
+
+class TestVisionClientLogo(unittest.TestCase):
+    def setUp(self):
+        self.to_delete_by_case = []
+
+    def tearDown(self):
+        for value in self.to_delete_by_case:
+            value.delete()
+
+    def _assert_logo(self, logo):
+        self.assertIsInstance(logo, EntityAnnotation)
+        self.assertEqual(logo.description, 'Google')
+        self.assertEqual(len(logo.bounds.vertices), 4)
+        self.assertEqual(logo.bounds.vertices[0].x_coordinate, 40)
+        self.assertEqual(logo.bounds.vertices[0].y_coordinate, 40)
+        self.assertEqual(logo.bounds.vertices[1].x_coordinate, 959)
+        self.assertEqual(logo.bounds.vertices[1].y_coordinate, 40)
+        self.assertEqual(logo.bounds.vertices[2].x_coordinate, 959)
+        self.assertEqual(logo.bounds.vertices[2].y_coordinate, 302)
+        self.assertEqual(logo.bounds.vertices[3].x_coordinate, 40)
+        self.assertEqual(logo.bounds.vertices[3].y_coordinate, 302)
+        self.assertTrue(logo.score > 0.25)
+
+    def test_detect_logos_content(self):
+        client = Config.CLIENT
+        with open(LOGO_FILE, 'rb') as image_file:
+            image = client.image(content=image_file.read())
+        logos = image.detect_logos()
+        self.assertEqual(len(logos), 1)
+        logo = logos[0]
+        self._assert_logo(logo)
+
+    def test_detect_logos_filename(self):
+        client = Config.CLIENT
+        image = client.image(filename=LOGO_FILE)
+        logos = image.detect_logos()
+        self.assertEqual(len(logos), 1)
+        logo = logos[0]
+        self._assert_logo(logo)
+
+    def test_detect_logos_gcs(self):
+        bucket_name = Config.TEST_BUCKET.name
+        blob_name = 'logo.png'
+        blob = Config.TEST_BUCKET.blob(blob_name)
+        self.to_delete_by_case.append(blob)  # Clean-up.
+        with open(LOGO_FILE, 'rb') as file_obj:
+            blob.upload_from_file(file_obj)
+
+        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
+
+        client = Config.CLIENT
+        image = client.image(source_uri=source_uri)
+        logos = image.detect_logos()
+        self.assertEqual(len(logos), 1)
+        logo = logos[0]
+        self._assert_logo(logo)
+
+
+class TestVisionClientFace(BaseVisionTestCase):
+    def setUp(self):
+        self.to_delete_by_case = []
+
+    def tearDown(self):
+        for value in self.to_delete_by_case:
+            value.delete()
+
+    def _assert_landmarks(self, landmarks):
+        from google.cloud.vision.face import Landmark
+        from google.cloud.vision.face import LandmarkTypes
+        from google.cloud.vision.face import Position
+
+        for landmark in LandmarkTypes:
+            if landmark is not LandmarkTypes.UNKNOWN_LANDMARK:
+                feature = getattr(landmarks, landmark.name.lower())
+                self.assertIsInstance(feature, Landmark)
+                self.assertIsInstance(feature.position, Position)
+                self._assert_coordinate(feature.position.x_coordinate)
+                self._assert_coordinate(feature.position.y_coordinate)
+                self._assert_coordinate(feature.position.z_coordinate)
+
+    def _assert_face(self, face):
+        from google.cloud.vision.face import Bounds
+        from google.cloud.vision.face import FDBounds
+        from google.cloud.vision.face import Face
+        from google.cloud.vision.face import Landmarks
+        from google.cloud.vision.geometry import Vertex
+
+        self.assertIsInstance(face, Face)
+        self.assertGreater(face.detection_confidence, 0.0)
+        self._assert_likelihood(face.anger)
+        self._assert_likelihood(face.joy)
+        self._assert_likelihood(face.sorrow)
+        self._assert_likelihood(face.surprise)
+        self._assert_likelihood(face.image_properties.blurred)
+        self._assert_likelihood(face.image_properties.underexposed)
+        self._assert_likelihood(face.headwear)
+        self.assertNotEqual(face.angles.roll, 0.0)
+        self.assertNotEqual(face.angles.pan, 0.0)
+        self.assertNotEqual(face.angles.tilt, 0.0)
+
+        self.assertIsInstance(face.bounds, Bounds)
+        for vertex in face.bounds.vertices:
+            self.assertIsInstance(vertex, Vertex)
+            self._assert_coordinate(vertex.x_coordinate)
+            self._assert_coordinate(vertex.y_coordinate)
+
+        self.assertIsInstance(face.fd_bounds, FDBounds)
+        for vertex in face.fd_bounds.vertices:
+            self.assertIsInstance(vertex, Vertex)
+            self._assert_coordinate(vertex.x_coordinate)
+            self._assert_coordinate(vertex.y_coordinate)
+
+        self.assertIsInstance(face.landmarks, Landmarks)
+        self._assert_landmarks(face.landmarks)
+
+    def test_detect_faces_content(self):
+        client = Config.CLIENT
+        with open(FACE_FILE, 'rb') as image_file:
+            image = client.image(content=image_file.read())
+        faces = image.detect_faces()
+        self.assertEqual(len(faces), 5)
+        for face in faces:
+            self._assert_face(face)
+
+    def test_detect_faces_gcs(self):
+        bucket_name = Config.TEST_BUCKET.name
+        blob_name = 'faces.jpg'
+        blob = Config.TEST_BUCKET.blob(blob_name)
+        self.to_delete_by_case.append(blob)  # Clean-up.
+        with open(FACE_FILE, 'rb') as file_obj:
+            blob.upload_from_file(file_obj)
+
+        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
+        client = Config.CLIENT
+        image = client.image(source_uri=source_uri)
+        faces = image.detect_faces()
+        self.assertEqual(len(faces), 5)
+        for face in faces:
+            self._assert_face(face)
+
+    def test_detect_faces_filename(self):
+        client = Config.CLIENT
+        image = client.image(filename=FACE_FILE)
+        faces = image.detect_faces()
+        self.assertEqual(len(faces), 5)
+        for face in faces:
+            self._assert_face(face)
+
+
+class TestVisionClientLabel(BaseVisionTestCase):
+    DESCRIPTIONS = (
+        'car',
+        'vehicle',
+        'land vehicle',
+        'automotive design',
+        'wheel',
+        'automobile make',
+        'luxury vehicle',
+        'sports car',
+        'performance car',
+        'automotive exterior',
+    )
+
+    def setUp(self):
+        self.to_delete_by_case = []
+
+    def tearDown(self):
+        for value in self.to_delete_by_case:
+            value.delete()
+
+    def _assert_label(self, label):
+        self.assertIsInstance(label, EntityAnnotation)
+        self.assertIn(label.description, self.DESCRIPTIONS)
+        self.assertIsInstance(label.mid, six.text_type)
+        self.assertGreater(label.score, 0.0)
+
+    def test_detect_labels_content(self):
+        client = Config.CLIENT
+        with open(LABEL_FILE, 'rb') as image_file:
+            image = client.image(content=image_file.read())
+        labels = image.detect_labels()
+        self.assertEqual(len(labels), 10)
+        for label in labels:
+            self._assert_label(label)
+
+    def test_detect_labels_gcs(self):
+        bucket_name = Config.TEST_BUCKET.name
+        blob_name = 'car.jpg'
+        blob = Config.TEST_BUCKET.blob(blob_name)
+        self.to_delete_by_case.append(blob)  # Clean-up.
+        with open(LABEL_FILE, 'rb') as file_obj:
+            blob.upload_from_file(file_obj)
+
+        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
+
+        client = Config.CLIENT
+        image = client.image(source_uri=source_uri)
+        labels = image.detect_labels()
+        self.assertEqual(len(labels), 10)
+        for label in labels:
+            self._assert_label(label)
+
+    def test_detect_labels_filename(self):
+        client = Config.CLIENT
+        image = client.image(filename=LABEL_FILE)
+        labels = image.detect_labels()
+        self.assertEqual(len(labels), 10)
+        for label in labels:
+            self._assert_label(label)
+
+
+class TestVisionClientLandmark(BaseVisionTestCase):
+    DESCRIPTIONS = ('Mount Rushmore',)
+
+    def setUp(self):
+        self.to_delete_by_case = []
+
+    def tearDown(self):
+        for value in self.to_delete_by_case:
+            value.delete()
+
+    def _assert_landmark(self, landmark):
+        self.assertIsInstance(landmark, EntityAnnotation)
+        self.assertIn(landmark.description, self.DESCRIPTIONS)
+        self.assertEqual(len(landmark.locations), 1)
+        location = landmark.locations[0]
+        self._assert_coordinate(location.latitude)
+        self._assert_coordinate(location.longitude)
+        for vertex in landmark.bounds.vertices:
+            self._assert_coordinate(vertex.x_coordinate)
+            self._assert_coordinate(vertex.y_coordinate)
+        self.assertGreater(landmark.score, 0.2)
+        self.assertIsInstance(landmark.mid, six.text_type)
+
+    def test_detect_landmark_content(self):
+        client = Config.CLIENT
+        with open(LANDMARK_FILE, 'rb') as image_file:
+            image = client.image(content=image_file.read())
+        landmarks = image.detect_landmarks()
+        self.assertEqual(len(landmarks), 1)
+        landmark = landmarks[0]
+        self._assert_landmark(landmark)
+
+    def test_detect_landmark_gcs(self):
+        bucket_name = Config.TEST_BUCKET.name
+        blob_name = 'landmark.jpg'
+        blob = Config.TEST_BUCKET.blob(blob_name)
+        self.to_delete_by_case.append(blob)  # Clean-up.
+        with open(LANDMARK_FILE, 'rb') as file_obj:
+            blob.upload_from_file(file_obj)
+
+        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
+
+        client = Config.CLIENT
+        image = client.image(source_uri=source_uri)
+        landmarks = image.detect_landmarks()
+        self.assertEqual(len(landmarks), 1)
+        landmark = landmarks[0]
+        self._assert_landmark(landmark)
+
+    def test_detect_landmark_filename(self):
+        client = Config.CLIENT
+        image = client.image(filename=LANDMARK_FILE)
+        landmarks = image.detect_landmarks()
+        self.assertEqual(len(landmarks), 1)
+        landmark = landmarks[0]
+        self._assert_landmark(landmark)
+
+
+class TestVisionClientSafeSearch(BaseVisionTestCase):
+    def setUp(self):
+        self.to_delete_by_case = []
+
+    def tearDown(self):
+        for value in self.to_delete_by_case:
+            value.delete()
+
+    def _assert_safe_search(self, safe_search):
+        from google.cloud.vision.safe_search import SafeSearchAnnotation
+
+        self.assertIsInstance(safe_search, SafeSearchAnnotation)
+        self._assert_likelihood(safe_search.adult)
+        self._assert_likelihood(safe_search.spoof)
+        self._assert_likelihood(safe_search.medical)
+        self._assert_likelihood(safe_search.violence)
+
+    def test_detect_safe_search_content(self):
+        client = Config.CLIENT
+        with open(FACE_FILE, 'rb') as image_file:
+            image = client.image(content=image_file.read())
+        safe_search = image.detect_safe_search()
+        self._assert_safe_search(safe_search)
+
+    def test_detect_safe_search_gcs(self):
+        bucket_name = Config.TEST_BUCKET.name
+        blob_name = 'faces.jpg'
+        blob = Config.TEST_BUCKET.blob(blob_name)
+        self.to_delete_by_case.append(blob)  # Clean-up.
+        with open(FACE_FILE, 'rb') as file_obj:
+            blob.upload_from_file(file_obj)
+
+        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
+
+        client = Config.CLIENT
+        image = client.image(source_uri=source_uri)
+        safe_search = image.detect_safe_search()
+        self._assert_safe_search(safe_search)
+
+    def test_detect_safe_search_filename(self):
+        client = Config.CLIENT
+        image = client.image(filename=FACE_FILE)
+        safe_search = image.detect_safe_search()
+        self._assert_safe_search(safe_search)
+
+
+class TestVisionClientText(unittest.TestCase):
+    DESCRIPTIONS = (
+        'Do',
+        'what',
+        'is',
+        'right,',
+        'not',
+        'what',
+        'is',
+        'easy',
+        'Do what is\nright, not\nwhat is easy\n',
+    )
+
+    def setUp(self):
+        self.to_delete_by_case = []
+
+    def tearDown(self):
+        for value in self.to_delete_by_case:
+            value.delete()
+
+    def _assert_text(self, text):
+        self.assertIsInstance(text, EntityAnnotation)
+        self.assertIn(text.description, self.DESCRIPTIONS)
+        self.assertIn(text.locale, (None, '', 'en'))
+        self.assertIsInstance(text.score, (type(None), float))
+
+    def test_detect_text_content(self):
+        client = Config.CLIENT
+        with open(TEXT_FILE, 'rb') as image_file:
+            image = client.image(content=image_file.read())
+        texts = image.detect_text()
+        self.assertEqual(len(texts), 9)
+        for text in texts:
+            self._assert_text(text)
+
+    def test_detect_text_gcs(self):
+        bucket_name = Config.TEST_BUCKET.name
+        blob_name = 'text.jpg'
+        blob = Config.TEST_BUCKET.blob(blob_name)
+        self.to_delete_by_case.append(blob)  # Clean-up.
+        with open(TEXT_FILE, 'rb') as file_obj:
+            blob.upload_from_file(file_obj)
+
+        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
+
+        client = Config.CLIENT
+        image = client.image(source_uri=source_uri)
+        texts = image.detect_text()
+        self.assertEqual(len(texts), 9)
+        for text in texts:
+            self._assert_text(text)
+
+    def test_detect_text_filename(self):
+        client = Config.CLIENT
+        image = client.image(filename=TEXT_FILE)
+        texts = image.detect_text()
+        self.assertEqual(len(texts), 9)
+        for text in texts:
+            self._assert_text(text)
+
+
+class TestVisionClientImageProperties(BaseVisionTestCase):
+    def setUp(self):
+        self.to_delete_by_case = []
+
+    def tearDown(self):
+        for value in self.to_delete_by_case:
+            value.delete()
+
+    def _assert_color(self, color):
+        self.assertIsInstance(color.red, float)
+        self.assertIsInstance(color.green, float)
+        self.assertIsInstance(color.blue, float)
+        self.assertIsInstance(color.alpha, float)
+        self.assertNotEqual(color.red, 0.0)
+        self.assertNotEqual(color.green, 0.0)
+        self.assertNotEqual(color.blue, 0.0)
+
+    def _assert_properties(self, image_property):
+        from google.cloud.vision.color import ImagePropertiesAnnotation
+
+        self.assertIsInstance(image_property, ImagePropertiesAnnotation)
+        results = image_property.colors
+        for color_info in results:
+            self._assert_color(color_info.color)
+            self.assertNotEqual(color_info.pixel_fraction, 0.0)
+            self.assertNotEqual(color_info.score, 0.0)
+
+    def test_detect_properties_content(self):
+        client = Config.CLIENT
+        with open(FACE_FILE, 'rb') as image_file:
+            image = client.image(content=image_file.read())
+        properties = image.detect_properties()
+        self._assert_properties(properties)
+
+    def test_detect_properties_gcs(self):
+        client = Config.CLIENT
+        bucket_name = Config.TEST_BUCKET.name
+        blob_name = 'faces.jpg'
+        blob = Config.TEST_BUCKET.blob(blob_name)
+        self.to_delete_by_case.append(blob)  # Clean-up.
+        with open(FACE_FILE, 'rb') as file_obj:
+            blob.upload_from_file(file_obj)
+
+        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
+
+        image = client.image(source_uri=source_uri)
+        properties = image.detect_properties()
+        self._assert_properties(properties)
+
+    def test_detect_properties_filename(self):
+        client = Config.CLIENT
+        image = client.image(filename=FACE_FILE)
+        properties = image.detect_properties()
+        self._assert_properties(properties)
+
+
+class TestVisionBatchProcessing(BaseVisionTestCase):
+    def setUp(self):
+        self.to_delete_by_case = []
+
+    def tearDown(self):
+        for value in self.to_delete_by_case:
+            value.delete()
+
+    def test_batch_detect_gcs(self):
+        client = Config.CLIENT
+        bucket_name = Config.TEST_BUCKET.name
+
+        # Logo GCS image.
+        blob_name = 'logos.jpg'
+        blob = Config.TEST_BUCKET.blob(blob_name)
+        self.to_delete_by_case.append(blob)  # Clean-up.
+        with open(LOGO_FILE, 'rb') as file_obj:
+            blob.upload_from_file(file_obj)
+
+        logo_source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
+
+        image_one = client.image(source_uri=logo_source_uri)
+        logo_feature = Feature(FeatureTypes.LOGO_DETECTION, 2)
+
+        # Faces GCS image.
+        blob_name = 'faces.jpg'
+        blob = Config.TEST_BUCKET.blob(blob_name)
+        self.to_delete_by_case.append(blob)  # Clean-up.
+        with open(FACE_FILE, 'rb') as file_obj:
+            blob.upload_from_file(file_obj)
+
+        face_source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
+
+        image_two = client.image(source_uri=face_source_uri)
+        face_feature = Feature(FeatureTypes.FACE_DETECTION, 2)
+
+        batch = client.batch()
+        batch.add_image(image_one, [logo_feature])
+        batch.add_image(image_two, [face_feature, logo_feature])
+        results = batch.detect()
+        self.assertEqual(len(results), 2)
+        self.assertIsInstance(results[0], vision.annotations.Annotations)
+        self.assertIsInstance(results[1], vision.annotations.Annotations)
+        self.assertEqual(len(results[0].logos), 1)
+        self.assertEqual(len(results[0].faces), 0)
+
+        self.assertEqual(len(results[1].logos), 0)
+        self.assertEqual(len(results[1].faces), 2)
+
+
+class TestVisionWebAnnotation(BaseVisionTestCase):
+    def setUp(self):
+        self.to_delete_by_case = []
+
+    def tearDown(self):
+        for value in self.to_delete_by_case:
+            value.delete()
+
+    def _assert_web_entity(self, web_entity):
+        from google.cloud.vision.web import WebEntity
+
+        self.assertIsInstance(web_entity, WebEntity)
+        self.assertIsInstance(web_entity.entity_id, six.text_type)
+        self.assertIsInstance(web_entity.score, float)
+        self.assertIsInstance(web_entity.description, six.text_type)
+
+    def _assert_web_image(self, web_image):
+        from google.cloud.vision.web import WebImage
+
+        self.assertIsInstance(web_image, WebImage)
+        self.assertIsInstance(web_image.url, six.text_type)
+        self.assertIsInstance(web_image.score, float)
+
+    def _assert_web_page(self, web_page):
+        from google.cloud.vision.web import WebPage
+
+        self.assertIsInstance(web_page, WebPage)
+        self.assertIsInstance(web_page.url, six.text_type)
+        self.assertIsInstance(web_page.score, float)
+
+    def _assert_web_images(self, web_images, limit):
+        self.assertEqual(len(web_images.web_entities), limit)
+        for web_entity in web_images.web_entities:
+            self._assert_web_entity(web_entity)
+
+        self.assertEqual(len(web_images.full_matching_images), limit)
+        for web_image in web_images.full_matching_images:
+            self._assert_web_image(web_image)
+
+        self.assertEqual(len(web_images.partial_matching_images), limit)
+        for web_image in web_images.partial_matching_images:
+            self._assert_web_image(web_image)
+
+        self.assertEqual(len(web_images.pages_with_matching_images), limit)
+        for web_page in web_images.pages_with_matching_images:
+            self._assert_web_page(web_page)
+
+    @RetryErrors(unittest.TestCase.failureException)
+    def test_detect_web_images_from_content(self):
+        client = Config.CLIENT
+        with open(LANDMARK_FILE, 'rb') as image_file:
+            image = client.image(content=image_file.read())
+        limit = 3
+        web_images = image.detect_web(limit=limit)
+        self._assert_web_images(web_images, limit)
+
+    def test_detect_web_images_from_gcs(self):
+        client = Config.CLIENT
+        bucket_name = Config.TEST_BUCKET.name
+        blob_name = 'landmark.jpg'
+        blob = Config.TEST_BUCKET.blob(blob_name)
+        self.to_delete_by_case.append(blob)  # Clean-up.
+        with open(LANDMARK_FILE, 'rb') as file_obj:
+            blob.upload_from_file(file_obj)
+
+        source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
+
+        image = client.image(source_uri=source_uri)
+        limit = 5
+        web_images = image.detect_web(limit=limit)
+        self._assert_web_images(web_images, limit)
+
+    def test_detect_web_images_from_filename(self):
+        client = Config.CLIENT
+        image = client.image(filename=LANDMARK_FILE)
+        limit = 5
+        web_images = image.detect_web(limit=limit)
+        self._assert_web_images(web_images, limit)
diff --git a/vision/tests/unit/__init__.py b/vision/tests/unit/__init__.py
index 58e0d91536321..e69de29bb2d1d 100644
--- a/vision/tests/unit/__init__.py
+++ b/vision/tests/unit/__init__.py
@@ -1,13 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
diff --git a/vision/tests/unit/test_decorators.py b/vision/tests/unit/test_decorators.py
new file mode 100644
index 0000000000000..8ef86b71ec612
--- /dev/null
+++ b/vision/tests/unit/test_decorators.py
@@ -0,0 +1,69 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+import unittest
+
+import mock
+
+from google.auth.credentials import Credentials
+from google.cloud import vision
+
+
+class DecoratorTests(unittest.TestCase):
+    def test_noop_without_enums(self):
+        class A(object):
+            pass
+        APrime = vision.decorators.add_single_feature_methods(A)
+
+        # It should be the same class object.
+        assert A is APrime
+
+        # Nothing should have been added.
+        assert not hasattr(A, 'face_detection')
+        assert not hasattr(A, 'logo_detection')
+
+    def test_with_enums(self):
+        class A(object):
+            enums = vision.enums
+
+        # There should not be detection methods yet.
+        assert not hasattr(A, 'face_detection')
+
+        # Add the detection methods.
+        APrime = vision.decorators.add_single_feature_methods(A)
+        assert A is APrime
+
+        # There should be detection methods now.
+        assert hasattr(A, 'face_detection')
+        assert callable(A.face_detection)
+
+
+class SingleFeatureMethodTests(unittest.TestCase):
+    @mock.patch.object(vision.ImageAnnotatorClient, 'annotate_image')
+    def test_runs_generic_single_image(self, ai):
+        ai.return_value = vision.types.AnnotateImageResponse()
+
+        # Make a face detection request.
+        client = vision.ImageAnnotatorClient(
+            credentials=mock.Mock(spec=Credentials),
+        )
+        image = {'source': {'image_uri': 'gs://my-test-bucket/image.jpg'}}
+        response = client.face_detection(image)
+
+        # Assert that the single-image method was called as expected.
+        ai.assert_called_once_with({
+            'features': [{'type': vision.enums.Feature.Type.FACE_DETECTION}],
+            'image': image,
+        }, options=None)
diff --git a/vision/tests/unit/test_helpers.py b/vision/tests/unit/test_helpers.py
new file mode 100644
index 0000000000000..d8e2694e7b534
--- /dev/null
+++ b/vision/tests/unit/test_helpers.py
@@ -0,0 +1,136 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+import io
+import unittest
+
+import mock
+
+from google.auth.credentials import Credentials
+
+from google.cloud.vision_v1 import ImageAnnotatorClient
+from google.cloud.vision_v1 import types
+
+
+
+class TestSingleImageHelper(unittest.TestCase):
+    def setUp(self):
+        credentials = mock.Mock(spec=Credentials)
+        self.client = ImageAnnotatorClient(credentials=credentials)
+
+    @mock.patch.object(ImageAnnotatorClient, 'batch_annotate_images')
+    def test_all_features_default(self, batch_annotate):
+        # Set up an image annotation request with no features.
+        image = types.Image(source={
+            'image_uri': 'http://foo.com/img.jpg',
+        })
+        request = types.AnnotateImageRequest(image=image)
+        assert not request.features
+
+        # Perform the single image request.
+        self.client.annotate_image(request)
+
+        # Evalute the argument sent to batch_annotate_images.
+        assert batch_annotate.call_count == 1
+        _, args, kwargs = batch_annotate.mock_calls[0]
+
+        # Only a single request object should be sent.
+        assert len(args[0]) == 1
+
+        # Evalute the request object to ensure it looks correct.
+        request_sent = args[0][0]
+        all_features = self.client._get_all_features()
+        assert request_sent.image is request.image
+        assert len(request_sent.features) == len(all_features)
+
+    @mock.patch.object(ImageAnnotatorClient, 'batch_annotate_images')
+    def test_explicit_features(self, batch_annotate):
+        # Set up an image annotation request with no features.
+        image = types.Image(source={
+            'image_uri': 'http://foo.com/img.jpg',
+        })
+        request = types.AnnotateImageRequest(
+            image=image,
+            features=[
+                types.Feature(type=1),
+                types.Feature(type=2),
+                types.Feature(type=3),
+            ],
+        )
+
+        # Perform the single image request.
+        self.client.annotate_image(request)
+
+        # Evalute the argument sent to batch_annotate_images.
+        assert batch_annotate.call_count == 1
+        _, args, kwargs = batch_annotate.mock_calls[0]
+
+        # Only a single request object should be sent.
+        assert len(args[0]) == 1
+
+        # Evalute the request object to ensure it looks correct.
+        request_sent = args[0][0]
+        assert request_sent.image is request.image
+        assert len(request_sent.features) == 3
+        for feature, i in zip(request_sent.features, range(1, 4)):
+            assert feature.type == i
+            assert feature.max_results == 0
+
+    @mock.patch.object(ImageAnnotatorClient, 'batch_annotate_images')
+    def test_image_file_handler(self, batch_annotate):
+        # Set up a file handler.
+        file_ = io.BytesIO(b'bogus==')
+
+        # Perform the single image request.
+        self.client.annotate_image({'image': file_})
+
+        # Evaluate the argument sent to batch_annotate_images.
+        assert batch_annotate.call_count == 1
+        _, args, kwargs = batch_annotate.mock_calls[0]
+
+        # Only a single request object should be sent.
+        assert len(args[0]) == 1
+
+        # Evalute the request object to ensure it looks correct.
+        request_sent = args[0][0]
+        assert request_sent['image']['content'] == b'bogus=='
+
+    @mock.patch.object(ImageAnnotatorClient, 'batch_annotate_images')
+    @mock.patch.object(io, 'open')
+    def test_image_filename(self, io_open, batch_annotate):
+        # Make io.open send back a mock with a read method.
+        file_ = mock.MagicMock(spec=io.BytesIO)
+        io_open.return_value = file_
+        file_.__enter__.return_value = file_
+        file_.read.return_value = b'imagefile=='
+
+        # Perform the single image request using a filename.
+        self.client.annotate_image(
+            {'image': {'source': {'filename': 'image.jpeg'}}},
+        )
+
+        # Establish that my file was opened.
+        io_open.assert_called_once_with('image.jpeg', 'rb')
+
+        # Evalute the argument sent to batch_annotate_images.
+        assert batch_annotate.call_count == 1
+        _, args, kwargs = batch_annotate.mock_calls[0]
+
+        # Only a single request object should be sent.
+        assert len(args[0]) == 1
+
+        # Evalute the request object to ensure it looks correct.
+        request_sent = args[0][0]
+        assert request_sent['image']['content'] == b'imagefile=='

From 38bdb440a13911b4185c92ec62d7e24fd441a4ac Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Fri, 2 Jun 2017 14:44:17 -0700
Subject: [PATCH 008/211] Reloading BigQuery table in system test before
 fetching data. (#3468)

e.g. https://circleci.com/gh/GoogleCloudPlatform/google-cloud-python/2065

Error introduced in #3426.
---
 bigquery/tests/system.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bigquery/tests/system.py b/bigquery/tests/system.py
index 86e376a2ccb1f..210951305b443 100644
--- a/bigquery/tests/system.py
+++ b/bigquery/tests/system.py
@@ -826,6 +826,8 @@ def test_dump_table_w_public_data(self):
 
         dataset = Config.CLIENT.dataset(DATASET_NAME, project=PUBLIC)
         table = dataset.table(TABLE_NAME)
+        # Reload table to get the schema before fetching the rows.
+        table.reload()
         self._fetch_single_page(table)
 
     def test_insert_nested_nested(self):

From af1fd7e7cecb80d9db2279ac5d43067cbb09900c Mon Sep 17 00:00:00 2001
From: Angela Li <yanhuil@google.com>
Date: Fri, 2 Jun 2017 15:24:02 -0700
Subject: [PATCH 009/211] Send trace context with logs from web applications
 (#3448)

---
 .../google/cloud/logging/handlers/_helpers.py |  66 +++++++
 .../cloud/logging/handlers/app_engine.py      |  23 ++-
 .../google/cloud/logging/handlers/handlers.py |  13 +-
 .../logging/handlers/middleware/__init__.py   |  17 ++
 .../logging/handlers/middleware/request.py    |  45 +++++
 .../handlers/transports/background_thread.py  |  13 +-
 .../cloud/logging/handlers/transports/base.py |   5 +-
 .../cloud/logging/handlers/transports/sync.py |  11 +-
 logging/nox.py                                |   4 +-
 .../unit/handlers/middleware/test_request.py  |  86 +++++++++
 logging/tests/unit/handlers/test__helpers.py  | 171 ++++++++++++++++++
 .../tests/unit/handlers/test_app_engine.py    |  48 ++++-
 logging/tests/unit/handlers/test_handlers.py  |   8 +-
 .../transports/test_background_thread.py      |   9 +-
 .../unit/handlers/transports/test_sync.py     |   7 +-
 15 files changed, 499 insertions(+), 27 deletions(-)
 create mode 100644 logging/google/cloud/logging/handlers/middleware/__init__.py
 create mode 100644 logging/google/cloud/logging/handlers/middleware/request.py
 create mode 100644 logging/tests/unit/handlers/middleware/test_request.py
 create mode 100644 logging/tests/unit/handlers/test__helpers.py

diff --git a/logging/google/cloud/logging/handlers/_helpers.py b/logging/google/cloud/logging/handlers/_helpers.py
index 81adcf0eb5454..1ebb064ed228a 100644
--- a/logging/google/cloud/logging/handlers/_helpers.py
+++ b/logging/google/cloud/logging/handlers/_helpers.py
@@ -17,6 +17,17 @@
 import math
 import json
 
+try:
+    import flask
+except ImportError:  # pragma: NO COVER
+    flask = None
+
+from google.cloud.logging.handlers.middleware.request import (
+    _get_django_request)
+
+_FLASK_TRACE_HEADER = 'X_CLOUD_TRACE_CONTEXT'
+_DJANGO_TRACE_HEADER = 'HTTP_X_CLOUD_TRACE_CONTEXT'
+
 
 def format_stackdriver_json(record, message):
     """Helper to format a LogRecord in in Stackdriver fluentd format.
@@ -37,3 +48,58 @@ def format_stackdriver_json(record, message):
     }
 
     return json.dumps(payload)
+
+
+def get_trace_id_from_flask():
+    """Get trace_id from flask request headers.
+
+    :rtype: str
+    :return: Trace_id in HTTP request headers.
+    """
+    if flask is None or not flask.request:
+        return None
+
+    header = flask.request.headers.get(_FLASK_TRACE_HEADER)
+
+    if header is None:
+        return None
+
+    trace_id = header.split('/', 1)[0]
+
+    return trace_id
+
+
+def get_trace_id_from_django():
+    """Get trace_id from django request headers.
+
+    :rtype: str
+    :return: Trace_id in HTTP request headers.
+    """
+    request = _get_django_request()
+
+    if request is None:
+        return None
+
+    header = request.META.get(_DJANGO_TRACE_HEADER)
+    if header is None:
+        return None
+
+    trace_id = header.split('/', 1)[0]
+
+    return trace_id
+
+
+def get_trace_id():
+    """Helper to get trace_id from web application request header.
+
+    :rtype: str
+    :returns: Trace_id in HTTP request headers.
+    """
+    checkers = (get_trace_id_from_django, get_trace_id_from_flask)
+
+    for checker in checkers:
+        trace_id = checker()
+        if trace_id is not None:
+            return trace_id
+
+    return None
diff --git a/logging/google/cloud/logging/handlers/app_engine.py b/logging/google/cloud/logging/handlers/app_engine.py
index 7011819f8a2fe..509bf8002fb14 100644
--- a/logging/google/cloud/logging/handlers/app_engine.py
+++ b/logging/google/cloud/logging/handlers/app_engine.py
@@ -20,6 +20,7 @@
 
 import os
 
+from google.cloud.logging.handlers._helpers import get_trace_id
 from google.cloud.logging.handlers.handlers import CloudLoggingHandler
 from google.cloud.logging.handlers.transports import BackgroundThreadTransport
 from google.cloud.logging.resource import Resource
@@ -30,6 +31,8 @@
 _GAE_SERVICE_ENV = 'GAE_SERVICE'
 _GAE_VERSION_ENV = 'GAE_VERSION'
 
+_TRACE_ID_LABEL = 'appengine.googleapis.com/trace_id'
+
 
 class AppEngineHandler(CloudLoggingHandler):
     """A logging handler that sends App Engine-formatted logs to Stackdriver.
@@ -50,7 +53,8 @@ def __init__(self, client,
             client,
             name=_DEFAULT_GAE_LOGGER_NAME,
             transport=transport,
-            resource=self.get_gae_resource())
+            resource=self.get_gae_resource(),
+            labels=self.get_gae_labels())
 
     def get_gae_resource(self):
         """Return the GAE resource using the environment variables.
@@ -67,3 +71,20 @@ def get_gae_resource(self):
             },
         )
         return gae_resource
+
+    def get_gae_labels(self):
+        """Return the labels for GAE app.
+
+        If the trace ID can be detected, it will be included as a label.
+        Currently, no other labels are included.
+
+        :rtype: dict
+        :returns: Labels for GAE app.
+        """
+        gae_labels = {}
+
+        trace_id = get_trace_id()
+        if trace_id is not None:
+            gae_labels[_TRACE_ID_LABEL] = trace_id
+
+        return gae_labels
diff --git a/logging/google/cloud/logging/handlers/handlers.py b/logging/google/cloud/logging/handlers/handlers.py
index 97afde9f87fbe..fe9848848d38e 100644
--- a/logging/google/cloud/logging/handlers/handlers.py
+++ b/logging/google/cloud/logging/handlers/handlers.py
@@ -57,6 +57,9 @@ class CloudLoggingHandler(logging.StreamHandler):
     :param resource: (Optional) Monitored resource of the entry, defaults
                      to the global resource type.
 
+    :type labels: dict
+    :param labels: (Optional) Mapping of labels for the entry.
+
     Example:
 
     .. code-block:: python
@@ -79,12 +82,14 @@ class CloudLoggingHandler(logging.StreamHandler):
     def __init__(self, client,
                  name=DEFAULT_LOGGER_NAME,
                  transport=BackgroundThreadTransport,
-                 resource=_GLOBAL_RESOURCE):
+                 resource=_GLOBAL_RESOURCE,
+                 labels=None):
         super(CloudLoggingHandler, self).__init__()
         self.name = name
         self.client = client
         self.transport = transport(client, name)
         self.resource = resource
+        self.labels = labels
 
     def emit(self, record):
         """Actually log the specified logging record.
@@ -97,7 +102,11 @@ def emit(self, record):
         :param record: The record to be logged.
         """
         message = super(CloudLoggingHandler, self).format(record)
-        self.transport.send(record, message, resource=self.resource)
+        self.transport.send(
+            record,
+            message,
+            resource=self.resource,
+            labels=self.labels)
 
 
 def setup_logging(handler, excluded_loggers=EXCLUDED_LOGGER_DEFAULTS,
diff --git a/logging/google/cloud/logging/handlers/middleware/__init__.py b/logging/google/cloud/logging/handlers/middleware/__init__.py
new file mode 100644
index 0000000000000..c340235b8bdd3
--- /dev/null
+++ b/logging/google/cloud/logging/handlers/middleware/__init__.py
@@ -0,0 +1,17 @@
+# Copyright 2017 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from google.cloud.logging.handlers.middleware.request import RequestMiddleware
+
+__all__ = ['RequestMiddleware']
diff --git a/logging/google/cloud/logging/handlers/middleware/request.py b/logging/google/cloud/logging/handlers/middleware/request.py
new file mode 100644
index 0000000000000..4c0b22a8e96bf
--- /dev/null
+++ b/logging/google/cloud/logging/handlers/middleware/request.py
@@ -0,0 +1,45 @@
+# Copyright 2017 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Django middleware helper to capture a request.
+
+The request is stored on a thread-local so that it can be
+inspected by other helpers.
+"""
+
+import threading
+
+
+_thread_locals = threading.local()
+
+
+def _get_django_request():
+    """Get Django request from thread local.
+
+    :rtype: str
+    :returns: Django request.
+    """
+    return getattr(_thread_locals, 'request', None)
+
+
+class RequestMiddleware(object):
+    """Saves the request in thread local"""
+
+    def process_request(self, request):
+        """Called on each request, before Django decides which view to execute.
+
+        :type request: :class:`~django.http.request.HttpRequest`
+        :param request: Django http request.
+        """
+        _thread_locals.request = request
diff --git a/logging/google/cloud/logging/handlers/transports/background_thread.py b/logging/google/cloud/logging/handlers/transports/background_thread.py
index 010c06b36bc91..d889bed62626f 100644
--- a/logging/google/cloud/logging/handlers/transports/background_thread.py
+++ b/logging/google/cloud/logging/handlers/transports/background_thread.py
@@ -203,7 +203,7 @@ def _main_thread_terminated(self):
         else:
             print('Failed to send %d pending logs.' % (self._queue.qsize(),))
 
-    def enqueue(self, record, message, resource=None):
+    def enqueue(self, record, message, resource=None, labels=None):
         """Queues a log entry to be written by the background thread.
 
         :type record: :class:`logging.LogRecord`
@@ -215,6 +215,9 @@ def enqueue(self, record, message, resource=None):
 
         :type resource: :class:`~google.cloud.logging.resource.Resource`
         :param resource: (Optional) Monitored resource of the entry
+
+        :type labels: dict
+        :param labels: (Optional) Mapping of labels for the entry.
         """
         self._queue.put_nowait({
             'info': {
@@ -223,6 +226,7 @@ def enqueue(self, record, message, resource=None):
             },
             'severity': record.levelname,
             'resource': resource,
+            'labels': labels,
         })
 
     def flush(self):
@@ -257,7 +261,7 @@ def __init__(self, client, name, grace_period=_DEFAULT_GRACE_PERIOD,
         self.worker = _Worker(logger)
         self.worker.start()
 
-    def send(self, record, message, resource=None):
+    def send(self, record, message, resource=None, labels=None):
         """Overrides Transport.send().
 
         :type record: :class:`logging.LogRecord`
@@ -269,8 +273,11 @@ def send(self, record, message, resource=None):
 
         :type resource: :class:`~google.cloud.logging.resource.Resource`
         :param resource: (Optional) Monitored resource of the entry.
+
+        :type labels: dict
+        :param labels: (Optional) Mapping of labels for the entry.
         """
-        self.worker.enqueue(record, message, resource=resource)
+        self.worker.enqueue(record, message, resource=resource, labels=labels)
 
     def flush(self):
         """Submit any pending log records."""
diff --git a/logging/google/cloud/logging/handlers/transports/base.py b/logging/google/cloud/logging/handlers/transports/base.py
index 21957021793fc..7829201b1c98f 100644
--- a/logging/google/cloud/logging/handlers/transports/base.py
+++ b/logging/google/cloud/logging/handlers/transports/base.py
@@ -22,7 +22,7 @@ class Transport(object):
     client and name object, and must override :meth:`send`.
     """
 
-    def send(self, record, message, resource=None):
+    def send(self, record, message, resource=None, labels=None):
         """Transport send to be implemented by subclasses.
 
         :type record: :class:`logging.LogRecord`
@@ -34,6 +34,9 @@ def send(self, record, message, resource=None):
 
         :type resource: :class:`~google.cloud.logging.resource.Resource`
         :param resource: (Optional) Monitored resource of the entry.
+
+        :type labels: dict
+        :param labels: (Optional) Mapping of labels for the entry.
         """
         raise NotImplementedError
 
diff --git a/logging/google/cloud/logging/handlers/transports/sync.py b/logging/google/cloud/logging/handlers/transports/sync.py
index 0dd6e0bd7e241..be70e60a14e15 100644
--- a/logging/google/cloud/logging/handlers/transports/sync.py
+++ b/logging/google/cloud/logging/handlers/transports/sync.py
@@ -29,7 +29,7 @@ class SyncTransport(Transport):
     def __init__(self, client, name):
         self.logger = client.logger(name)
 
-    def send(self, record, message, resource=None):
+    def send(self, record, message, resource=None, labels=None):
         """Overrides transport.send().
 
         :type record: :class:`logging.LogRecord`
@@ -38,8 +38,15 @@ def send(self, record, message, resource=None):
         :type message: str
         :param message: The message from the ``LogRecord`` after being
                         formatted by the associated log formatters.
+
+        :type resource: :class:`~google.cloud.logging.resource.Resource`
+        :param resource: (Optional) Monitored resource of the entry.
+
+        :type labels: dict
+        :param labels: (Optional) Mapping of labels for the entry.
         """
         info = {'message': message, 'python_logger': record.name}
         self.logger.log_struct(info,
                                severity=record.levelname,
-                               resource=resource)
+                               resource=resource,
+                               labels=labels)
diff --git a/logging/nox.py b/logging/nox.py
index 5d4751a955a57..fbbbec1958c19 100644
--- a/logging/nox.py
+++ b/logging/nox.py
@@ -31,7 +31,9 @@ def unit_tests(session, python_version):
     session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
-    session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
+    session.install(
+        'mock', 'pytest', 'pytest-cov',
+        'flask', 'django', *LOCAL_DEPS)
     session.install('-e', '.')
 
     # Run py.test against the unit tests.
diff --git a/logging/tests/unit/handlers/middleware/test_request.py b/logging/tests/unit/handlers/middleware/test_request.py
new file mode 100644
index 0000000000000..983d67129647c
--- /dev/null
+++ b/logging/tests/unit/handlers/middleware/test_request.py
@@ -0,0 +1,86 @@
+# Copyright 2017 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import unittest
+
+import mock
+
+
+class DjangoBase(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        from django.conf import settings
+        from django.test.utils import setup_test_environment
+
+        if not settings.configured:
+            settings.configure()
+        setup_test_environment()
+
+    @classmethod
+    def tearDownClass(cls):
+        from django.test.utils import teardown_test_environment
+
+        teardown_test_environment()
+
+
+class TestRequestMiddleware(DjangoBase):
+
+    def _get_target_class(self):
+        from google.cloud.logging.handlers.middleware import request
+
+        return request.RequestMiddleware
+
+    def _make_one(self, *args, **kw):
+        return self._get_target_class()(*args, **kw)
+
+    def test_process_request(self):
+        from django.test import RequestFactory
+        from google.cloud.logging.handlers.middleware import request
+
+        middleware = self._make_one()
+        mock_request = RequestFactory().get('/')
+        middleware.process_request(mock_request)
+
+        django_request = request._get_django_request()
+        self.assertEqual(django_request, mock_request)
+
+
+class Test__get_django_request(DjangoBase):
+
+    @staticmethod
+    def _call_fut():
+        from google.cloud.logging.handlers.middleware import request
+
+        return request._get_django_request()
+
+    @staticmethod
+    def _make_patch(new_locals):
+        return mock.patch(
+            'google.cloud.logging.handlers.middleware.request._thread_locals',
+            new=new_locals)
+
+    def test_with_request(self):
+        thread_locals = mock.Mock(spec=['request'])
+        with self._make_patch(thread_locals):
+            django_request = self._call_fut()
+
+        self.assertIs(django_request, thread_locals.request)
+
+    def test_without_request(self):
+        thread_locals = mock.Mock(spec=[])
+        with self._make_patch(thread_locals):
+            django_request = self._call_fut()
+
+        self.assertIsNone(django_request)
diff --git a/logging/tests/unit/handlers/test__helpers.py b/logging/tests/unit/handlers/test__helpers.py
new file mode 100644
index 0000000000000..0731c825d32cc
--- /dev/null
+++ b/logging/tests/unit/handlers/test__helpers.py
@@ -0,0 +1,171 @@
+# Copyright 2017 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import unittest
+
+import mock
+
+
+class Test_get_trace_id_from_flask(unittest.TestCase):
+
+    @staticmethod
+    def _call_fut():
+        from google.cloud.logging.handlers import _helpers
+
+        return _helpers.get_trace_id_from_flask()
+
+    @staticmethod
+    def create_app():
+        import flask
+
+        app = flask.Flask(__name__)
+
+        @app.route('/')
+        def index():
+            return 'test flask trace'  # pragma: NO COVER
+
+        return app
+
+    def setUp(self):
+        self.app = self.create_app()
+
+    def test_no_context_header(self):
+        with self.app.test_request_context(
+                path='/',
+                headers={}):
+            trace_id = self._call_fut()
+
+        self.assertIsNone(trace_id)
+
+    def test_valid_context_header(self):
+        flask_trace_header = 'X_CLOUD_TRACE_CONTEXT'
+        expected_trace_id = 'testtraceidflask'
+        flask_trace_id = expected_trace_id + '/testspanid'
+
+        context = self.app.test_request_context(
+            path='/',
+            headers={flask_trace_header: flask_trace_id})
+
+        with context:
+            trace_id = self._call_fut()
+
+        self.assertEqual(trace_id, expected_trace_id)
+
+
+class Test_get_trace_id_from_django(unittest.TestCase):
+
+    @staticmethod
+    def _call_fut():
+        from google.cloud.logging.handlers import _helpers
+
+        return _helpers.get_trace_id_from_django()
+
+    def setUp(self):
+        from django.conf import settings
+        from django.test.utils import setup_test_environment
+
+        if not settings.configured:
+            settings.configure()
+        setup_test_environment()
+
+    def tearDown(self):
+        from django.test.utils import teardown_test_environment
+        from google.cloud.logging.handlers.middleware import request
+
+        teardown_test_environment()
+        request._thread_locals.__dict__.clear()
+
+    def test_no_context_header(self):
+        from django.test import RequestFactory
+        from google.cloud.logging.handlers.middleware import request
+
+        django_request = RequestFactory().get('/')
+
+        middleware = request.RequestMiddleware()
+        middleware.process_request(django_request)
+        trace_id = self._call_fut()
+        self.assertIsNone(trace_id)
+
+    def test_valid_context_header(self):
+        from django.test import RequestFactory
+        from google.cloud.logging.handlers.middleware import request
+
+        django_trace_header = 'HTTP_X_CLOUD_TRACE_CONTEXT'
+        expected_trace_id = 'testtraceiddjango'
+        django_trace_id = expected_trace_id + '/testspanid'
+
+        django_request = RequestFactory().get(
+            '/',
+            **{django_trace_header: django_trace_id})
+
+        middleware = request.RequestMiddleware()
+        middleware.process_request(django_request)
+        trace_id = self._call_fut()
+
+        self.assertEqual(trace_id, expected_trace_id)
+
+
+class Test_get_trace_id(unittest.TestCase):
+
+    @staticmethod
+    def _call_fut():
+        from google.cloud.logging.handlers import _helpers
+
+        return _helpers.get_trace_id()
+
+    def _helper(self, django_return, flask_return):
+        django_patch = mock.patch(
+            'google.cloud.logging.handlers._helpers.get_trace_id_from_django',
+            return_value=django_return)
+        flask_patch = mock.patch(
+            'google.cloud.logging.handlers._helpers.get_trace_id_from_flask',
+            return_value=flask_return)
+
+        with django_patch as django_mock:
+            with flask_patch as flask_mock:
+                trace_id = self._call_fut()
+
+        return django_mock, flask_mock, trace_id
+
+    def test_from_django(self):
+        django_mock, flask_mock, trace_id = self._helper(
+            'test-django-trace-id', None)
+        self.assertEqual(trace_id, django_mock.return_value)
+
+        django_mock.assert_called_once_with()
+        flask_mock.assert_not_called()
+
+    def test_from_flask(self):
+        django_mock, flask_mock, trace_id = self._helper(
+            None, 'test-flask-trace-id')
+        self.assertEqual(trace_id, flask_mock.return_value)
+
+        django_mock.assert_called_once_with()
+        flask_mock.assert_called_once_with()
+
+    def test_from_django_and_flask(self):
+        django_mock, flask_mock, trace_id = self._helper(
+            'test-django-trace-id', 'test-flask-trace-id')
+        # Django wins.
+        self.assertEqual(trace_id, django_mock.return_value)
+
+        django_mock.assert_called_once_with()
+        flask_mock.assert_not_called()
+
+    def test_missing(self):
+        django_mock, flask_mock, trace_id = self._helper(None, None)
+        self.assertIsNone(trace_id)
+
+        django_mock.assert_called_once_with()
+        flask_mock.assert_called_once_with()
diff --git a/logging/tests/unit/handlers/test_app_engine.py b/logging/tests/unit/handlers/test_app_engine.py
index c39328593f7a5..6438c4abb8a0d 100644
--- a/logging/tests/unit/handlers/test_app_engine.py
+++ b/logging/tests/unit/handlers/test_app_engine.py
@@ -15,8 +15,10 @@
 import logging
 import unittest
 
+import mock
 
-class TestAppEngineHandlerHandler(unittest.TestCase):
+
+class TestAppEngineHandler(unittest.TestCase):
     PROJECT = 'PROJECT'
 
     def _get_target_class(self):
@@ -28,12 +30,13 @@ def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
     def test_constructor(self):
-        import mock
         from google.cloud.logging.handlers.app_engine import _GAE_PROJECT_ENV
         from google.cloud.logging.handlers.app_engine import _GAE_SERVICE_ENV
         from google.cloud.logging.handlers.app_engine import _GAE_VERSION_ENV
+        from google.cloud.logging.handlers.app_engine import _TRACE_ID_LABEL
 
         client = mock.Mock(project=self.PROJECT, spec=['project'])
+
         with mock.patch('os.environ', new={_GAE_PROJECT_ENV: 'test_project',
                                            _GAE_SERVICE_ENV: 'test_service',
                                            _GAE_VERSION_ENV: 'test_version'}):
@@ -43,13 +46,13 @@ def test_constructor(self):
         self.assertEqual(handler.resource.labels['project_id'], 'test_project')
         self.assertEqual(handler.resource.labels['module_id'], 'test_service')
         self.assertEqual(handler.resource.labels['version_id'], 'test_version')
+        self.assertEqual(handler.labels, {})
 
     def test_emit(self):
-        import mock
-
         client = mock.Mock(project=self.PROJECT, spec=['project'])
         handler = self._make_one(client, transport=_Transport)
         gae_resource = handler.get_gae_resource()
+        gae_labels = handler.get_gae_labels()
         logname = 'app'
         message = 'hello world'
         record = logging.LogRecord(logname, logging, None, None, message,
@@ -58,7 +61,38 @@ def test_emit(self):
 
         self.assertIs(handler.transport.client, client)
         self.assertEqual(handler.transport.name, logname)
-        self.assertEqual(handler.transport.send_called_with, (record, message, gae_resource))
+        self.assertEqual(
+            handler.transport.send_called_with,
+            (record, message, gae_resource, gae_labels))
+
+    def _get_gae_labels_helper(self, trace_id):
+        get_trace_patch = mock.patch(
+            'google.cloud.logging.handlers.app_engine.get_trace_id',
+            return_value=trace_id)
+
+        client = mock.Mock(project=self.PROJECT, spec=['project'])
+        # The handler actually calls ``get_gae_labels()``.
+        with get_trace_patch as mock_get_trace:
+            handler = self._make_one(client, transport=_Transport)
+            mock_get_trace.assert_called_once_with()
+
+            gae_labels = handler.get_gae_labels()
+            self.assertEqual(mock_get_trace.mock_calls,
+                             [mock.call(), mock.call()])
+
+        return gae_labels
+
+    def test_get_gae_labels_with_label(self):
+        from google.cloud.logging.handlers import app_engine
+
+        trace_id = 'test-gae-trace-id'
+        gae_labels = self._get_gae_labels_helper(trace_id)
+        expected_labels = {app_engine._TRACE_ID_LABEL: trace_id}
+        self.assertEqual(gae_labels, expected_labels)
+
+    def test_get_gae_labels_without_label(self):
+        gae_labels = self._get_gae_labels_helper(None)
+        self.assertEqual(gae_labels, {})
 
 
 class _Transport(object):
@@ -67,5 +101,5 @@ def __init__(self, client, name):
         self.client = client
         self.name = name
 
-    def send(self, record, message, resource):
-        self.send_called_with = (record, message, resource)
+    def send(self, record, message, resource, labels):
+        self.send_called_with = (record, message, resource, labels)
diff --git a/logging/tests/unit/handlers/test_handlers.py b/logging/tests/unit/handlers/test_handlers.py
index 05dc876314783..96823b2e906dc 100644
--- a/logging/tests/unit/handlers/test_handlers.py
+++ b/logging/tests/unit/handlers/test_handlers.py
@@ -45,7 +45,9 @@ def test_emit(self):
                                    None, None)
         handler.emit(record)
 
-        self.assertEqual(handler.transport.send_called_with, (record, message, _GLOBAL_RESOURCE))
+        self.assertEqual(
+            handler.transport.send_called_with,
+            (record, message, _GLOBAL_RESOURCE, None))
 
 
 class TestSetupLogging(unittest.TestCase):
@@ -110,5 +112,5 @@ class _Transport(object):
     def __init__(self, client, name):
         pass
 
-    def send(self, record, message, resource):
-        self.send_called_with = (record, message, resource)
+    def send(self, record, message, resource, labels=None):
+        self.send_called_with = (record, message, resource, labels)
diff --git a/logging/tests/unit/handlers/transports/test_background_thread.py b/logging/tests/unit/handlers/transports/test_background_thread.py
index 3e3378dcd3616..f6671273b53d1 100644
--- a/logging/tests/unit/handlers/transports/test_background_thread.py
+++ b/logging/tests/unit/handlers/transports/test_background_thread.py
@@ -61,9 +61,10 @@ def test_send(self):
             python_logger_name, logging.INFO,
             None, None, message, None, None)
 
-        transport.send(record, message, _GLOBAL_RESOURCE)
+        transport.send(record, message, _GLOBAL_RESOURCE, None)
 
-        transport.worker.enqueue.assert_called_once_with(record, message, _GLOBAL_RESOURCE)
+        transport.worker.enqueue.assert_called_once_with(
+            record, message, _GLOBAL_RESOURCE, None)
 
     def test_flush(self):
         client = _Client(self.PROJECT)
@@ -287,13 +288,13 @@ def __init__(self):
         self.commit_called = False
         self.commit_count = None
 
-    def log_struct(self, info, severity=logging.INFO, resource=None):
+    def log_struct(self, info, severity=logging.INFO, resource=None, labels=None):
         from google.cloud.logging.logger import _GLOBAL_RESOURCE
 
         assert resource is None
         resource = _GLOBAL_RESOURCE
 
-        self.log_struct_called_with = (info, severity, resource)
+        self.log_struct_called_with = (info, severity, resource, labels)
         self.entries.append(info)
 
     def commit(self):
diff --git a/logging/tests/unit/handlers/transports/test_sync.py b/logging/tests/unit/handlers/transports/test_sync.py
index 475ecc9c6a71b..01c15240f3b7d 100644
--- a/logging/tests/unit/handlers/transports/test_sync.py
+++ b/logging/tests/unit/handlers/transports/test_sync.py
@@ -52,7 +52,7 @@ def test_send(self):
             'message': message,
             'python_logger': python_logger_name,
         }
-        EXPECTED_SENT = (EXPECTED_STRUCT, 'INFO', _GLOBAL_RESOURCE)
+        EXPECTED_SENT = (EXPECTED_STRUCT, 'INFO', _GLOBAL_RESOURCE, None)
         self.assertEqual(
             transport.logger.log_struct_called_with, EXPECTED_SENT)
 
@@ -63,8 +63,9 @@ class _Logger(object):
     def __init__(self, name):
         self.name = name
 
-    def log_struct(self, message, severity=None, resource=_GLOBAL_RESOURCE):
-        self.log_struct_called_with = (message, severity, resource)
+    def log_struct(self, message, severity=None,
+                   resource=_GLOBAL_RESOURCE, labels=None):
+        self.log_struct_called_with = (message, severity, resource, labels)
 
 
 class _Client(object):

From b0abcb295fde5bbab3b2f5793c8d5a8465113364 Mon Sep 17 00:00:00 2001
From: Daniel Valdivia <hola@danielvaldivia.com>
Date: Mon, 5 Jun 2017 11:07:00 -0700
Subject: [PATCH 010/211] Add Part Of Speech missing data to Token (#3457)

Add support for all the data returned by the API for PartOfSpeech inside Token.
---
 language/google/cloud/language/syntax.py  |  95 +++++++++++++-
 language/tests/unit/test_api_responses.py |  39 +++++-
 language/tests/unit/test_document.py      |  67 +++++++++-
 language/tests/unit/test_syntax.py        | 151 ++++++++++++++++++++--
 4 files changed, 327 insertions(+), 25 deletions(-)

diff --git a/language/google/cloud/language/syntax.py b/language/google/cloud/language/syntax.py
index 9bad2116b3320..037a6a74f2984 100644
--- a/language/google/cloud/language/syntax.py
+++ b/language/google/cloud/language/syntax.py
@@ -20,7 +20,62 @@
 
 
 class PartOfSpeech(object):
-    """Part of speech of a :class:`Token`."""
+    """A Google Cloud Natural Language API Part of speech object.
+
+    These are the grammatical categories of the matched token in
+    the sentence. https://cloud.google.com/natural-language/docs\
+    /reference/rest/v1/Token#PartOfSpeech
+
+    :type aspect: str
+    :param aspect: The grammatical aspect. https://cloud.google\
+                   .com/natural-language/docs/reference/rest/v1/\
+                   Token#Aspect
+
+    :type reciprocity: str
+    :param reciprocity: The grammatical reciprocity. https://\
+                        cloud.google.com/natural-language/docs/reference\
+                        /rest/v1/Token#Reciprocity
+
+    :type case: str
+    :param case: The grammatical case. https://cloud.google.com/\
+                 natural-language/docs/reference/rest/v1/Token#Case
+
+    :type mood: str
+    :param mood: The grammatical mood. https://cloud.google.com/\
+                 natural-language/docs/reference/rest/v1/Token#Mood
+
+    :type tag: str
+    :param tag: The part of speech tag. https://cloud.google.com/natural\
+                -language/docs/reference/rest/v1/Token#Tag
+
+    :type person: str
+    :param person: The grammatical person. https://cloud.google.com/\
+                   natural-language/docs/reference/rest/v1/Token#Person
+
+    :type number: str
+    :param number: The grammatical number. https://cloud.google.com/natural\
+                   -language/docs/reference/rest/v1/Token#Number
+
+    :type tense: str
+    :param tense: The grammatical tense. https://cloud.google.com/natural\
+                  -language/docs/reference/rest/v1/Token#Tense
+
+    :type form: str
+    :param form: The grammatical form. https://cloud.google.com/natural\
+                 -language/docs/reference/rest/v1/Token#Form
+
+    :type proper: str
+    :param proper: The grammatical properness. https://cloud.google.com/\
+                   natural-language/docs/reference/rest/v1/Token#Proper
+
+    :type voice: str
+    :param voice: The grammatical voice. https://cloud.google.com/\
+                  natural-language/docs/reference/rest/v1/Token#Voice
+
+    :type gender: str
+    :param gender: The grammatical gender. https://cloud.google.com/\
+                   natural-language/docs/reference/rest/v1/Token#Gender
+    """
 
     UNKNOWN = 'UNKNOWN'
     """Unknown part of speech."""
@@ -81,6 +136,36 @@ class PartOfSpeech(object):
         'AFFIX': 'AFFIX',
     }
 
+    def __init__(self, aspect, reciprocity, case, mood, tag, person,
+                 number, tense, form, proper, voice, gender):
+        self.aspect = aspect
+        self.reciprocity = reciprocity
+        self.case = case
+        self.mood = mood
+        self.tag = tag
+        self.person = person
+        self.number = number
+        self.tense = tense
+        self.form = form
+        self.proper = proper
+        self.voice = voice
+        self.gender = gender
+
+    @classmethod
+    def from_api_repr(cls, payload):
+        return PartOfSpeech(aspect=payload['aspect'],
+                            reciprocity=payload['reciprocity'],
+                            case=payload['case'],
+                            mood=payload['mood'],
+                            tag=payload['tag'],
+                            person=payload['person'],
+                            number=payload['number'],
+                            tense=payload['tense'],
+                            form=payload['form'],
+                            proper=payload['proper'],
+                            voice=payload['voice'],
+                            gender=payload['gender'])
+
     @classmethod
     def reverse(cls, tag):
         """Reverses the API's enum name for the one on this class.
@@ -118,9 +203,9 @@ class Token(object):
                        document according to the encoding type specified
                        in the API request.
 
-    :type part_of_speech: str
-    :param part_of_speech: The part of speech of the token. See
-                           :class:`PartOfSpeech` for possible values.
+    :type part_of_speech: PartOfSpeech
+    :param part_of_speech: An object representing the Part of Speech of the
+                           token with it's properties.
 
     :type edge_index: int
     :param edge_index: The head of this token in the dependency tree. This is
@@ -159,7 +244,7 @@ def from_api_repr(cls, payload):
         text_span = payload['text']
         text_content = text_span['content']
         text_begin = text_span['beginOffset']
-        part_of_speech = payload['partOfSpeech']['tag']
+        part_of_speech = PartOfSpeech.from_api_repr(payload['partOfSpeech'])
         edge = payload['dependencyEdge']
         edge_index = edge['headTokenIndex']
         edge_label = edge['label']
diff --git a/language/tests/unit/test_api_responses.py b/language/tests/unit/test_api_responses.py
index bc04522acb066..4b79ec923feec 100644
--- a/language/tests/unit/test_api_responses.py
+++ b/language/tests/unit/test_api_responses.py
@@ -115,6 +115,18 @@ def _verify_sentiment_response(self, sentiment_response):
 
 class TestSyntaxResponse(unittest.TestCase):
     SENTENCE_DICT = copy(TestSentimentResponse.SENTENCE_DICT)
+    aspect = 'ASPECT_UNKNOWN'
+    reciprocity = 'RECIPROCITY_UNKNOWN'
+    case = 'NOMINATIVE'
+    mood = 'MOOD_UNKNOWN'
+    tag = 'PRON'
+    person = 'FIRST'
+    number = 'SINGULAR'
+    tense = 'TENSE_UNKNOWN'
+    form = 'FORM_UNKNOWN'
+    proper = 'PROPER_UNKNOWN'
+    voice = 'VOICE_UNKNOWN'
+    gender = 'GENDER_UNKNOWN'
     TOKEN_DICT = {
         'dependencyEdge': {
             'headTokenIndex': 0,
@@ -122,7 +134,18 @@ class TestSyntaxResponse(unittest.TestCase):
         },
         'lemma': 'it',
         'partOfSpeech': {
-            'tag': 'PRON',
+            'aspect': aspect,
+            'reciprocity': reciprocity,
+            'case': case,
+            'mood': mood,
+            'tag': tag,
+            'person': person,
+            'number': number,
+            'tense': tense,
+            'form': form,
+            'proper': proper,
+            'voice': voice,
+            'gender': gender
         },
         'text': {
             'beginOffset': 0,
@@ -156,7 +179,6 @@ def test_api_repr_factory(self):
 
     def _verify_syntax_response(self, syntax_response):
         from google.cloud.language.sentiment import Sentiment
-        from google.cloud.language.syntax import PartOfSpeech
 
         self.assertEqual(syntax_response.language, 'en')
 
@@ -169,7 +191,18 @@ def _verify_syntax_response(self, syntax_response):
         token = syntax_response.tokens[0]
         self.assertEqual(token.text_content, 'It')
         self.assertEqual(token.text_begin, 0)
-        self.assertEqual(token.part_of_speech, PartOfSpeech.PRONOUN)
+        self.assertEqual(token.part_of_speech.aspect, 'ASPECT_UNKNOWN')
+        self.assertEqual(token.part_of_speech.reciprocity, 'RECIPROCITY_UNKNOWN')
+        self.assertEqual(token.part_of_speech.case, 'NOMINATIVE')
+        self.assertEqual(token.part_of_speech.mood, 'MOOD_UNKNOWN')
+        self.assertEqual(token.part_of_speech.tag, 'PRON')
+        self.assertEqual(token.part_of_speech.person, 'FIRST')
+        self.assertEqual(token.part_of_speech.number, 'SINGULAR')
+        self.assertEqual(token.part_of_speech.tense, 'TENSE_UNKNOWN')
+        self.assertEqual(token.part_of_speech.form, 'FORM_UNKNOWN')
+        self.assertEqual(token.part_of_speech.proper, 'PROPER_UNKNOWN')
+        self.assertEqual(token.part_of_speech.voice, 'VOICE_UNKNOWN')
+        self.assertEqual(token.part_of_speech.gender, 'GENDER_UNKNOWN')
         self.assertEqual(token.edge_index, 0)
         self.assertEqual(token.edge_label, 'NSUBJ')
         self.assertEqual(token.lemma, 'it')
diff --git a/language/tests/unit/test_document.py b/language/tests/unit/test_document.py
index c30d13b6f15ee..0b12d09553099 100644
--- a/language/tests/unit/test_document.py
+++ b/language/tests/unit/test_document.py
@@ -14,7 +14,6 @@
 
 import unittest
 
-
 ANNOTATE_NAME = 'Moon'
 ANNOTATE_CONTENT = 'A cow jumped over the %s.' % (ANNOTATE_NAME,)
 ANNOTATE_SCORE = 1
@@ -29,7 +28,20 @@ def _make_token_json(name, part_of_speech, head, edge_label):
             'content': name,
             'beginOffset': -1,
         },
-        'partOfSpeech': {'tag': part_of_speech},
+        'partOfSpeech': {
+            'aspect': 'ASPECT_UNKNOWN',
+            'reciprocity': 'RECIPROCITY_UNKNOWN',
+            'case': 'NOMINATIVE',
+            'mood': 'MOOD_UNKNOWN',
+            'tag': part_of_speech,
+            'person': 'FIRST',
+            'number': 'SINGULAR',
+            'tense': 'TENSE_UNKNOWN',
+            'form': 'FORM_UNKNOWN',
+            'proper': 'PROPER_UNKNOWN',
+            'voice': 'VOICE_UNKNOWN',
+            'gender': 'GENDER_UNKNOWN',
+        },
         'dependencyEdge': {
             'headTokenIndex': head,
             'label': edge_label,
@@ -120,7 +132,6 @@ def test_default_low_maxunicode(self):
 
 
 class TestDocument(unittest.TestCase):
-
     @staticmethod
     def _get_target_class():
         from google.cloud.language.document import Document
@@ -424,12 +435,12 @@ def test_analyze_sentiment(self):
         client._connection.api_request.assert_called_once_with(
             path='analyzeSentiment', method='POST', data=expected)
 
-    def _verify_token(self, token, text_content, part_of_speech, lemma):
+    def _verify_token(self, token, text_content, part_of_speech_tag, lemma):
         from google.cloud.language.syntax import Token
 
         self.assertIsInstance(token, Token)
         self.assertEqual(token.text_content, text_content)
-        self.assertEqual(token.part_of_speech, part_of_speech)
+        self.assertEqual(token.part_of_speech.tag, part_of_speech_tag)
         self.assertEqual(token.lemma, lemma)
 
     def test_analyze_syntax(self):
@@ -457,7 +468,18 @@ def test_analyze_syntax(self):
                         'beginOffset': -1,
                     },
                     'partOfSpeech': {
+                        'aspect': 'ASPECT_UNKNOWN',
+                        'reciprocity': 'RECIPROCITY_UNKNOWN',
+                        'case': 'CASE_UNKNOWN',
+                        'mood': 'MOOD_UNKNOWN',
                         'tag': 'NOUN',
+                        'person': 'PERSON_UNKNOWN',
+                        'number': 'SINGULAR',
+                        'tense': 'TENSE_UNKNOWN',
+                        'form': 'FORM_UNKNOWN',
+                        'proper': 'PROPER',
+                        'voice': 'VOICE_UNKNOWN',
+                        'gender': 'GENDER_UNKNOWN'
                     },
                     'dependencyEdge': {
                         'headTokenIndex': 0,
@@ -471,7 +493,18 @@ def test_analyze_syntax(self):
                         'beginOffset': -1,
                     },
                     'partOfSpeech': {
+                        'aspect': 'ASPECT_UNKNOWN',
+                        'reciprocity': 'RECIPROCITY_UNKNOWN',
+                        'case': 'CASE_UNKNOWN',
+                        'mood': 'MOOD_UNKNOWN',
                         'tag': 'ADP',
+                        'person': 'PERSON_UNKNOWN',
+                        'number': 'NUMBER_UNKNOWN',
+                        'tense': 'TENSE_UNKNOWN',
+                        'form': 'FORM_UNKNOWN',
+                        'proper': 'PROPER_UNKNOWN',
+                        'voice': 'VOICE_UNKNOWN',
+                        'gender': 'GENDER_UNKNOWN'
                     },
                     'dependencyEdge': {
                         'headTokenIndex': 0,
@@ -485,7 +518,18 @@ def test_analyze_syntax(self):
                         'beginOffset': -1,
                     },
                     'partOfSpeech': {
+                        'aspect': 'ASPECT_UNKNOWN',
+                        'reciprocity': 'RECIPROCITY_UNKNOWN',
+                        'case': 'CASE_UNKNOWN',
+                        'mood': 'MOOD_UNKNOWN',
                         'tag': 'DET',
+                        'person': 'PERSON_UNKNOWN',
+                        'number': 'NUMBER_UNKNOWN',
+                        'tense': 'TENSE_UNKNOWN',
+                        'form': 'FORM_UNKNOWN',
+                        'proper': 'PROPER_UNKNOWN',
+                        'voice': 'VOICE_UNKNOWN',
+                        'gender': 'GENDER_UNKNOWN'
                     },
                     'dependencyEdge': {
                         'headTokenIndex': 3,
@@ -499,7 +543,18 @@ def test_analyze_syntax(self):
                         'beginOffset': -1,
                     },
                     'partOfSpeech': {
+                        'aspect': 'ASPECT_UNKNOWN',
+                        'reciprocity': 'RECIPROCITY_UNKNOWN',
+                        'case': 'CASE_UNKNOWN',
+                        'mood': 'MOOD_UNKNOWN',
                         'tag': 'NOUN',
+                        'person': 'PERSON_UNKNOWN',
+                        'number': 'SINGULAR',
+                        'tense': 'TENSE_UNKNOWN',
+                        'form': 'FORM_UNKNOWN',
+                        'proper': 'PROPER',
+                        'voice': 'VOICE_UNKNOWN',
+                        'gender': 'GENDER_UNKNOWN'
                     },
                     'dependencyEdge': {
                         'headTokenIndex': 1,
@@ -553,7 +608,7 @@ def _verify_tokens(self, annotations, token_info):
             self.assertIsInstance(token, Token)
             self.assertEqual(token.text_content, info[0])
             self.assertEqual(token.text_begin, -1)
-            self.assertEqual(token.part_of_speech, info[1])
+            self.assertEqual(token.part_of_speech.tag, info[1])
             self.assertEqual(token.edge_index, info[2])
             self.assertEqual(token.edge_label, info[3])
             self.assertEqual(token.lemma, info[0])
diff --git a/language/tests/unit/test_syntax.py b/language/tests/unit/test_syntax.py
index 8c1f994da5aea..387257353ccbc 100644
--- a/language/tests/unit/test_syntax.py
+++ b/language/tests/unit/test_syntax.py
@@ -16,7 +16,6 @@
 
 
 class TestPartOfSpeech(unittest.TestCase):
-
     @staticmethod
     def _get_target_class():
         from google.cloud.language.syntax import PartOfSpeech
@@ -34,9 +33,83 @@ def test_reverse(self):
             result = klass.reverse(value)
             self.assertEqual(result, attr)
 
+    def _make_one(self, *args, **kw):
+        return self._get_target_class()(*args, **kw)
 
-class TestToken(unittest.TestCase):
+    def test_constructor(self):
+
+        aspect = 'ASPECT_UNKNOWN'
+        reciprocity = 'RECIPROCITY_UNKNOWN'
+        case = 'NOMINATIVE'
+        mood = 'MOOD_UNKNOWN'
+        tag = 'PRON'
+        person = 'FIRST'
+        number = 'SINGULAR'
+        tense = 'TENSE_UNKNOWN'
+        form = 'FORM_UNKNOWN'
+        proper = 'PROPER_UNKNOWN'
+        voice = 'VOICE_UNKNOWN'
+        gender = 'GENDER_UNKNOWN'
+
+        pos = self._make_one(aspect, reciprocity, case, mood, tag, person,
+                             number, tense, form, proper, voice, gender)
+        self.assertEqual(pos.aspect, aspect)
+        self.assertEqual(pos.reciprocity, reciprocity)
+        self.assertEqual(pos.case, case)
+        self.assertEqual(pos.mood, mood)
+        self.assertEqual(pos.tag, tag)
+        self.assertEqual(pos.person, person)
+        self.assertEqual(pos.number, number)
+        self.assertEqual(pos.tense, tense)
+        self.assertEqual(pos.form, form)
+        self.assertEqual(pos.proper, proper)
+        self.assertEqual(pos.voice, voice)
+        self.assertEqual(pos.gender, gender)
+
+    def test_from_api_repr(self):
+        klass = self._get_target_class()
+        aspect = 'ASPECT_UNKNOWN'
+        reciprocity = 'RECIPROCITY_UNKNOWN'
+        case = 'NOMINATIVE'
+        mood = 'MOOD_UNKNOWN'
+        tag = 'PRON'
+        person = 'FIRST'
+        number = 'SINGULAR'
+        tense = 'TENSE_UNKNOWN'
+        form = 'FORM_UNKNOWN'
+        proper = 'PROPER_UNKNOWN'
+        voice = 'VOICE_UNKNOWN'
+        gender = 'GENDER_UNKNOWN'
+        payload = {
+            'aspect': aspect,
+            'reciprocity': reciprocity,
+            'case': case,
+            'mood': mood,
+            'tag': tag,
+            'person': person,
+            'number': number,
+            'tense': tense,
+            'form': form,
+            'proper': proper,
+            'voice': voice,
+            'gender': gender
+        }
+        pos = klass.from_api_repr(payload)
+        self.assertEqual(pos.aspect, aspect)
+        self.assertEqual(pos.reciprocity, reciprocity)
+        self.assertEqual(pos.case, case)
+        self.assertEqual(pos.mood, mood)
+        self.assertEqual(pos.tag, tag)
+        self.assertEqual(pos.person, person)
+        self.assertEqual(pos.number, number)
+        self.assertEqual(pos.tense, tense)
+        self.assertEqual(pos.form, form)
+        self.assertEqual(pos.proper, proper)
+        self.assertEqual(pos.voice, voice)
+        self.assertEqual(pos.gender, gender)
 
+
+class TestToken(unittest.TestCase):
     @staticmethod
     def _get_target_class():
         from google.cloud.language.syntax import Token
@@ -51,7 +124,20 @@ def test_constructor(self):
 
         text_content = 'All'
         text_begin = -1
-        part_of_speech = PartOfSpeech.DETERMINER
+        aspect = 'ASPECT_UNKNOWN'
+        reciprocity = 'RECIPROCITY_UNKNOWN'
+        case = 'NOMINATIVE'
+        mood = 'MOOD_UNKNOWN'
+        tag = 'PRON'
+        person = 'FIRST'
+        number = 'SINGULAR'
+        tense = 'TENSE_UNKNOWN'
+        form = 'FORM_UNKNOWN'
+        proper = 'PROPER_UNKNOWN'
+        voice = 'VOICE_UNKNOWN'
+        gender = 'GENDER_UNKNOWN'
+        part_of_speech = PartOfSpeech(aspect, reciprocity, case, mood, tag, person,
+                                      number, tense, form, proper, voice, gender)
         edge_index = 3
         edge_label = 'PREDET'
         lemma = text_content
@@ -59,18 +145,52 @@ def test_constructor(self):
                                edge_index, edge_label, lemma)
         self.assertEqual(token.text_content, text_content)
         self.assertEqual(token.text_begin, text_begin)
-        self.assertEqual(token.part_of_speech, part_of_speech)
+        self.assertEqual(token.part_of_speech.aspect, part_of_speech.aspect)
+        self.assertEqual(token.part_of_speech.reciprocity, part_of_speech.reciprocity)
+        self.assertEqual(token.part_of_speech.case, part_of_speech.case)
+        self.assertEqual(token.part_of_speech.mood, part_of_speech.mood)
+        self.assertEqual(token.part_of_speech.tag, part_of_speech.tag)
+        self.assertEqual(token.part_of_speech.person, part_of_speech.person)
+        self.assertEqual(token.part_of_speech.number, part_of_speech.number)
+        self.assertEqual(token.part_of_speech.tense, part_of_speech.tense)
+        self.assertEqual(token.part_of_speech.form, part_of_speech.form)
+        self.assertEqual(token.part_of_speech.proper, part_of_speech.proper)
+        self.assertEqual(token.part_of_speech.voice, part_of_speech.voice)
+        self.assertEqual(token.part_of_speech.gender, part_of_speech.gender)
         self.assertEqual(token.edge_index, edge_index)
         self.assertEqual(token.edge_label, edge_label)
         self.assertEqual(token.lemma, lemma)
 
     def test_from_api_repr(self):
-        from google.cloud.language.syntax import PartOfSpeech
-
         klass = self._get_target_class()
         text_content = 'pretty'
         text_begin = -1
-        part_of_speech = PartOfSpeech.ADJECTIVE
+        aspect = 'ASPECT_UNKNOWN'
+        reciprocity = 'RECIPROCITY_UNKNOWN'
+        case = 'NOMINATIVE'
+        mood = 'MOOD_UNKNOWN'
+        tag = 'PRON'
+        person = 'FIRST'
+        number = 'SINGULAR'
+        tense = 'TENSE_UNKNOWN'
+        form = 'FORM_UNKNOWN'
+        proper = 'PROPER_UNKNOWN'
+        voice = 'VOICE_UNKNOWN'
+        gender = 'GENDER_UNKNOWN'
+        part_of_speech = {
+            'aspect': aspect,
+            'reciprocity': reciprocity,
+            'case': case,
+            'mood': mood,
+            'tag': tag,
+            'person': person,
+            'number': number,
+            'tense': tense,
+            'form': form,
+            'proper': proper,
+            'voice': voice,
+            'gender': gender
+        }
         edge_index = 3
         edge_label = 'AMOD'
         lemma = text_content
@@ -79,9 +199,7 @@ def test_from_api_repr(self):
                 'content': text_content,
                 'beginOffset': text_begin,
             },
-            'partOfSpeech': {
-                'tag': part_of_speech,
-            },
+            'partOfSpeech': part_of_speech,
             'dependencyEdge': {
                 'headTokenIndex': edge_index,
                 'label': edge_label,
@@ -91,7 +209,18 @@ def test_from_api_repr(self):
         token = klass.from_api_repr(payload)
         self.assertEqual(token.text_content, text_content)
         self.assertEqual(token.text_begin, text_begin)
-        self.assertEqual(token.part_of_speech, part_of_speech)
+        self.assertEqual(token.part_of_speech.aspect, part_of_speech['aspect'])
+        self.assertEqual(token.part_of_speech.reciprocity, part_of_speech['reciprocity'])
+        self.assertEqual(token.part_of_speech.case, part_of_speech['case'])
+        self.assertEqual(token.part_of_speech.mood, part_of_speech['mood'])
+        self.assertEqual(token.part_of_speech.tag, part_of_speech['tag'])
+        self.assertEqual(token.part_of_speech.person, part_of_speech['person'])
+        self.assertEqual(token.part_of_speech.number, part_of_speech['number'])
+        self.assertEqual(token.part_of_speech.tense, part_of_speech['tense'])
+        self.assertEqual(token.part_of_speech.form, part_of_speech['form'])
+        self.assertEqual(token.part_of_speech.proper, part_of_speech['proper'])
+        self.assertEqual(token.part_of_speech.voice, part_of_speech['voice'])
+        self.assertEqual(token.part_of_speech.gender, part_of_speech['gender'])
         self.assertEqual(token.edge_index, edge_index)
         self.assertEqual(token.edge_label, edge_label)
         self.assertEqual(token.lemma, lemma)

From 45084cfa535de68f44a6cd26c5f58aa7322947c1 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Mon, 5 Jun 2017 12:40:16 -0700
Subject: [PATCH 011/211] Revert "Fix "broken" docs build. (#3422)" (#3439)

This reverts commit a849060a505d5b891b68df679ac36ee79f1e9414.
---
 docs/logging/usage.rst               | 32 ++++++++++++++++++++++++++++
 nox.py                               |  2 +-
 pubsub/google/cloud/pubsub/client.py |  2 ++
 storage/google/cloud/storage/blob.py |  2 ++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/docs/logging/usage.rst b/docs/logging/usage.rst
index 5ec64aa905986..4ffc5998225f2 100644
--- a/docs/logging/usage.rst
+++ b/docs/logging/usage.rst
@@ -41,12 +41,14 @@ Authentication and Configuration
   .. literalinclude:: snippets.py
      :start-after: [START client_create_default]
      :end-before: [END client_create_default]
+     :dedent: 4
 
   or pass in ``credentials`` and ``project`` explicitly
 
   .. literalinclude:: snippets.py
      :start-after: [START client_create_explicit]
      :end-before: [END client_create_explicit]
+     :dedent: 4
 
 
 Writing log entries
@@ -59,18 +61,21 @@ which to associate the entries:
 .. literalinclude:: snippets.py
     :start-after: [START logger_create]
     :end-before: [END logger_create]
+    :dedent: 4
 
 Write a simple text entry to the logger.
 
 .. literalinclude:: snippets.py
     :start-after: [START logger_log_text]
     :end-before: [END logger_log_text]
+    :dedent: 4
 
 Write a dictionary entry to the logger.
 
 .. literalinclude:: snippets.py
     :start-after: [START logger_log_struct]
     :end-before: [END logger_log_struct]
+    :dedent: 4
 
 
 Retrieving log entries
@@ -81,12 +86,14 @@ Fetch entries for the default project.
 .. literalinclude:: snippets.py
     :start-after: [START client_list_entries_default]
     :end-before: [END client_list_entries_default]
+    :dedent: 4
 
 Fetch entries across multiple projects.
 
 .. literalinclude:: snippets.py
     :start-after: [START client_list_entries_multi_project]
     :end-before: [END client_list_entries_multi_project]
+    :dedent: 4
 
 Filter entries retrieved using the `Advanced Logs Filters`_ syntax
 
@@ -97,24 +104,28 @@ Fetch entries for the default project.
 .. literalinclude:: snippets.py
     :start-after: [START client_list_entries_filter]
     :end-before: [END client_list_entries_filter]
+    :dedent: 4
 
 Sort entries in descending timestamp order.
 
 .. literalinclude:: snippets.py
     :start-after: [START client_list_entries_order_by]
     :end-before: [END client_list_entries_order_by]
+    :dedent: 4
 
 Retrieve entries in batches of 10, iterating until done.
 
 .. literalinclude:: snippets.py
     :start-after: [START client_list_entries_paged]
     :end-before: [END client_list_entries_paged]
+    :dedent: 4
 
 Retrieve entries for a single logger, sorting in descending timestamp order:
 
 .. literalinclude:: snippets.py
     :start-after: [START logger_list_entries]
     :end-before: [END logger_list_entries]
+    :dedent: 4
 
 
 Delete all entries for a logger
@@ -123,6 +134,7 @@ Delete all entries for a logger
 .. literalinclude:: snippets.py
     :start-after: [START logger_delete]
     :end-before: [END logger_delete]
+    :dedent: 8
 
 
 Manage log metrics
@@ -136,30 +148,35 @@ List all metrics for a project:
 .. literalinclude:: snippets.py
     :start-after: [START client_list_metrics]
     :end-before: [END client_list_metrics]
+    :dedent: 4
 
 Create a metric:
 
 .. literalinclude:: snippets.py
     :start-after: [START metric_create]
     :end-before: [END metric_create]
+    :dedent: 4
 
 Refresh local information about a metric:
 
 .. literalinclude:: snippets.py
     :start-after: [START metric_reload]
     :end-before: [END metric_reload]
+    :dedent: 4
 
 Update a metric:
 
 .. literalinclude:: snippets.py
     :start-after: [START metric_update]
     :end-before: [END metric_update]
+    :dedent: 4
 
 Delete a metric:
 
 .. literalinclude:: snippets.py
     :start-after: [START metric_delete]
     :end-before: [END metric_delete]
+    :dedent: 4
 
 Export log entries using sinks
 ------------------------------
@@ -181,12 +198,14 @@ Add ``cloud-logs@google.com`` as the owner of the bucket:
 .. literalinclude:: snippets.py
     :start-after: [START sink_bucket_permissions]
     :end-before: [END sink_bucket_permissions]
+    :dedent: 4
 
 Create a Cloud Storage sink:
 
 .. literalinclude:: snippets.py
     :start-after: [START sink_storage_create]
     :end-before: [END sink_storage_create]
+    :dedent: 4
 
 
 Export to BigQuery
@@ -202,12 +221,14 @@ See: `Setting permissions for BigQuery`_
 .. literalinclude:: snippets.py
     :start-after: [START sink_dataset_permissions]
     :end-before: [END sink_dataset_permissions]
+    :dedent: 4
 
 Create a BigQuery sink:
 
 .. literalinclude:: snippets.py
     :start-after: [START sink_bigquery_create]
     :end-before: [END sink_bigquery_create]
+    :dedent: 4
 
 
 Export to Pub/Sub
@@ -223,12 +244,14 @@ See: `Setting permissions for Pub/Sub`_
 .. literalinclude:: snippets.py
     :start-after: [START sink_topic_permissions]
     :end-before: [END sink_topic_permissions]
+    :dedent: 4
 
 Create a Cloud Pub/Sub sink:
 
 .. literalinclude:: snippets.py
     :start-after: [START sink_pubsub_create]
     :end-before: [END sink_pubsub_create]
+    :dedent: 4
 
 Manage Sinks
 ~~~~~~~~~~~~
@@ -238,24 +261,28 @@ List all sinks for a project:
 .. literalinclude:: snippets.py
     :start-after: [START client_list_sinks]
     :end-before: [END client_list_sinks]
+    :dedent: 4
 
 Refresh local information about a sink:
 
 .. literalinclude:: snippets.py
     :start-after: [START sink_reload]
     :end-before: [END sink_reload]
+    :dedent: 4
 
 Update a sink:
 
 .. literalinclude:: snippets.py
     :start-after: [START sink_update]
     :end-before: [END sink_update]
+    :dedent: 4
 
 Delete a sink:
 
 .. literalinclude:: snippets.py
     :start-after: [START sink_delete]
     :end-before: [END sink_delete]
+    :dedent: 4
 
 Integration with Python logging module
 --------------------------------------
@@ -268,6 +295,7 @@ To automatically pick the default for your current environment, use
 .. literalinclude:: snippets.py
     :start-after: [START create_default_handler]
     :end-before: [END create_default_handler]
+    :dedent: 4
 
 It is also possible to attach the handler to the root Python logger, so that
 for example a plain ``logging.warn`` call would be sent to Stackdriver Logging,
@@ -278,6 +306,7 @@ to configure this automatically.
 .. literalinclude:: snippets.py
     :start-after: [START setup_logging]
     :end-before: [END setup_logging]
+    :dedent: 4
 
 .. note::
 
@@ -289,6 +318,7 @@ You can also exclude certain loggers:
 .. literalinclude:: snippets.py
     :start-after: [START setup_logging_excludes]
     :end-before: [END setup_logging_excludes]
+    :dedent: 4
 
 Cloud Logging Handler
 ~~~~~~~~~~~~~~~~~~~~~
@@ -302,6 +332,7 @@ which will write directly to the API.
 .. literalinclude:: snippets.py
     :start-after: [START create_cloud_handler]
     :end-before: [END create_cloud_handler]
+    :dedent: 4
 
 .. note::
 
@@ -317,6 +348,7 @@ of the Python logger will be included in the structured log entry under the
 .. literalinclude:: snippets.py
     :start-after: [START create_named_handler]
     :end-before: [END create_named_handler]
+    :dedent: 4
 
 Cloud Logging Handler transports
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/nox.py b/nox.py
index ba3de939901ad..dd38837e6a018 100644
--- a/nox.py
+++ b/nox.py
@@ -26,7 +26,7 @@ def docs(session):
 
     # Install Sphinx and also all of the google-cloud-* packages.
     session.chdir(os.path.realpath(os.path.dirname(__file__)))
-    session.install('sphinx', 'sphinx_rtd_theme')
+    session.install('Sphinx >= 1.6.2', 'sphinx_rtd_theme')
     session.install(
         'core/', 'bigquery/', 'bigtable/', 'datastore/', 'dns/', 'language/',
         'logging/', 'error_reporting/', 'monitoring/', 'pubsub/',
diff --git a/pubsub/google/cloud/pubsub/client.py b/pubsub/google/cloud/pubsub/client.py
index 902188beaab6e..6a7e60a1923d8 100644
--- a/pubsub/google/cloud/pubsub/client.py
+++ b/pubsub/google/cloud/pubsub/client.py
@@ -226,6 +226,7 @@ def topic(self, name, timestamp_messages=False):
         .. literalinclude:: snippets.py
            :start-after: [START client_topic]
            :end-before: [END client_topic]
+           :dedent: 4
 
         :type name: str
         :param name: the name of the topic to be constructed.
@@ -248,6 +249,7 @@ def subscription(self, name, ack_deadline=None, push_endpoint=None,
         .. literalinclude:: snippets.py
            :start-after: [START client_subscription]
            :end-before: [END client_subscription]
+           :dedent: 4
 
         :type name: str
         :param name: the name of the subscription to be constructed.
diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index 8805cd7342294..de59fdf1f2bde 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -442,6 +442,7 @@ def download_to_file(self, file_obj, client=None):
          .. literalinclude:: snippets.py
             :start-after: [START download_to_file]
             :end-before: [END download_to_file]
+            :dedent: 4
 
         The ``encryption_key`` should be a str or bytes with a length of at
         least 32.
@@ -843,6 +844,7 @@ def upload_from_file(self, file_obj, rewind=False, size=None,
         .. literalinclude:: snippets.py
             :start-after: [START upload_from_file]
             :end-before: [END upload_from_file]
+            :dedent: 4
 
         The ``encryption_key`` should be a str or bytes with a length of at
         least 32.

From 92a20c6b3b342181603b53b576885519a9698ee5 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Mon, 5 Jun 2017 13:45:06 -0700
Subject: [PATCH 012/211] Using part of speech "tag" in system test. (#3471)

Token.part_of_speech is now a PartOfSpeech rather than a string
scalar. (This test breakage was accidentally introduced in
---
 language/tests/system.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/language/tests/system.py b/language/tests/system.py
index 5802744762fa2..a3c98803c137a 100644
--- a/language/tests/system.py
+++ b/language/tests/system.py
@@ -130,7 +130,7 @@ def _verify_token(self, token, text_content, part_of_speech, lemma):
 
         self.assertIsInstance(token, Token)
         self.assertEqual(token.text_content, text_content)
-        self.assertEqual(token.part_of_speech, part_of_speech)
+        self.assertEqual(token.part_of_speech.tag, part_of_speech)
         self.assertEqual(token.lemma, lemma)
 
     def _check_analyze_syntax_result(self, tokens):

From a55010fb5a38601161624a5e9b645889b4df9045 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Tue, 6 Jun 2017 10:11:59 -0700
Subject: [PATCH 013/211] Adding optional switch to capture project ID in
 from_service_account_json(). (#3436)

Fixes #1883.
---
 bigtable/google/cloud/bigtable/client.py |  1 +
 core/google/cloud/client.py              | 18 +++++--
 core/nox.py                              |  3 +-
 core/tests/unit/test_client.py           | 69 +++++++++++++++++++++---
 spanner/google/cloud/spanner/client.py   |  1 +
 5 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/bigtable/google/cloud/bigtable/client.py b/bigtable/google/cloud/bigtable/client.py
index 2f552b1c2564e..764a365dacb25 100644
--- a/bigtable/google/cloud/bigtable/client.py
+++ b/bigtable/google/cloud/bigtable/client.py
@@ -207,6 +207,7 @@ class Client(_ClientFactoryMixin, _ClientProjectMixin):
     _instance_stub_internal = None
     _operations_stub_internal = None
     _table_stub_internal = None
+    _SET_PROJECT = True  # Used by from_service_account_json()
 
     def __init__(self, project=None, credentials=None,
                  read_only=False, admin=False, user_agent=DEFAULT_USER_AGENT):
diff --git a/core/google/cloud/client.py b/core/google/cloud/client.py
index e3f6f81326ef0..e7e43faf1e452 100644
--- a/core/google/cloud/client.py
+++ b/core/google/cloud/client.py
@@ -14,6 +14,8 @@
 
 """Base classes for client used to interact with Google Cloud APIs."""
 
+import io
+import json
 from pickle import PicklingError
 
 import google.auth.credentials
@@ -40,6 +42,8 @@ class _ClientFactoryMixin(object):
         This class is virtual.
     """
 
+    _SET_PROJECT = False
+
     @classmethod
     def from_service_account_json(cls, json_credentials_path, *args, **kwargs):
         """Factory to retrieve JSON credentials while creating client.
@@ -58,15 +62,21 @@ def from_service_account_json(cls, json_credentials_path, *args, **kwargs):
         :type kwargs: dict
         :param kwargs: Remaining keyword arguments to pass to constructor.
 
-        :rtype: :class:`google.cloud.pubsub.client.Client`
+        :rtype: :class:`_ClientFactoryMixin`
         :returns: The client created with the retrieved JSON credentials.
         :raises: :class:`TypeError` if there is a conflict with the kwargs
                  and the credentials created by the factory.
         """
         if 'credentials' in kwargs:
             raise TypeError('credentials must not be in keyword arguments')
-        credentials = service_account.Credentials.from_service_account_file(
-            json_credentials_path)
+        with io.open(json_credentials_path, 'r', encoding='utf-8') as json_fi:
+            credentials_info = json.load(json_fi)
+        credentials = service_account.Credentials.from_service_account_info(
+            credentials_info)
+        if cls._SET_PROJECT:
+            if 'project' not in kwargs:
+                kwargs['project'] = credentials_info.get('project_id')
+
         kwargs['credentials'] = credentials
         return cls(*args, **kwargs)
 
@@ -207,6 +217,8 @@ class ClientWithProject(Client, _ClientProjectMixin):
              set in the environment.
     """
 
+    _SET_PROJECT = True  # Used by from_service_account_json()
+
     def __init__(self, project=None, credentials=None, _http=None):
         _ClientProjectMixin.__init__(self, project=project)
         Client.__init__(self, credentials=credentials, _http=_http)
diff --git a/core/nox.py b/core/nox.py
index 1b9ef352e3a59..d941d60092b81 100644
--- a/core/nox.py
+++ b/core/nox.py
@@ -33,7 +33,8 @@ def unit_tests(session, python_version):
     session.install('-e', '.')
 
     # Run py.test against the unit tests.
-    session.run('py.test', '--quiet',
+    session.run(
+        'py.test', '--quiet',
         '--cov=google.cloud', '--cov=tests.unit', '--cov-append',
         '--cov-config=.coveragerc', '--cov-report=', '--cov-fail-under=97',
         'tests/unit',
diff --git a/core/tests/unit/test_client.py b/core/tests/unit/test_client.py
index 21a8bccc98453..14eac68abee32 100644
--- a/core/tests/unit/test_client.py
+++ b/core/tests/unit/test_client.py
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import io
+import json
 import unittest
 
 import mock
@@ -90,21 +92,32 @@ def test_ctor_bad_credentials(self):
             self._make_one(credentials=CREDENTIALS)
 
     def test_from_service_account_json(self):
-        KLASS = self._get_target_class()
+        from google.cloud import _helpers
+
+        klass = self._get_target_class()
 
+        # Mock both the file opening and the credentials constructor.
+        info = {'dummy': 'value', 'valid': 'json'}
+        json_fi = io.StringIO(_helpers._bytes_to_unicode(json.dumps(info)))
+        file_open_patch = mock.patch(
+            'io.open', return_value=json_fi)
         constructor_patch = mock.patch(
             'google.oauth2.service_account.Credentials.'
-            'from_service_account_file',
+            'from_service_account_info',
             return_value=_make_credentials())
 
-        with constructor_patch as constructor:
-            client_obj = KLASS.from_service_account_json(
-                mock.sentinel.filename)
+        with file_open_patch as file_open:
+            with constructor_patch as constructor:
+                client_obj = klass.from_service_account_json(
+                    mock.sentinel.filename)
 
         self.assertIs(
             client_obj._credentials, constructor.return_value)
         self.assertIsNone(client_obj._http_internal)
-        constructor.assert_called_once_with(mock.sentinel.filename)
+        # Check that mocks were called as expected.
+        file_open.assert_called_once_with(
+            mock.sentinel.filename, 'r', encoding='utf-8')
+        constructor.assert_called_once_with(info)
 
     def test_from_service_account_json_bad_args(self):
         KLASS = self._get_target_class()
@@ -221,3 +234,47 @@ def test_ctor_explicit_bytes(self):
     def test_ctor_explicit_unicode(self):
         PROJECT = u'PROJECT'
         self._explicit_ctor_helper(PROJECT)
+
+    def _from_service_account_json_helper(self, project=None):
+        from google.cloud import _helpers
+
+        klass = self._get_target_class()
+
+        info = {'dummy': 'value', 'valid': 'json'}
+        if project is None:
+            expected_project = 'eye-d-of-project'
+        else:
+            expected_project = project
+
+        info['project_id'] = expected_project
+        # Mock both the file opening and the credentials constructor.
+        json_fi = io.StringIO(_helpers._bytes_to_unicode(json.dumps(info)))
+        file_open_patch = mock.patch(
+            'io.open', return_value=json_fi)
+        constructor_patch = mock.patch(
+            'google.oauth2.service_account.Credentials.'
+            'from_service_account_info',
+            return_value=_make_credentials())
+
+        with file_open_patch as file_open:
+            with constructor_patch as constructor:
+                kwargs = {}
+                if project is not None:
+                    kwargs['project'] = project
+                client_obj = klass.from_service_account_json(
+                    mock.sentinel.filename, **kwargs)
+
+        self.assertIs(
+            client_obj._credentials, constructor.return_value)
+        self.assertIsNone(client_obj._http_internal)
+        self.assertEqual(client_obj.project, expected_project)
+        # Check that mocks were called as expected.
+        file_open.assert_called_once_with(
+            mock.sentinel.filename, 'r', encoding='utf-8')
+        constructor.assert_called_once_with(info)
+
+    def test_from_service_account_json(self):
+        self._from_service_account_json_helper()
+
+    def test_from_service_account_json_project_set(self):
+        self._from_service_account_json_helper(project='prah-jekt')
diff --git a/spanner/google/cloud/spanner/client.py b/spanner/google/cloud/spanner/client.py
index c95e16e2c23c9..875238aed2bc2 100644
--- a/spanner/google/cloud/spanner/client.py
+++ b/spanner/google/cloud/spanner/client.py
@@ -102,6 +102,7 @@ class Client(_ClientFactoryMixin, _ClientProjectMixin):
     """
     _instance_admin_api = None
     _database_admin_api = None
+    _SET_PROJECT = True  # Used by from_service_account_json()
 
     def __init__(self, project=None, credentials=None,
                  user_agent=DEFAULT_USER_AGENT):

From bdb7e0a3056f650b8278dfc08a0c4a918c1cb3b9 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Tue, 6 Jun 2017 10:34:49 -0700
Subject: [PATCH 014/211] Reverse direction of dependencies when determining
 target packages. (#3469)

Fixes #3466.
---
 test_utils/scripts/get_target_packages.py | 34 ++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/test_utils/scripts/get_target_packages.py b/test_utils/scripts/get_target_packages.py
index 41f29562d99ec..fcf6818aa2b22 100644
--- a/test_utils/scripts/get_target_packages.py
+++ b/test_utils/scripts/get_target_packages.py
@@ -109,6 +109,37 @@ def get_changed_files():
         return None
 
 
+def reverse_map(dict_of_sets):
+    """Reverse a map of one-to-many.
+
+    So the map::
+
+      {
+        'A': {'B', 'C'},
+        'B': {'C'},
+      }
+
+    becomes
+
+      {
+        'B': {'A'},
+        'C': {'A', 'B'},
+      }
+
+    Args:
+        dict_of_sets (dict[set]): A dictionary of sets, mapping
+            one value to many.
+
+    Returns:
+        dict[set]: The reversed map.
+    """
+    result = {}
+    for key, values in dict_of_sets.items():
+        for value in values:
+            result.setdefault(value, set()).add(key)
+
+    return result
+
 def get_changed_packages(file_list):
     """Return a list of changed packages based on the provided file list.
 
@@ -129,6 +160,7 @@ def get_changed_packages(file_list):
 
     # Create a set based on the list of changed files.
     answer = set()
+    reverse_deps = reverse_map(PKG_DEPENDENCIES)
     for file_ in file_list:
         # Ignore root directory changes (setup.py, .gitignore, etc.).
         if os.path.sep not in file_:
@@ -147,7 +179,7 @@ def get_changed_packages(file_list):
         # Add the package, as well as any dependencies this package has.
         # NOTE: For now, dependencies only go down one level.
         answer.add(package)
-        answer = answer.union(PKG_DEPENDENCIES.get(package, set()))
+        answer = answer.union(reverse_deps.get(package, set()))
 
     # We got this far without being short-circuited; return the final answer.
     return answer

From 9b2668c8915909d7145b857f95e5f3d1a76dabe7 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Tue, 6 Jun 2017 13:08:46 -0700
Subject: [PATCH 015/211] Updating Bigtable Client docstring to reflect new
 credentials. (#3477)

---
 bigtable/google/cloud/bigtable/client.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/bigtable/google/cloud/bigtable/client.py b/bigtable/google/cloud/bigtable/client.py
index 764a365dacb25..86ee7173c917b 100644
--- a/bigtable/google/cloud/bigtable/client.py
+++ b/bigtable/google/cloud/bigtable/client.py
@@ -179,12 +179,10 @@ class Client(_ClientFactoryMixin, _ClientProjectMixin):
                     instances, tables and data. If not provided, will
                     attempt to determine from the environment.
 
-    :type credentials:
-        :class:`OAuth2Credentials <oauth2client.client.OAuth2Credentials>` or
-        :data:`NoneType <types.NoneType>`
+    :type credentials: :class:`~google.auth.credentials.Credentials`
     :param credentials: (Optional) The OAuth2 Credentials to use for this
-                        client. If not provided, defaults to the Google
-                        Application Default Credentials.
+                        client. If not passed, falls back to the default
+                        inferred from the environment.
 
     :type read_only: bool
     :param read_only: (Optional) Boolean indicating if the data scope should be

From 179997e9a22d64835325d2484d2475b470c566f8 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Tue, 6 Jun 2017 19:01:35 -0400
Subject: [PATCH 016/211] Add 'Bucket.labels' property. (#3478)

* Avoid UnicodeWarning reported by new py.test

* Add 'Bucket.labels' property.

See: https://cloud.google.com/storage/docs/json_api/v1/buckets#labels

Closes #3473.
---
 storage/google/cloud/storage/bucket.py | 30 ++++++++++++++++++++++++++
 storage/tests/unit/test_blob.py        |  4 +++-
 storage/tests/unit/test_bucket.py      | 24 +++++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index 506d1ce6e26d4..07f44be640fcf 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -551,6 +551,36 @@ def cors(self, entries):
         """
         self._patch_property('cors', entries)
 
+    @property
+    def labels(self):
+        """Retrieve or set CORS policies configured for this bucket.
+
+        See
+        https://cloud.google.com/storage/docs/json_api/v1/buckets#labels
+
+        :setter: Set labels for this bucket.
+        :getter: Gets the labels for this bucket.
+
+        :rtype: :class:`dict`
+        :returns: Name-value pairs (string->string) labelling the bucket.
+        """
+        labels = self._properties.get('labels')
+        if labels is None:
+            return {}
+        return copy.deepcopy(labels)
+
+    @labels.setter
+    def labels(self, mapping):
+        """Set CORS policies configured for this bucket.
+
+        See
+        https://cloud.google.com/storage/docs/json_api/v1/buckets#labels
+
+        :type mapping: :class:`dict`
+        :param mapping: Name-value pairs (string->string) labelling the bucket.
+        """
+        self._patch_property('labels', copy.deepcopy(mapping))
+
     @property
     def etag(self):
         """Retrieve the ETag for the bucket.
diff --git a/storage/tests/unit/test_blob.py b/storage/tests/unit/test_blob.py
index 21443480b32f8..a5d49bc4bacb6 100644
--- a/storage/tests/unit/test_blob.py
+++ b/storage/tests/unit/test_blob.py
@@ -19,6 +19,7 @@
 import unittest
 
 import mock
+import six
 from six.moves import http_client
 
 
@@ -55,7 +56,8 @@ def test_ctor_with_encoded_unicode(self):
         blob_name = b'wet \xe2\x9b\xb5'
         blob = self._make_one(blob_name, bucket=None)
         unicode_name = u'wet \N{sailboat}'
-        self.assertNotEqual(blob.name, blob_name)
+        self.assertNotIsInstance(blob.name, bytes)
+        self.assertIsInstance(blob.name, six.text_type)
         self.assertEqual(blob.name, unicode_name)
 
     def test_ctor_w_encryption_key(self):
diff --git a/storage/tests/unit/test_bucket.py b/storage/tests/unit/test_bucket.py
index 03119bbfdf1bb..5e4a915751977 100644
--- a/storage/tests/unit/test_bucket.py
+++ b/storage/tests/unit/test_bucket.py
@@ -167,6 +167,7 @@ def test_create_w_extra_properties(self):
             "condition": {"age": 365}
         }]
         LOCATION = 'eu'
+        LABELS = {'color': 'red', 'flavor': 'cherry'}
         STORAGE_CLASS = 'NEARLINE'
         DATA = {
             'name': BUCKET_NAME,
@@ -175,6 +176,7 @@ def test_create_w_extra_properties(self):
             'location': LOCATION,
             'storageClass': STORAGE_CLASS,
             'versioning': {'enabled': True},
+            'labels': LABELS,
         }
         connection = _Connection(DATA)
         client = _Client(connection, project=PROJECT)
@@ -184,6 +186,7 @@ def test_create_w_extra_properties(self):
         bucket.location = LOCATION
         bucket.storage_class = STORAGE_CLASS
         bucket.versioning_enabled = True
+        bucket.labels = LABELS
         bucket.create()
 
         kw, = connection._requested
@@ -663,6 +666,27 @@ def test_cors_setter(self):
         self.assertEqual(bucket.cors, [CORS_ENTRY])
         self.assertTrue('cors' in bucket._changes)
 
+    def test_labels_getter(self):
+        NAME = 'name'
+        LABELS = {'color': 'red', 'flavor': 'cherry'}
+        properties = {'labels': LABELS}
+        bucket = self._make_one(name=NAME, properties=properties)
+        labels = bucket.labels
+        self.assertEqual(labels, LABELS)
+        # Make sure it was a copy, not the same object.
+        self.assertIsNot(labels, LABELS)
+
+    def test_labels_setter(self):
+        NAME = 'name'
+        LABELS = {'color': 'red', 'flavor': 'cherry'}
+        bucket = self._make_one(name=NAME)
+
+        self.assertEqual(bucket.labels, {})
+        bucket.labels = LABELS
+        self.assertEqual(bucket.labels, LABELS)
+        self.assertIsNot(bucket._properties['labels'], LABELS)
+        self.assertIn('labels', bucket._changes)
+
     def test_get_logging_w_prefix(self):
         NAME = 'name'
         LOG_BUCKET = 'logs'

From 0031840c1d3e35f528c4009d82e0b2f25f464fcf Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <lukesneeringer@google.com>
Date: Wed, 7 Jun 2017 07:43:12 -0700
Subject: [PATCH 017/211] Remove external GAPIC dependency for Vision.

---
 vision/setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vision/setup.py b/vision/setup.py
index 3494535bddd70..7a17741449407 100644
--- a/vision/setup.py
+++ b/vision/setup.py
@@ -26,7 +26,6 @@
 
 REQUIREMENTS = [
     'google-cloud-core >= 0.24.0, < 0.25dev',
-    'gapic-google-cloud-vision-v1 >= 0.90.3, < 0.91dev',
 ]
 EXTRAS_REQUIRE = {
     ':python_version<"3.4"': ['enum34'],

From dfcbbfb3f04f17b7184ca1bf9f8af4684b093d4b Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Wed, 7 Jun 2017 08:22:30 -0700
Subject: [PATCH 018/211] Fix deps (#3480)

---
 vision/setup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vision/setup.py b/vision/setup.py
index 7a17741449407..6860e23fbaec3 100644
--- a/vision/setup.py
+++ b/vision/setup.py
@@ -26,6 +26,8 @@
 
 REQUIREMENTS = [
     'google-cloud-core >= 0.24.0, < 0.25dev',
+    'google-gax >= 0.15.7, < 0.16dev',
+    'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',
 ]
 EXTRAS_REQUIRE = {
     ':python_version<"3.4"': ['enum34'],

From b24b315995d9b6cabe3bda4282d4372abef73533 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Wed, 7 Jun 2017 13:33:09 -0400
Subject: [PATCH 019/211] Expose that settable properties are so. (#3472)

* Expose that settable properties are so.

Closes #2610.
---
 storage/google/cloud/storage/bucket.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index 07f44be640fcf..865a23840af4a 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -608,11 +608,14 @@ def id(self):
 
     @property
     def lifecycle_rules(self):
-        """Lifecycle rules configured for this bucket.
+        """Retrieve or set lifecycle rules configured for this bucket.
 
         See https://cloud.google.com/storage/docs/lifecycle and
              https://cloud.google.com/storage/docs/json_api/v1/buckets
 
+        :setter: Set lifestyle rules for this bucket.
+        :getter: Gets the lifestyle rules for this bucket.
+
         :rtype: list(dict)
         :returns: A sequence of mappings describing each lifecycle rule.
         """
@@ -621,6 +624,14 @@ def lifecycle_rules(self):
 
     @lifecycle_rules.setter
     def lifecycle_rules(self, rules):
+        """Set lifestyle rules configured for this bucket.
+
+        See https://cloud.google.com/storage/docs/lifecycle and
+             https://cloud.google.com/storage/docs/json_api/v1/buckets
+
+        :type entries: list of dictionaries
+        :param entries: A sequence of mappings describing each lifecycle rule.
+        """
         self._patch_property('lifecycle', {'rule': rules})
 
     location = _scalar_property('location')
@@ -721,10 +732,13 @@ def self_link(self):
 
     @property
     def storage_class(self):
-        """Retrieve the storage class for the bucket.
+        """Retrieve or set the storage class for the bucket.
 
         See https://cloud.google.com/storage/docs/storage-classes
 
+        :setter: Set the storage class for this bucket.
+        :getter: Gets the the storage class for this bucket.
+
         :rtype: str or ``NoneType``
         :returns: If set, one of "MULTI_REGIONAL", "REGIONAL",
                   "NEARLINE", "COLDLINE", "STANDARD", or
@@ -767,6 +781,9 @@ def versioning_enabled(self):
         See  https://cloud.google.com/storage/docs/object-versioning for
         details.
 
+        :setter: Update whether versioning is enabled for this bucket.
+        :getter: Query whether versioning is enabled for this bucket.
+
         :rtype: bool
         :returns: True if enabled, else False.
         """

From 8dacdb9996c11cee5764d5fc1517bd77ee46ab98 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Wed, 7 Jun 2017 16:02:22 -0400
Subject: [PATCH 020/211] Remap new Gax conflict error code (#3443)

* Add testing support for 'ALREADY_EXISTS' gRPC error code.

* Cover both possible gRPC conflict error codes.

Closes #3175.

* Exercise conflict-on-create in systests for topic/sub/snap.
---
 core/google/cloud/_testing.py      |  4 ++
 pubsub/google/cloud/pubsub/_gax.py |  9 ++--
 pubsub/tests/system.py             | 10 ++++
 pubsub/tests/unit/test__gax.py     | 81 ++++++++++++++++++++++++++----
 4 files changed, 92 insertions(+), 12 deletions(-)

diff --git a/core/google/cloud/_testing.py b/core/google/cloud/_testing.py
index f9d2b57fda52a..a544fffc5fe4a 100644
--- a/core/google/cloud/_testing.py
+++ b/core/google/cloud/_testing.py
@@ -95,6 +95,10 @@ def _make_grpc_failed_precondition(self):
         from grpc import StatusCode
         return self._make_grpc_error(StatusCode.FAILED_PRECONDITION)
 
+    def _make_grpc_already_exists(self):
+        from grpc import StatusCode
+        return self._make_grpc_error(StatusCode.ALREADY_EXISTS)
+
     def _make_grpc_deadline_exceeded(self):
         from grpc import StatusCode
         return self._make_grpc_error(StatusCode.DEADLINE_EXCEEDED)
diff --git a/pubsub/google/cloud/pubsub/_gax.py b/pubsub/google/cloud/pubsub/_gax.py
index d32f8eb069a78..94dc639178ef9 100644
--- a/pubsub/google/cloud/pubsub/_gax.py
+++ b/pubsub/google/cloud/pubsub/_gax.py
@@ -42,6 +42,9 @@
 from google.cloud.pubsub.subscription import Subscription
 from google.cloud.pubsub.topic import Topic
 
+_CONFLICT_ERROR_CODES = (
+    StatusCode.FAILED_PRECONDITION, StatusCode.ALREADY_EXISTS)
+
 
 class _PublisherAPI(object):
     """Helper mapping publisher-related APIs.
@@ -105,7 +108,7 @@ def topic_create(self, topic_path):
         try:
             topic_pb = self._gax_api.create_topic(topic_path)
         except GaxError as exc:
-            if exc_to_code(exc.cause) == StatusCode.FAILED_PRECONDITION:
+            if exc_to_code(exc.cause) in _CONFLICT_ERROR_CODES:
                 raise Conflict(topic_path)
             raise
         return {'name': topic_pb.name}
@@ -337,7 +340,7 @@ def subscription_create(self, subscription_path, topic_path,
                 retain_acked_messages=retain_acked_messages,
                 message_retention_duration=message_retention_duration)
         except GaxError as exc:
-            if exc_to_code(exc.cause) == StatusCode.FAILED_PRECONDITION:
+            if exc_to_code(exc.cause) in _CONFLICT_ERROR_CODES:
                 raise Conflict(topic_path)
             raise
         return MessageToDict(sub_pb)
@@ -584,7 +587,7 @@ def snapshot_create(self, snapshot_path, subscription_path):
             snapshot_pb = self._gax_api.create_snapshot(
                 snapshot_path, subscription_path)
         except GaxError as exc:
-            if exc_to_code(exc.cause) == StatusCode.FAILED_PRECONDITION:
+            if exc_to_code(exc.cause) in _CONFLICT_ERROR_CODES:
                 raise Conflict(snapshot_path)
             elif exc_to_code(exc.cause) == StatusCode.NOT_FOUND:
                 raise NotFound(subscription_path)
diff --git a/pubsub/tests/system.py b/pubsub/tests/system.py
index acdbde0dffca4..d55011a5254ec 100644
--- a/pubsub/tests/system.py
+++ b/pubsub/tests/system.py
@@ -22,6 +22,7 @@
 import httplib2
 
 from google.cloud.environment_vars import PUBSUB_EMULATOR
+from google.cloud.exceptions import Conflict
 from google.cloud.pubsub import client
 
 from test_utils.retry import RetryInstanceState
@@ -113,6 +114,9 @@ def test_create_topic(self):
         self.assertTrue(topic.exists())
         self.assertEqual(topic.name, topic_name)
 
+        with self.assertRaises(Conflict):
+            topic.create()
+
     def test_list_topics(self):
         before = _consume_topics(Config.CLIENT)
         topics_to_create = [
@@ -152,6 +156,9 @@ def test_create_subscription_defaults(self):
         self.assertEqual(subscription.name, SUBSCRIPTION_NAME)
         self.assertIs(subscription.topic, topic)
 
+        with self.assertRaises(Conflict):
+            subscription.create()
+
     def test_create_subscription_w_ack_deadline(self):
         TOPIC_NAME = 'create-sub-ack' + unique_resource_id('-')
         topic = Config.CLIENT.topic(TOPIC_NAME)
@@ -350,6 +357,9 @@ def full_name(obj):
         self.assertIn(snapshot.full_name, map(full_name, after_snapshots))
         self.assertNotIn(snapshot.full_name, map(full_name, before_snapshots))
 
+        with self.assertRaises(Conflict):
+            snapshot.create()
+
 
     def test_seek(self):
         TOPIC_NAME = 'seek-e2e' + unique_resource_id('-')
diff --git a/pubsub/tests/unit/test__gax.py b/pubsub/tests/unit/test__gax.py
index 2bd7983b40afa..dd2ea8077f84b 100644
--- a/pubsub/tests/unit/test__gax.py
+++ b/pubsub/tests/unit/test__gax.py
@@ -141,10 +141,24 @@ def test_topic_create(self):
         self.assertEqual(topic_path, self.TOPIC_PATH)
         self.assertIsNone(options)
 
+    def test_topic_create_failed_precondition(self):
+        from google.cloud.exceptions import Conflict
+
+        gax_api = _GAXPublisherAPI(_create_topic_failed_precondition=True)
+        client = _Client(self.PROJECT)
+        api = self._make_one(gax_api, client)
+
+        with self.assertRaises(Conflict):
+            api.topic_create(self.TOPIC_PATH)
+
+        topic_path, options = gax_api._create_topic_called_with
+        self.assertEqual(topic_path, self.TOPIC_PATH)
+        self.assertIsNone(options)
+
     def test_topic_create_already_exists(self):
         from google.cloud.exceptions import Conflict
 
-        gax_api = _GAXPublisherAPI(_create_topic_conflict=True)
+        gax_api = _GAXPublisherAPI(_create_topic_already_exists=True)
         client = _Client(self.PROJECT)
         api = self._make_one(gax_api, client)
 
@@ -597,11 +611,35 @@ def test_subscription_create_optional_params(self):
                          expected_message_retention_duration.total_seconds())
         self.assertIsNone(options)
 
+    def test_subscription_create_failed_precondition(self):
+        from google.cloud.exceptions import Conflict
+
+        DEADLINE = 600
+        gax_api = _GAXSubscriberAPI(
+            _create_subscription_failed_precondition=True)
+        client = _Client(self.PROJECT)
+        api = self._make_one(gax_api, client)
+
+        with self.assertRaises(Conflict):
+            api.subscription_create(
+                self.SUB_PATH, self.TOPIC_PATH, DEADLINE, self.PUSH_ENDPOINT)
+
+        (name, topic, push_config, ack_deadline, retain_acked_messages,
+         message_retention_duration, options) = (
+            gax_api._create_subscription_called_with)
+        self.assertEqual(name, self.SUB_PATH)
+        self.assertEqual(topic, self.TOPIC_PATH)
+        self.assertEqual(push_config.push_endpoint, self.PUSH_ENDPOINT)
+        self.assertEqual(ack_deadline, DEADLINE)
+        self.assertIsNone(retain_acked_messages)
+        self.assertIsNone(message_retention_duration)
+        self.assertIsNone(options)
+
     def test_subscription_create_already_exists(self):
         from google.cloud.exceptions import Conflict
 
         DEADLINE = 600
-        gax_api = _GAXSubscriberAPI(_create_subscription_conflict=True)
+        gax_api = _GAXSubscriberAPI(_create_subscription_already_exists=True)
         client = _Client(self.PROJECT)
         api = self._make_one(gax_api, client)
 
@@ -1121,10 +1159,26 @@ def test_snapshot_create(self):
         self.assertEqual(subscription, self.SUB_PATH)
         self.assertIsNone(options)
 
+    def test_snapshot_create_failed_precondition(self):
+        from google.cloud.exceptions import Conflict
+
+        gax_api = _GAXSubscriberAPI(_create_snapshot_failed_precondition=True)
+        client = _Client(self.PROJECT)
+        api = self._make_one(gax_api, client)
+
+        with self.assertRaises(Conflict):
+            api.snapshot_create(self.SNAPSHOT_PATH, self.SUB_PATH)
+
+        name, subscription, options = (
+            gax_api._create_snapshot_called_with)
+        self.assertEqual(name, self.SNAPSHOT_PATH)
+        self.assertEqual(subscription, self.SUB_PATH)
+        self.assertIsNone(options)
+
     def test_snapshot_create_already_exists(self):
         from google.cloud.exceptions import Conflict
 
-        gax_api = _GAXSubscriberAPI(_create_snapshot_conflict=True)
+        gax_api = _GAXSubscriberAPI(_create_snapshot_already_exists=True)
         client = _Client(self.PROJECT)
         api = self._make_one(gax_api, client)
 
@@ -1371,7 +1425,8 @@ def mock_insecure_channel(host):
 
 class _GAXPublisherAPI(_GAXBaseAPI):
 
-    _create_topic_conflict = False
+    _create_topic_failed_precondition = False
+    _create_topic_already_exists = False
 
     def list_topics(self, name, page_size, options):
         self._list_topics_called_with = name, page_size, options
@@ -1383,8 +1438,10 @@ def create_topic(self, name, options=None):
         self._create_topic_called_with = name, options
         if self._random_gax_error:
             raise GaxError('error')
-        if self._create_topic_conflict:
+        if self._create_topic_failed_precondition:
             raise GaxError('conflict', self._make_grpc_failed_precondition())
+        if self._create_topic_already_exists:
+            raise GaxError('conflict', self._make_grpc_already_exists())
         return self._create_topic_response
 
     def get_topic(self, name, options=None):
@@ -1432,8 +1489,10 @@ def list_topic_subscriptions(self, topic, page_size, options=None):
 
 class _GAXSubscriberAPI(_GAXBaseAPI):
 
-    _create_snapshot_conflict = False
-    _create_subscription_conflict = False
+    _create_snapshot_already_exists = False
+    _create_snapshot_failed_precondition = False
+    _create_subscription_already_exists = False
+    _create_subscription_failed_precondition = False
     _modify_push_config_ok = False
     _acknowledge_ok = False
     _modify_ack_deadline_ok = False
@@ -1456,8 +1515,10 @@ def create_subscription(self, name, topic, push_config=None,
             retain_acked_messages, message_retention_duration, options)
         if self._random_gax_error:
             raise GaxError('error')
-        if self._create_subscription_conflict:
+        if self._create_subscription_failed_precondition:
             raise GaxError('conflict', self._make_grpc_failed_precondition())
+        if self._create_subscription_already_exists:
+            raise GaxError('conflict', self._make_grpc_already_exists())
         return self._create_subscription_response
 
     def get_subscription(self, name, options=None):
@@ -1533,7 +1594,9 @@ def create_snapshot(self, name, subscription, options=None):
         self._create_snapshot_called_with = (name, subscription, options)
         if self._random_gax_error:
             raise GaxError('error')
-        if self._create_snapshot_conflict:
+        if self._create_snapshot_already_exists:
+            raise GaxError('conflict', self._make_grpc_already_exists())
+        if self._create_snapshot_failed_precondition:
             raise GaxError('conflict', self._make_grpc_failed_precondition())
         if self._snapshot_create_subscription_miss:
             raise GaxError('miss', self._make_grpc_not_found())

From b67570f61d629d35f51edd06e5fa50e4734eafae Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Thu, 8 Jun 2017 07:56:44 -0700
Subject: [PATCH 021/211] Remove a reference to language API as beta. (#3487)

---
 docs/language/usage.rst | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs/language/usage.rst b/docs/language/usage.rst
index 9b9cfb9cde6a0..2a8c9ddba5894 100644
--- a/docs/language/usage.rst
+++ b/docs/language/usage.rst
@@ -19,11 +19,6 @@ customer conversations happening in a call center or a messaging
 app. You can analyze text uploaded in your request or integrate
 with your document storage on Google Cloud Storage.
 
-.. warning::
-
-   This is a Beta release of Google Cloud Natural Language API. This
-   API is not intended for real-time usage in critical applications.
-
 .. _Google Natural Language: https://cloud.google.com/natural-language/docs/getting-started
 
 Client

From 8682e5327fdb678f193ab2ca930dfebef34d0d41 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Thu, 8 Jun 2017 16:15:41 -0700
Subject: [PATCH 022/211] Adding datastore Key.(to|from)_legacy_urlsafe.
 (#3491)

* Adding bare-minimum proto for converting legacy App Engine "Reference" pbs.

* Rough draft of working implementation of datastore Key.(to|from)_legacy_urlsafe.

Needs more tests but wanted to get the PR in front of reviewers ASAP.

* Adding implementation for datastore Key.to_legacy_urlsafe().

Also resolved some lint issues (line too long) and restructured
unit test to be able to re-use "stored" values.

* Adding _onestore_v3_pb2 to ignored files for flake8.

* Addressing @jonparrott feedback.

In particular:

- Just splitting on ~ when cleaning app strings
- Rewording to_legacy_urlsafe() docstring to invoke `ndb.Key(urlsafe=...)`
  and to restate the "returns" text
- Removing the _urlsafe_b64(decode|encode) micro-optimizations that
  were brought over from the ndb codebase

* Adding test coverage for helpers needed for Key.(to|from)_legacy_urlsafe.

* Adding LICENSE header to hand-written legacy GAE proto.

* Renaming _onestore_v3.proto --> _app_engine_key.proto.
---
 datastore/.coveragerc                         |   2 +
 datastore/.flake8                             |   5 +
 .../cloud/datastore/_app_engine_key.proto     |  30 ++
 .../cloud/datastore/_app_engine_key_pb2.py    | 184 ++++++++++++
 datastore/google/cloud/datastore/key.py       | 205 ++++++++++++-
 datastore/tests/unit/test_key.py              | 277 ++++++++++++++++++
 6 files changed, 702 insertions(+), 1 deletion(-)
 create mode 100644 datastore/google/cloud/datastore/_app_engine_key.proto
 create mode 100644 datastore/google/cloud/datastore/_app_engine_key_pb2.py

diff --git a/datastore/.coveragerc b/datastore/.coveragerc
index a54b99aa14b7a..1596e4637d3f7 100644
--- a/datastore/.coveragerc
+++ b/datastore/.coveragerc
@@ -2,6 +2,8 @@
 branch = True
 
 [report]
+omit =
+    _app_engine_key_pb2.py
 fail_under = 100
 show_missing = True
 exclude_lines =
diff --git a/datastore/.flake8 b/datastore/.flake8
index 25168dc87605d..2feb7fefea2af 100644
--- a/datastore/.flake8
+++ b/datastore/.flake8
@@ -1,5 +1,10 @@
 [flake8]
 exclude =
+  # Datastore includes generated code in the manual layer;
+  # do not lint this.
+  google/cloud/datastore/_app_engine_key_pb2.py,
+
+  # Standard linting exemptions.
   __pycache__,
   .git,
   *.pyc,
diff --git a/datastore/google/cloud/datastore/_app_engine_key.proto b/datastore/google/cloud/datastore/_app_engine_key.proto
new file mode 100644
index 0000000000000..7248f1a4e4ef3
--- /dev/null
+++ b/datastore/google/cloud/datastore/_app_engine_key.proto
@@ -0,0 +1,30 @@
+// Copyright 2017 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto2";
+
+message Reference {
+  required string app = 13;
+  optional string name_space = 20;
+  required Path path = 14;
+  optional string database_id = 23;
+}
+
+message Path {
+  repeated group Element = 1 {
+    required string type = 2;
+    optional int64 id = 3;
+    optional string name = 4;
+  }
+}
diff --git a/datastore/google/cloud/datastore/_app_engine_key_pb2.py b/datastore/google/cloud/datastore/_app_engine_key_pb2.py
new file mode 100644
index 0000000000000..bbb1c75b80dfb
--- /dev/null
+++ b/datastore/google/cloud/datastore/_app_engine_key_pb2.py
@@ -0,0 +1,184 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: _app_engine_key.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf import descriptor_pb2
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='_app_engine_key.proto',
+  package='',
+  syntax='proto2',
+  serialized_pb=_b('\n\x15_app_engine_key.proto\"V\n\tReference\x12\x0b\n\x03\x61pp\x18\r \x02(\t\x12\x12\n\nname_space\x18\x14 \x01(\t\x12\x13\n\x04path\x18\x0e \x02(\x0b\x32\x05.Path\x12\x13\n\x0b\x64\x61tabase_id\x18\x17 \x01(\t\"Y\n\x04Path\x12\x1e\n\x07\x65lement\x18\x01 \x03(\n2\r.Path.Element\x1a\x31\n\x07\x45lement\x12\x0c\n\x04type\x18\x02 \x02(\t\x12\n\n\x02id\x18\x03 \x01(\x03\x12\x0c\n\x04name\x18\x04 \x01(\t')
+)
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+
+
+
+_REFERENCE = _descriptor.Descriptor(
+  name='Reference',
+  full_name='Reference',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='app', full_name='Reference.app', index=0,
+      number=13, type=9, cpp_type=9, label=2,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='name_space', full_name='Reference.name_space', index=1,
+      number=20, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='path', full_name='Reference.path', index=2,
+      number=14, type=11, cpp_type=10, label=2,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='database_id', full_name='Reference.database_id', index=3,
+      number=23, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto2',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=25,
+  serialized_end=111,
+)
+
+
+_PATH_ELEMENT = _descriptor.Descriptor(
+  name='Element',
+  full_name='Path.Element',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='type', full_name='Path.Element.type', index=0,
+      number=2, type=9, cpp_type=9, label=2,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='id', full_name='Path.Element.id', index=1,
+      number=3, type=3, cpp_type=2, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='name', full_name='Path.Element.name', index=2,
+      number=4, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto2',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=153,
+  serialized_end=202,
+)
+
+_PATH = _descriptor.Descriptor(
+  name='Path',
+  full_name='Path',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='element', full_name='Path.element', index=0,
+      number=1, type=10, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[_PATH_ELEMENT, ],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto2',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=113,
+  serialized_end=202,
+)
+
+_REFERENCE.fields_by_name['path'].message_type = _PATH
+_PATH_ELEMENT.containing_type = _PATH
+_PATH.fields_by_name['element'].message_type = _PATH_ELEMENT
+DESCRIPTOR.message_types_by_name['Reference'] = _REFERENCE
+DESCRIPTOR.message_types_by_name['Path'] = _PATH
+
+Reference = _reflection.GeneratedProtocolMessageType('Reference', (_message.Message,), dict(
+  DESCRIPTOR = _REFERENCE,
+  __module__ = '_app_engine_key_pb2'
+  # @@protoc_insertion_point(class_scope:Reference)
+  ))
+_sym_db.RegisterMessage(Reference)
+
+Path = _reflection.GeneratedProtocolMessageType('Path', (_message.Message,), dict(
+
+  Element = _reflection.GeneratedProtocolMessageType('Element', (_message.Message,), dict(
+    DESCRIPTOR = _PATH_ELEMENT,
+    __module__ = '_app_engine_key_pb2'
+    # @@protoc_insertion_point(class_scope:Path.Element)
+    ))
+  ,
+  DESCRIPTOR = _PATH,
+  __module__ = '_app_engine_key_pb2'
+  # @@protoc_insertion_point(class_scope:Path)
+  ))
+_sym_db.RegisterMessage(Path)
+_sym_db.RegisterMessage(Path.Element)
+
+
+# @@protoc_insertion_point(module_scope)
diff --git a/datastore/google/cloud/datastore/key.py b/datastore/google/cloud/datastore/key.py
index 5ae08c5642cab..166a5afde46b9 100644
--- a/datastore/google/cloud/datastore/key.py
+++ b/datastore/google/cloud/datastore/key.py
@@ -14,11 +14,28 @@
 
 """Create / interact with Google Cloud Datastore keys."""
 
+import base64
 import copy
 import six
 
 from google.cloud.proto.datastore.v1 import entity_pb2 as _entity_pb2
 
+from google.cloud._helpers import _to_bytes
+from google.cloud.datastore import _app_engine_key_pb2
+
+
+_DATABASE_ID_TEMPLATE = (
+    'Received non-empty database ID: {!r}.\n'
+    'urlsafe strings are not expected to encode a Reference that '
+    'contains a database ID.')
+_BAD_ELEMENT_TEMPLATE = (
+    'At most one of ID and name can be set on an element. Received '
+    'id = {!r} and name = {!r}.')
+_EMPTY_ELEMENT = (
+    'Exactly one of ID and name must be set on an element. '
+    'Encountered an element with neither set that was not the last '
+    'element of a path.')
+
 
 class Key(object):
     """An immutable representation of a datastore Key.
@@ -79,7 +96,7 @@ class Key(object):
 
     * namespace (string): A namespace identifier for the key.
     * project (string): The project associated with the key.
-    * parent (:class:`google.cloud.datastore.key.Key`): The parent of the key.
+    * parent (:class:`~google.cloud.datastore.key.Key`): The parent of the key.
 
     The project argument is required unless it has been set implicitly.
     """
@@ -281,6 +298,53 @@ def to_protobuf(self):
 
         return key
 
+    def to_legacy_urlsafe(self):
+        """Convert to a base64 encode urlsafe string for App Engine.
+
+        This is intended to work with the "legacy" representation of a
+        datastore "Key" used within Google App Engine (a so-called
+        "Reference"). The returned string can be used as the ``urlsafe``
+        argument to ``ndb.Key(urlsafe=...)``.
+
+        :rtype: bytes
+        :returns: A bytestring containing the key encoded as URL-safe base64.
+        """
+        reference = _app_engine_key_pb2.Reference(
+            app=self.project,
+            path=_to_legacy_path(self._path),  # Avoid the copy.
+            name_space=self.namespace,
+        )
+        raw_bytes = reference.SerializeToString()
+        return base64.urlsafe_b64encode(raw_bytes)
+
+    @classmethod
+    def from_legacy_urlsafe(cls, urlsafe):
+        """Convert urlsafe string to :class:`~google.cloud.datastore.key.Key`.
+
+        This is intended to work with the "legacy" representation of a
+        datastore "Key" used within Google App Engine (a so-called
+        "Reference"). This assumes that ``urlsafe`` was created within an App
+        Engine app via something like ``ndb.Key(...).urlsafe()``.
+
+        :type urlsafe: bytes or unicode
+        :param urlsafe: The base64 encoded (ASCII) string corresponding to a
+                        datastore "Key" / "Reference".
+
+        :rtype: :class:`~google.cloud.datastore.key.Key`.
+        :returns: The key corresponding to ``urlsafe``.
+        """
+        urlsafe = _to_bytes(urlsafe, encoding='ascii')
+        raw_bytes = base64.urlsafe_b64decode(urlsafe)
+
+        reference = _app_engine_key_pb2.Reference()
+        reference.ParseFromString(raw_bytes)
+
+        project = _clean_app(reference.app)
+        namespace = _get_empty(reference.name_space, u'')
+        _check_database_id(reference.database_id)
+        flat_path = _get_flat_path(reference.path)
+        return cls(*flat_path, project=project, namespace=namespace)
+
     @property
     def is_partial(self):
         """Boolean indicating if the key has an ID (or name).
@@ -427,3 +491,142 @@ def _validate_project(project, parent):
             raise ValueError("A Key must have a project set.")
 
     return project
+
+
+def _clean_app(app_str):
+    """Clean a legacy (i.e. from App Engine) app string.
+
+    :type app_str: str
+    :param app_str: The ``app`` value stored in a "Reference" pb.
+
+    :rtype: str
+    :returns: The cleaned value.
+    """
+    parts = app_str.split('~', 1)
+    return parts[-1]
+
+
+def _get_empty(value, empty_value):
+    """Check if a protobuf field is "empty".
+
+    :type value: object
+    :param value: A basic field from a protobuf.
+
+    :type empty_value: object
+    :param empty_value: The "empty" value for the same type as
+                        ``value``.
+    """
+    if value == empty_value:
+        return None
+    else:
+        return value
+
+
+def _check_database_id(database_id):
+    """Make sure a "Reference" database ID is empty.
+
+    :type database_id: unicode
+    :param database_id: The ``database_id`` field from a "Reference" protobuf.
+
+    :raises: :exc:`ValueError` if the ``database_id`` is not empty.
+    """
+    if database_id != u'':
+        msg = _DATABASE_ID_TEMPLATE.format(database_id)
+        raise ValueError(msg)
+
+
+def _add_id_or_name(flat_path, element_pb, empty_allowed):
+    """Add the ID or name from an element to a list.
+
+    :type flat_path: list
+    :param flat_path: List of accumulated path parts.
+
+    :type element_pb: :class:`._app_engine_key_pb2.Path.Element`
+    :param element_pb: The element containing ID or name.
+
+    :type empty_allowed: bool
+    :param empty_allowed: Indicates if neither ID or name need be set. If
+                          :data:`False`, then **exactly** one of them must be.
+
+    :raises: :exc:`ValueError` if 0 or 2 of ID/name are set (unless
+             ``empty_allowed=True`` and 0 are set).
+    """
+    id_ = element_pb.id
+    name = element_pb.name
+    # NOTE: Below 0 and the empty string are the "null" values for their
+    #       respective types, indicating that the value is unset.
+    if id_ == 0:
+        if name == u'':
+            if not empty_allowed:
+                raise ValueError(_EMPTY_ELEMENT)
+        else:
+            flat_path.append(name)
+    else:
+        if name == u'':
+            flat_path.append(id_)
+        else:
+            msg = _BAD_ELEMENT_TEMPLATE.format(id_, name)
+            raise ValueError(msg)
+
+
+def _get_flat_path(path_pb):
+    """Convert a legacy "Path" protobuf to a flat path.
+
+    For example
+
+        Element {
+          type: "parent"
+          id: 59
+        }
+        Element {
+          type: "child"
+          name: "naem"
+        }
+
+    would convert to ``('parent', 59, 'child', 'naem')``.
+
+    :type path_pb: :class:`._app_engine_key_pb2.Path`
+    :param path_pb: Legacy protobuf "Path" object (from a "Reference").
+
+    :rtype: tuple
+    :returns: The path parts from ``path_pb``.
+    """
+    num_elts = len(path_pb.element)
+    last_index = num_elts - 1
+
+    result = []
+    for index, element in enumerate(path_pb.element):
+        result.append(element.type)
+        _add_id_or_name(result, element, index == last_index)
+
+    return tuple(result)
+
+
+def _to_legacy_path(dict_path):
+    """Convert a tuple of ints and strings in a legacy "Path".
+
+    .. note:
+
+        This assumes, but does not verify, that each entry in
+        ``dict_path`` is valid (i.e. doesn't have more than one
+        key out of "name" / "id").
+
+    :type dict_path: lsit
+    :param dict_path: The "structured" path for a key, i.e. it
+                      is a list of dictionaries, each of which has
+                      "kind" and one of "name" / "id" as keys.
+
+    :rtype: :class:`._app_engine_key_pb2.Path`
+    :returns: The legacy path corresponding to ``dict_path``.
+    """
+    elements = []
+    for part in dict_path:
+        element_kwargs = {'type': part['kind']}
+        if 'id' in part:
+            element_kwargs['id'] = part['id']
+        elif 'name' in part:
+            element_kwargs['name'] = part['name']
+        element = _app_engine_key_pb2.Path.Element(**element_kwargs)
+        elements.append(element)
+
+    return _app_engine_key_pb2.Path(element=elements)
diff --git a/datastore/tests/unit/test_key.py b/datastore/tests/unit/test_key.py
index 904338368c022..5b89e146254d8 100644
--- a/datastore/tests/unit/test_key.py
+++ b/datastore/tests/unit/test_key.py
@@ -18,6 +18,20 @@
 class TestKey(unittest.TestCase):
 
     _DEFAULT_PROJECT = 'PROJECT'
+    # NOTE: This comes directly from a running (in the dev appserver)
+    #       App Engine app. Created via:
+    #
+    #           from google.appengine.ext import ndb
+    #           key = ndb.Key(
+    #               'Parent', 59, 'Child', 'Feather',
+    #               namespace='space', app='s~sample-app')
+    #           urlsafe = key.urlsafe()
+    _URLSAFE_EXAMPLE = (
+        b'agxzfnNhbXBsZS1hcHByHgsSBlBhcmVudBg7DAsSBUNoaWxkIgdGZ'
+        b'WF0aGVyDKIBBXNwYWNl')
+    _URLSAFE_APP = 's~sample-app'
+    _URLSAFE_NAMESPACE = 'space'
+    _URLSAFE_FLAT_PATH = ('Parent', 59, 'Child', 'Feather')
 
     @staticmethod
     def _get_target_class():
@@ -372,6 +386,27 @@ def test_to_protobuf_w_no_kind(self):
         # Unset values are False-y.
         self.assertEqual(pb.path[0].kind, '')
 
+    def test_to_legacy_urlsafe(self):
+        key = self._make_one(
+            *self._URLSAFE_FLAT_PATH,
+            project=self._URLSAFE_APP,
+            namespace=self._URLSAFE_NAMESPACE)
+        # NOTE: ``key.project`` is somewhat "invalid" but that is OK.
+        urlsafe = key.to_legacy_urlsafe()
+        self.assertEqual(urlsafe, self._URLSAFE_EXAMPLE)
+
+    def test_from_legacy_urlsafe(self):
+        klass = self._get_target_class()
+        key = klass.from_legacy_urlsafe(self._URLSAFE_EXAMPLE)
+
+        self.assertEqual('s~' + key.project, self._URLSAFE_APP)
+        self.assertEqual(key.namespace, self._URLSAFE_NAMESPACE)
+        self.assertEqual(key.flat_path, self._URLSAFE_FLAT_PATH)
+        # Also make sure we didn't accidentally set the parent.
+        self.assertIsNone(key._parent)
+        self.assertIsNotNone(key.parent)
+        self.assertIs(key._parent, key.parent)
+
     def test_is_partial_no_name_or_id(self):
         key = self._make_one('KIND', project=self._DEFAULT_PROJECT)
         self.assertTrue(key.is_partial)
@@ -431,3 +466,245 @@ def test_parent_multiple_calls(self):
         self.assertEqual(parent.path, _PARENT_PATH)
         new_parent = key.parent
         self.assertIs(parent, new_parent)
+
+
+class Test__clean_app(unittest.TestCase):
+
+    PROJECT = 'my-prahjekt'
+
+    @staticmethod
+    def _call_fut(app_str):
+        from google.cloud.datastore.key import _clean_app
+
+        return _clean_app(app_str)
+
+    def test_already_clean(self):
+        app_str = self.PROJECT
+        self.assertEqual(self._call_fut(app_str), self.PROJECT)
+
+    def test_standard(self):
+        app_str = 's~' + self.PROJECT
+        self.assertEqual(self._call_fut(app_str), self.PROJECT)
+
+    def test_european(self):
+        app_str = 'e~' + self.PROJECT
+        self.assertEqual(self._call_fut(app_str), self.PROJECT)
+
+    def test_dev_server(self):
+        app_str = 'dev~' + self.PROJECT
+        self.assertEqual(self._call_fut(app_str), self.PROJECT)
+
+
+class Test__get_empty(unittest.TestCase):
+
+    @staticmethod
+    def _call_fut(value, empty_value):
+        from google.cloud.datastore.key import _get_empty
+
+        return _get_empty(value, empty_value)
+
+    def test_unset(self):
+        for empty_value in (u'', 0, 0.0, []):
+            ret_val = self._call_fut(empty_value, empty_value)
+            self.assertIsNone(ret_val)
+
+    def test_actually_set(self):
+        value_pairs = (
+            (u'hello', u''),
+            (10, 0),
+            (3.14, 0.0),
+            (['stuff', 'here'], []),
+        )
+        for value, empty_value in value_pairs:
+            ret_val = self._call_fut(value, empty_value)
+            self.assertIs(ret_val, value)
+
+
+class Test__check_database_id(unittest.TestCase):
+
+    @staticmethod
+    def _call_fut(database_id):
+        from google.cloud.datastore.key import _check_database_id
+
+        return _check_database_id(database_id)
+
+    def test_empty_value(self):
+        ret_val = self._call_fut(u'')
+        # Really we are just happy there was no exception.
+        self.assertIsNone(ret_val)
+
+    def test_failure(self):
+        with self.assertRaises(ValueError):
+            self._call_fut(u'some-database-id')
+
+
+class Test__add_id_or_name(unittest.TestCase):
+
+    @staticmethod
+    def _call_fut(flat_path, element_pb, empty_allowed):
+        from google.cloud.datastore.key import _add_id_or_name
+
+        return _add_id_or_name(flat_path, element_pb, empty_allowed)
+
+    def test_add_id(self):
+        flat_path = []
+        id_ = 123
+        element_pb = _make_element_pb(id=id_)
+
+        ret_val = self._call_fut(flat_path, element_pb, False)
+        self.assertIsNone(ret_val)
+        self.assertEqual(flat_path, [id_])
+        ret_val = self._call_fut(flat_path, element_pb, True)
+        self.assertIsNone(ret_val)
+        self.assertEqual(flat_path, [id_, id_])
+
+    def test_add_name(self):
+        flat_path = []
+        name = 'moon-shadow'
+        element_pb = _make_element_pb(name=name)
+
+        ret_val = self._call_fut(flat_path, element_pb, False)
+        self.assertIsNone(ret_val)
+        self.assertEqual(flat_path, [name])
+        ret_val = self._call_fut(flat_path, element_pb, True)
+        self.assertIsNone(ret_val)
+        self.assertEqual(flat_path, [name, name])
+
+    def test_both_present(self):
+        element_pb = _make_element_pb(id=17, name='seventeen')
+        flat_path = []
+        with self.assertRaises(ValueError):
+            self._call_fut(flat_path, element_pb, False)
+        with self.assertRaises(ValueError):
+            self._call_fut(flat_path, element_pb, True)
+
+        self.assertEqual(flat_path, [])
+
+    def test_both_empty_failure(self):
+        element_pb = _make_element_pb()
+        flat_path = []
+        with self.assertRaises(ValueError):
+            self._call_fut(flat_path, element_pb, False)
+
+        self.assertEqual(flat_path, [])
+
+    def test_both_empty_allowed(self):
+        element_pb = _make_element_pb()
+        flat_path = []
+        ret_val = self._call_fut(flat_path, element_pb, True)
+        self.assertIsNone(ret_val)
+        self.assertEqual(flat_path, [])
+
+
+class Test__get_flat_path(unittest.TestCase):
+
+    @staticmethod
+    def _call_fut(path_pb):
+        from google.cloud.datastore.key import _get_flat_path
+
+        return _get_flat_path(path_pb)
+
+    def test_one_pair(self):
+        kind = 'Widget'
+        name = 'Scooter'
+        element_pb = _make_element_pb(type=kind, name=name)
+        path_pb = _make_path_pb(element_pb)
+        flat_path = self._call_fut(path_pb)
+        self.assertEqual(flat_path, (kind, name))
+
+    def test_two_pairs(self):
+        kind1 = 'parent'
+        id1 = 59
+        element_pb1 = _make_element_pb(type=kind1, id=id1)
+
+        kind2 = 'child'
+        name2 = 'naem'
+        element_pb2 = _make_element_pb(type=kind2, name=name2)
+
+        path_pb = _make_path_pb(element_pb1, element_pb2)
+        flat_path = self._call_fut(path_pb)
+        self.assertEqual(flat_path, (kind1, id1, kind2, name2))
+
+    def test_partial_key(self):
+        kind1 = 'grandparent'
+        name1 = 'cats'
+        element_pb1 = _make_element_pb(type=kind1, name=name1)
+
+        kind2 = 'parent'
+        id2 = 1337
+        element_pb2 = _make_element_pb(type=kind2, id=id2)
+
+        kind3 = 'child'
+        element_pb3 = _make_element_pb(type=kind3)
+
+        path_pb = _make_path_pb(element_pb1, element_pb2, element_pb3)
+        flat_path = self._call_fut(path_pb)
+        self.assertEqual(flat_path, (kind1, name1, kind2, id2, kind3))
+
+
+class Test__to_legacy_path(unittest.TestCase):
+
+    @staticmethod
+    def _call_fut(dict_path):
+        from google.cloud.datastore.key import _to_legacy_path
+
+        return _to_legacy_path(dict_path)
+
+    def test_one_pair(self):
+        kind = 'Widget'
+        name = 'Scooter'
+        dict_path = [{'kind': kind, 'name': name}]
+        path_pb = self._call_fut(dict_path)
+
+        element_pb = _make_element_pb(type=kind, name=name)
+        expected_pb = _make_path_pb(element_pb)
+        self.assertEqual(path_pb, expected_pb)
+
+    def test_two_pairs(self):
+        kind1 = 'parent'
+        id1 = 59
+
+        kind2 = 'child'
+        name2 = 'naem'
+
+        dict_path = [{'kind': kind1, 'id': id1}, {'kind': kind2, 'name': name2}]
+        path_pb = self._call_fut(dict_path)
+
+        element_pb1 = _make_element_pb(type=kind1, id=id1)
+        element_pb2 = _make_element_pb(type=kind2, name=name2)
+        expected_pb = _make_path_pb(element_pb1, element_pb2)
+        self.assertEqual(path_pb, expected_pb)
+
+    def test_partial_key(self):
+        kind1 = 'grandparent'
+        name1 = 'cats'
+
+        kind2 = 'parent'
+        id2 = 1337
+
+        kind3 = 'child'
+
+        dict_path = [
+            {'kind': kind1, 'name': name1},
+            {'kind': kind2, 'id': id2},
+            {'kind': kind3},
+        ]
+        path_pb = self._call_fut(dict_path)
+
+        element_pb1 = _make_element_pb(type=kind1, name=name1)
+        element_pb2 = _make_element_pb(type=kind2, id=id2)
+        element_pb3 = _make_element_pb(type=kind3)
+        expected_pb = _make_path_pb(element_pb1, element_pb2, element_pb3)
+        self.assertEqual(path_pb, expected_pb)
+
+
+def _make_element_pb(**kwargs):
+    from google.cloud.datastore import _app_engine_key_pb2
+
+    return _app_engine_key_pb2.Path.Element(**kwargs)
+
+
+def _make_path_pb(*element_pbs):
+    from google.cloud.datastore import _app_engine_key_pb2
+
+    return _app_engine_key_pb2.Path(element=element_pbs)

From 5697b3a71b8eae4d43110f1fb3546b9851d71775 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Thu, 8 Jun 2017 22:08:17 -0400
Subject: [PATCH 023/211] Make 'QueryResponse.fetch_data' return an iterator.
 (#3484)

Add a system test which exercises it.

Update snippets to match the new usage.

Closes #2840.
---
 bigquery/google/cloud/bigquery/_helpers.py | 41 +++++++++++++++++
 bigquery/google/cloud/bigquery/query.py    | 51 +++++++++++++++-------
 bigquery/google/cloud/bigquery/table.py    | 44 +------------------
 bigquery/tests/system.py                   | 17 ++++++++
 bigquery/tests/unit/test_query.py          | 16 ++++++-
 docs/bigquery/snippets.py                  | 34 +++++----------
 6 files changed, 121 insertions(+), 82 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/_helpers.py b/bigquery/google/cloud/bigquery/_helpers.py
index 201a9c76e555c..7557111d100e2 100644
--- a/bigquery/google/cloud/bigquery/_helpers.py
+++ b/bigquery/google/cloud/bigquery/_helpers.py
@@ -678,3 +678,44 @@ def __set__(self, instance, value):
             raise ValueError(
                 "query parameters must be derived from AbstractQueryParameter")
         instance._query_parameters = tuple(value)
+
+
+def _item_to_row(iterator, resource):
+    """Convert a JSON row to the native object.
+
+    .. note::
+
+        This assumes that the ``schema`` attribute has been
+        added to the iterator after being created, which
+        should be done by the caller.
+
+    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :param iterator: The iterator that is currently in use.
+
+    :type resource: dict
+    :param resource: An item to be converted to a row.
+
+    :rtype: tuple
+    :returns: The next row in the page.
+    """
+    return _row_from_json(resource, iterator.schema)
+
+
+# pylint: disable=unused-argument
+def _rows_page_start(iterator, page, response):
+    """Grab total rows when :class:`~google.cloud.iterator.Page` starts.
+
+    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :param iterator: The iterator that is currently in use.
+
+    :type page: :class:`~google.cloud.iterator.Page`
+    :param page: The page that was just created.
+
+    :type response: dict
+    :param response: The JSON API response for a page of rows in a table.
+    """
+    total_rows = response.get('totalRows')
+    if total_rows is not None:
+        total_rows = int(total_rows)
+    iterator.total_rows = total_rows
+# pylint: enable=unused-argument
diff --git a/bigquery/google/cloud/bigquery/query.py b/bigquery/google/cloud/bigquery/query.py
index ea704bf4a8e5f..6db2742bbe013 100644
--- a/bigquery/google/cloud/bigquery/query.py
+++ b/bigquery/google/cloud/bigquery/query.py
@@ -16,6 +16,7 @@
 
 import six
 
+from google.cloud.iterator import HTTPIterator
 from google.cloud.bigquery._helpers import _TypedProperty
 from google.cloud.bigquery._helpers import _rows_from_json
 from google.cloud.bigquery.dataset import Dataset
@@ -23,6 +24,8 @@
 from google.cloud.bigquery.table import _parse_schema_resource
 from google.cloud.bigquery._helpers import QueryParametersProperty
 from google.cloud.bigquery._helpers import UDFResourcesProperty
+from google.cloud.bigquery._helpers import _item_to_row
+from google.cloud.bigquery._helpers import _rows_page_start
 
 
 class _SyncQueryConfiguration(object):
@@ -426,12 +429,6 @@ def fetch_data(self, max_results=None, page_token=None, start_index=None,
         client = self._require_client(client)
         params = {}
 
-        if max_results is not None:
-            params['maxResults'] = max_results
-
-        if page_token is not None:
-            params['pageToken'] = page_token
-
         if start_index is not None:
             params['startIndex'] = start_index
 
@@ -439,15 +436,37 @@ def fetch_data(self, max_results=None, page_token=None, start_index=None,
             params['timeoutMs'] = timeout_ms
 
         path = '/projects/%s/queries/%s' % (self.project, self.name)
-        response = client._connection.api_request(method='GET',
-                                                  path=path,
-                                                  query_params=params)
-        self._set_properties(response)
+        iterator = HTTPIterator(client=client, path=path,
+                                item_to_value=_item_to_row,
+                                items_key='rows',
+                                page_token=page_token,
+                                max_results=max_results,
+                                page_start=_rows_page_start_query,
+                                extra_params=params)
+        iterator.query_result = self
+        # Over-ride the key used to retrieve the next page token.
+        iterator._NEXT_TOKEN = 'pageToken'
+        return iterator
 
-        total_rows = response.get('totalRows')
-        if total_rows is not None:
-            total_rows = int(total_rows)
-        page_token = response.get('pageToken')
-        rows_data = _rows_from_json(response.get('rows', ()), self.schema)
 
-        return rows_data, total_rows, page_token
+def _rows_page_start_query(iterator, page, response):
+    """Update query response when :class:`~google.cloud.iterator.Page` starts.
+
+    .. note::
+
+        This assumes that the ``query_response`` attribute has been
+        added to the iterator after being created, which
+        should be done by the caller.
+
+    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :param iterator: The iterator that is currently in use.
+
+    :type page: :class:`~google.cloud.iterator.Page`
+    :param page: The page that was just created.
+
+    :type response: dict
+    :param response: The JSON API response for a page of rows in a table.
+    """
+    iterator.query_result._set_properties(response)
+    iterator.schema = iterator.query_result.schema
+    _rows_page_start(iterator, page, response)
diff --git a/bigquery/google/cloud/bigquery/table.py b/bigquery/google/cloud/bigquery/table.py
index 92ebfebb2d6ec..662cc670d5415 100644
--- a/bigquery/google/cloud/bigquery/table.py
+++ b/bigquery/google/cloud/bigquery/table.py
@@ -32,7 +32,8 @@
 from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
 from google.cloud.streaming.transfer import Upload
 from google.cloud.bigquery.schema import SchemaField
-from google.cloud.bigquery._helpers import _row_from_json
+from google.cloud.bigquery._helpers import _item_to_row
+from google.cloud.bigquery._helpers import _rows_page_start
 from google.cloud.bigquery._helpers import _SCALAR_VALUE_TO_JSON_ROW
 
 
@@ -1076,47 +1077,6 @@ def _build_schema_resource(fields):
     return infos
 
 
-def _item_to_row(iterator, resource):
-    """Convert a JSON row to the native object.
-
-    .. note::
-
-        This assumes that the ``schema`` attribute has been
-        added to the iterator after being created, which
-        should be done by the caller.
-
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
-    :param iterator: The iterator that is currently in use.
-
-    :type resource: dict
-    :param resource: An item to be converted to a row.
-
-    :rtype: tuple
-    :returns: The next row in the page.
-    """
-    return _row_from_json(resource, iterator.schema)
-
-
-# pylint: disable=unused-argument
-def _rows_page_start(iterator, page, response):
-    """Grab total rows after a :class:`~google.cloud.iterator.Page` started.
-
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
-    :param iterator: The iterator that is currently in use.
-
-    :type page: :class:`~google.cloud.iterator.Page`
-    :param page: The page that was just created.
-
-    :type response: dict
-    :param response: The JSON API response for a page of rows in a table.
-    """
-    total_rows = response.get('totalRows')
-    if total_rows is not None:
-        total_rows = int(total_rows)
-    iterator.total_rows = total_rows
-# pylint: enable=unused-argument
-
-
 class _UploadConfig(object):
     """Faux message FBO apitools' 'configure_request'."""
     accept = ['*/*']
diff --git a/bigquery/tests/system.py b/bigquery/tests/system.py
index 210951305b443..456953194a530 100644
--- a/bigquery/tests/system.py
+++ b/bigquery/tests/system.py
@@ -830,6 +830,23 @@ def test_dump_table_w_public_data(self):
         table.reload()
         self._fetch_single_page(table)
 
+    def test_large_query_w_public_data(self):
+        PUBLIC = 'bigquery-public-data'
+        DATASET_NAME = 'samples'
+        TABLE_NAME = 'natality'
+        LIMIT = 1000
+        SQL = 'SELECT * from `{}.{}.{}` LIMIT {}'.format(
+            PUBLIC, DATASET_NAME, TABLE_NAME, LIMIT)
+
+        dataset = Config.CLIENT.dataset(DATASET_NAME, project=PUBLIC)
+        query = Config.CLIENT.run_sync_query(SQL)
+        query.use_legacy_sql = False
+        query.run()
+
+        iterator = query.fetch_data()
+        rows = list(iterator)
+        self.assertEqual(len(rows), LIMIT)
+
     def test_insert_nested_nested(self):
         # See #2951
         SF = bigquery.SchemaField
diff --git a/bigquery/tests/unit/test_query.py b/bigquery/tests/unit/test_query.py
index c2b3ce5496e18..d7977a4e7d0c3 100644
--- a/bigquery/tests/unit/test_query.py
+++ b/bigquery/tests/unit/test_query.py
@@ -654,6 +654,8 @@ def test_fetch_data_query_not_yet_run(self):
         self.assertRaises(ValueError, query.fetch_data)
 
     def test_fetch_data_w_bound_client(self):
+        import six
+
         PATH = 'projects/%s/queries/%s' % (self.PROJECT, self.JOB_NAME)
         BEFORE = self._makeResource(complete=False)
         AFTER = self._makeResource(complete=True)
@@ -665,7 +667,11 @@ def test_fetch_data_w_bound_client(self):
         query._set_properties(BEFORE)
         self.assertFalse(query.complete)
 
-        rows, total_rows, page_token = query.fetch_data()
+        iterator = query.fetch_data()
+        page = six.next(iterator.pages)
+        rows = list(page)
+        total_rows = iterator.total_rows
+        page_token = iterator.next_page_token
 
         self.assertTrue(query.complete)
         self.assertEqual(len(rows), 4)
@@ -682,6 +688,8 @@ def test_fetch_data_w_bound_client(self):
         self.assertEqual(req['path'], '/%s' % PATH)
 
     def test_fetch_data_w_alternate_client(self):
+        import six
+
         PATH = 'projects/%s/queries/%s' % (self.PROJECT, self.JOB_NAME)
         MAX = 10
         TOKEN = 'TOKEN'
@@ -698,9 +706,13 @@ def test_fetch_data_w_alternate_client(self):
         query._set_properties(BEFORE)
         self.assertFalse(query.complete)
 
-        rows, total_rows, page_token = query.fetch_data(
+        iterator = query.fetch_data(
             client=client2, max_results=MAX, page_token=TOKEN,
             start_index=START, timeout_ms=TIMEOUT)
+        page = six.next(iterator.pages)
+        rows = list(page)
+        total_rows = iterator.total_rows
+        page_token = iterator.next_page_token
 
         self.assertTrue(query.complete)
         self.assertEqual(len(rows), 4)
diff --git a/docs/bigquery/snippets.py b/docs/bigquery/snippets.py
index 6e395add09fc3..8f630d772801f 100644
--- a/docs/bigquery/snippets.py
+++ b/docs/bigquery/snippets.py
@@ -520,8 +520,8 @@ def client_run_sync_query_paged(client, _):
 
     all_rows = []
 
-    def do_something_with(rows):
-        all_rows.extend(rows)
+    def do_something_with(row):
+        all_rows.append(row)
 
     # [START client_run_sync_query_paged]
     query = client.run_sync_query(LIMITED)
@@ -534,18 +534,12 @@ def do_something_with(rows):
     assert len(query.rows) == PAGE_SIZE
     assert [field.name for field in query.schema] == ['name']
 
-    rows = query.rows
-    token = query.page_token
-
-    while True:
-        do_something_with(rows)
-        if token is None:
-            break
-        rows, total_count, token = query.fetch_data(
-            page_token=token)       # API request
+    iterator = query.fetch_data()   # API request(s) during iteration
+    for row in iterator:
+        do_something_with(row)
     # [END client_run_sync_query_paged]
 
-    assert total_count == LIMIT
+    assert iterator.total_rows == LIMIT
     assert len(all_rows) == LIMIT
 
 
@@ -556,8 +550,8 @@ def client_run_sync_query_timeout(client, _):
 
     all_rows = []
 
-    def do_something_with(rows):
-        all_rows.extend(rows)
+    def do_something_with(row):
+        all_rows.append(row)
 
     # [START client_run_sync_query_timeout]
     query = client.run_sync_query(QUERY)
@@ -578,16 +572,12 @@ def do_something_with(rows):
 
     assert job.state == u'DONE'
 
-    rows, total_count, token = query.fetch_data()  # API request
-    while True:
-        do_something_with(rows)
-        if token is None:
-            break
-        rows, total_count, token = query.fetch_data(
-            page_token=token)  # API request
+    iterator = query.fetch_data()         # API request(s) during iteration
+    for row in iterator:
+        do_something_with(row)
     # [END client_run_sync_query_timeout]
 
-    assert len(all_rows) == total_count
+    assert len(all_rows) == iterator.total_rows
 
 
 def _find_examples():

From 62598f4caf3b4a1808cabcc4a2e750e1f60e58a9 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Fri, 9 Jun 2017 15:35:45 -0400
Subject: [PATCH 024/211] Add 'Bucket.requester_pays' property. (#3488)

Also, add 'requester_pays' argument to 'Client.create_bucket'.

Add a system test which exercises the feature.

Note that the new system test is skipped, because 'Buckets.insert' fails
with the 'billing/requesterPays' field set, both in our system tests and
in the 'Try It!' form in the docs.


Toward #3474.
---
 storage/google/cloud/storage/bucket.py | 32 +++++++++++++++++++-
 storage/google/cloud/storage/client.py |  9 +++++-
 storage/tests/system.py                | 11 +++++++
 storage/tests/unit/test_bucket.py      | 20 +++++++++++++
 storage/tests/unit/test_client.py      | 41 +++++++++++++++-----------
 5 files changed, 94 insertions(+), 19 deletions(-)

diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index 865a23840af4a..32e97306f2892 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -798,10 +798,40 @@ def versioning_enabled(self, value):
         details.
 
         :type value: convertible to boolean
-        :param value: should versioning be anabled for the bucket?
+        :param value: should versioning be enabled for the bucket?
         """
         self._patch_property('versioning', {'enabled': bool(value)})
 
+    @property
+    def requester_pays(self):
+        """Does the requester pay for API requests for this bucket?
+
+        .. note::
+
+           No public docs exist yet for the "requester pays" feature.
+
+        :setter: Update whether requester pays for this bucket.
+        :getter: Query whether requester pays for this bucket.
+
+        :rtype: bool
+        :returns: True if requester pays for API requests for the bucket,
+                  else False.
+        """
+        versioning = self._properties.get('billing', {})
+        return versioning.get('requesterPays', False)
+
+    @requester_pays.setter
+    def requester_pays(self, value):
+        """Update whether requester pays for API requests for this bucket.
+
+        See  https://cloud.google.com/storage/docs/<DOCS-MISSING> for
+        details.
+
+        :type value: convertible to boolean
+        :param value: should requester pay for API requests for the bucket?
+        """
+        self._patch_property('billing', {'requesterPays': bool(value)})
+
     def configure_website(self, main_page_suffix=None, not_found_page=None):
         """Configure website-related properties.
 
diff --git a/storage/google/cloud/storage/client.py b/storage/google/cloud/storage/client.py
index 93785e05269fc..51cad4d70c54b 100644
--- a/storage/google/cloud/storage/client.py
+++ b/storage/google/cloud/storage/client.py
@@ -194,7 +194,7 @@ def lookup_bucket(self, bucket_name):
         except NotFound:
             return None
 
-    def create_bucket(self, bucket_name):
+    def create_bucket(self, bucket_name, requester_pays=None):
         """Create a new bucket.
 
         For example:
@@ -211,10 +211,17 @@ def create_bucket(self, bucket_name):
         :type bucket_name: str
         :param bucket_name: The bucket name to create.
 
+        :type requester_pays: bool
+        :param requester_pays:
+            (Optional) Whether requester pays for API requests for this
+            bucket and its blobs.
+
         :rtype: :class:`google.cloud.storage.bucket.Bucket`
         :returns: The newly created bucket.
         """
         bucket = Bucket(self, name=bucket_name)
+        if requester_pays is not None:
+            bucket.requester_pays = requester_pays
         bucket.create(client=self)
         return bucket
 
diff --git a/storage/tests/system.py b/storage/tests/system.py
index afab659882bfc..06f50b26128b5 100644
--- a/storage/tests/system.py
+++ b/storage/tests/system.py
@@ -30,6 +30,8 @@
 
 HTTP = httplib2.Http()
 
+REQUESTER_PAYS_ENABLED = False  # query from environment?
+
 
 def _bad_copy(bad_request):
     """Predicate: pass only exceptions for a failed copyTo."""
@@ -99,6 +101,15 @@ def test_create_bucket(self):
         self.case_buckets_to_delete.append(new_bucket_name)
         self.assertEqual(created.name, new_bucket_name)
 
+    @unittest.skipUnless(REQUESTER_PAYS_ENABLED, "requesterPays not enabled")
+    def test_create_bucket_with_requester_pays(self):
+        new_bucket_name = 'w-requester-pays' + unique_resource_id('-')
+        created = Config.CLIENT.create_bucket(
+            new_bucket_name, requester_pays=True)
+        self.case_buckets_to_delete.append(new_bucket_name)
+        self.assertEqual(created.name, new_bucket_name)
+        self.assertTrue(created.requester_pays)
+
     def test_list_buckets(self):
         buckets_to_create = [
             'new' + unique_resource_id(),
diff --git a/storage/tests/unit/test_bucket.py b/storage/tests/unit/test_bucket.py
index 5e4a915751977..34835110bd673 100644
--- a/storage/tests/unit/test_bucket.py
+++ b/storage/tests/unit/test_bucket.py
@@ -176,6 +176,7 @@ def test_create_w_extra_properties(self):
             'location': LOCATION,
             'storageClass': STORAGE_CLASS,
             'versioning': {'enabled': True},
+            'billing': {'requesterPays': True},
             'labels': LABELS,
         }
         connection = _Connection(DATA)
@@ -186,6 +187,7 @@ def test_create_w_extra_properties(self):
         bucket.location = LOCATION
         bucket.storage_class = STORAGE_CLASS
         bucket.versioning_enabled = True
+        bucket.requester_pays = True
         bucket.labels = LABELS
         bucket.create()
 
@@ -866,6 +868,24 @@ def test_versioning_enabled_setter(self):
         bucket.versioning_enabled = True
         self.assertTrue(bucket.versioning_enabled)
 
+    def test_requester_pays_getter_missing(self):
+        NAME = 'name'
+        bucket = self._make_one(name=NAME)
+        self.assertEqual(bucket.requester_pays, False)
+
+    def test_requester_pays_getter(self):
+        NAME = 'name'
+        before = {'billing': {'requesterPays': True}}
+        bucket = self._make_one(name=NAME, properties=before)
+        self.assertEqual(bucket.requester_pays, True)
+
+    def test_requester_pays_setter(self):
+        NAME = 'name'
+        bucket = self._make_one(name=NAME)
+        self.assertFalse(bucket.requester_pays)
+        bucket.requester_pays = True
+        self.assertTrue(bucket.requester_pays)
+
     def test_configure_website_defaults(self):
         NAME = 'name'
         UNSET = {'website': {'mainPageSuffix': None,
diff --git a/storage/tests/unit/test_client.py b/storage/tests/unit/test_client.py
index 9696d4e5fa515..29545415a2209 100644
--- a/storage/tests/unit/test_client.py
+++ b/storage/tests/unit/test_client.py
@@ -155,22 +155,22 @@ def test_get_bucket_hit(self):
         CREDENTIALS = _make_credentials()
         client = self._make_one(project=PROJECT, credentials=CREDENTIALS)
 
-        BLOB_NAME = 'blob-name'
+        BUCKET_NAME = 'bucket-name'
         URI = '/'.join([
             client._connection.API_BASE_URL,
             'storage',
             client._connection.API_VERSION,
             'b',
-            '%s?projection=noAcl' % (BLOB_NAME,),
+            '%s?projection=noAcl' % (BUCKET_NAME,),
         ])
         http = client._http_internal = _Http(
             {'status': '200', 'content-type': 'application/json'},
-            '{{"name": "{0}"}}'.format(BLOB_NAME).encode('utf-8'),
+            '{{"name": "{0}"}}'.format(BUCKET_NAME).encode('utf-8'),
         )
 
-        bucket = client.get_bucket(BLOB_NAME)
+        bucket = client.get_bucket(BUCKET_NAME)
         self.assertIsInstance(bucket, Bucket)
-        self.assertEqual(bucket.name, BLOB_NAME)
+        self.assertEqual(bucket.name, BUCKET_NAME)
         self.assertEqual(http._called_with['method'], 'GET')
         self.assertEqual(http._called_with['uri'], URI)
 
@@ -203,33 +203,34 @@ def test_lookup_bucket_hit(self):
         CREDENTIALS = _make_credentials()
         client = self._make_one(project=PROJECT, credentials=CREDENTIALS)
 
-        BLOB_NAME = 'blob-name'
+        BUCKET_NAME = 'bucket-name'
         URI = '/'.join([
             client._connection.API_BASE_URL,
             'storage',
             client._connection.API_VERSION,
             'b',
-            '%s?projection=noAcl' % (BLOB_NAME,),
+            '%s?projection=noAcl' % (BUCKET_NAME,),
         ])
         http = client._http_internal = _Http(
             {'status': '200', 'content-type': 'application/json'},
-            '{{"name": "{0}"}}'.format(BLOB_NAME).encode('utf-8'),
+            '{{"name": "{0}"}}'.format(BUCKET_NAME).encode('utf-8'),
         )
 
-        bucket = client.lookup_bucket(BLOB_NAME)
+        bucket = client.lookup_bucket(BUCKET_NAME)
         self.assertIsInstance(bucket, Bucket)
-        self.assertEqual(bucket.name, BLOB_NAME)
+        self.assertEqual(bucket.name, BUCKET_NAME)
         self.assertEqual(http._called_with['method'], 'GET')
         self.assertEqual(http._called_with['uri'], URI)
 
     def test_create_bucket_conflict(self):
+        import json
         from google.cloud.exceptions import Conflict
 
         PROJECT = 'PROJECT'
         CREDENTIALS = _make_credentials()
         client = self._make_one(project=PROJECT, credentials=CREDENTIALS)
 
-        BLOB_NAME = 'blob-name'
+        BUCKET_NAME = 'bucket-name'
         URI = '/'.join([
             client._connection.API_BASE_URL,
             'storage',
@@ -241,18 +242,21 @@ def test_create_bucket_conflict(self):
             '{"error": {"message": "Conflict"}}',
         )
 
-        self.assertRaises(Conflict, client.create_bucket, BLOB_NAME)
+        self.assertRaises(Conflict, client.create_bucket, BUCKET_NAME)
         self.assertEqual(http._called_with['method'], 'POST')
         self.assertEqual(http._called_with['uri'], URI)
+        body = json.loads(http._called_with['body'])
+        self.assertEqual(body, {'name': BUCKET_NAME})
 
     def test_create_bucket_success(self):
+        import json
         from google.cloud.storage.bucket import Bucket
 
         PROJECT = 'PROJECT'
         CREDENTIALS = _make_credentials()
         client = self._make_one(project=PROJECT, credentials=CREDENTIALS)
 
-        BLOB_NAME = 'blob-name'
+        BUCKET_NAME = 'bucket-name'
         URI = '/'.join([
             client._connection.API_BASE_URL,
             'storage',
@@ -261,14 +265,17 @@ def test_create_bucket_success(self):
         ])
         http = client._http_internal = _Http(
             {'status': '200', 'content-type': 'application/json'},
-            '{{"name": "{0}"}}'.format(BLOB_NAME).encode('utf-8'),
+            '{{"name": "{0}"}}'.format(BUCKET_NAME).encode('utf-8'),
         )
 
-        bucket = client.create_bucket(BLOB_NAME)
+        bucket = client.create_bucket(BUCKET_NAME, requester_pays=True)
         self.assertIsInstance(bucket, Bucket)
-        self.assertEqual(bucket.name, BLOB_NAME)
+        self.assertEqual(bucket.name, BUCKET_NAME)
         self.assertEqual(http._called_with['method'], 'POST')
         self.assertEqual(http._called_with['uri'], URI)
+        body = json.loads(http._called_with['body'])
+        self.assertEqual(
+            body, {'name': BUCKET_NAME, 'billing': {'requesterPays': True}})
 
     def test_list_buckets_empty(self):
         from six.moves.urllib.parse import parse_qs
@@ -400,7 +407,7 @@ def test_page_non_empty_response(self):
         credentials = _make_credentials()
         client = self._make_one(project=project, credentials=credentials)
 
-        blob_name = 'blob-name'
+        blob_name = 'bucket-name'
         response = {'items': [{'name': blob_name}]}
 
         def dummy_response():

From f29abec498771cc4fcc92ba0cc4c8346688abaaf Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Mon, 12 Jun 2017 19:35:35 -0700
Subject: [PATCH 025/211] Use alabaster theme (#3496)

---
 docs/_static/custom.css | 16 ++++++++++++++++
 docs/conf.py            | 42 +++++++++++++++++++++++------------------
 2 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 docs/_static/custom.css

diff --git a/docs/_static/custom.css b/docs/_static/custom.css
new file mode 100644
index 0000000000000..3d0319dd337c3
--- /dev/null
+++ b/docs/_static/custom.css
@@ -0,0 +1,16 @@
+@import url('https://fonts.googleapis.com/css?family=Roboto|Roboto+Mono');
+
+@media screen and (min-width: 1080px) {
+    div.document {
+        width: 1040px;
+    }
+}
+
+code.descname {
+    color: #4885ed;
+}
+
+th.field-name {
+    min-width: 100px;
+    color: #3cba54;
+}
diff --git a/docs/conf.py b/docs/conf.py
index 89c2cb7a3d3bc..8aa99a9753def 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -23,21 +23,14 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-from email import message_from_string
+import email
 import os
-from pkg_resources import get_distribution
-import sys
-import urllib
-
-import sphinx_rtd_theme
-
-
-ON_READ_THE_DOCS = os.environ.get('READTHEDOCS', None) == 'True'
+import pkg_resources
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('..'))
+# sys.path.insert(0, os.path.abspath('..'))
 
 # -- General configuration -----------------------------------------------------
 
@@ -77,7 +70,7 @@
 # built documents.
 #
 # The short X.Y version.
-distro = get_distribution('google-cloud')
+distro = pkg_resources.get_distribution('google-cloud')
 release = os.getenv('SPHINX_RELEASE', distro.version)
 
 # The language for content autogenerated by Sphinx. Refer to documentation
@@ -119,15 +112,21 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-
-if not ON_READ_THE_DOCS:
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+html_theme = 'alabaster'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+html_theme_options = {
+    'description': 'Google Cloud Client Libraries for Python',
+    'github_user': 'GoogleCloudPlatform',
+    'github_repo': 'google-cloud-python',
+    'github_banner': True,
+    'travis_button': True,
+    'font_family': "'Roboto', Georgia, sans",
+    'head_font_family': "'Roboto', Georgia, serif",
+    'code_font_family': "'Roboto Mono', 'Consolas', monospace",
+}
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
@@ -164,7 +163,14 @@
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+html_sidebars = {
+    '**': [
+        'about.html',
+        'navigation.html',
+        'relations.html',
+        'searchbox.html',
+    ]
+}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
@@ -216,7 +222,7 @@
 }
 
 metadata = distro.get_metadata(distro.PKG_INFO)
-author = message_from_string(metadata).get('Author')
+author = email.message_from_string(metadata).get('Author')
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [

From 60832b8bdfc79b8210fbea251623f291a3064d4e Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Tue, 13 Jun 2017 09:55:49 -0400
Subject: [PATCH 026/211] Add '{Bucket,Blob}.user_project' properties. (#3490)

* Add abstract '_PropertyMixin.user_project' property.

* Support 'user_project' in '_PropertyMixin.{reload,patch}'.

* Add 'user_project' param to 'Bucket.__init__'.

* Save and expose via read-only 'user_project' property.

* Implement 'Blob.user_property' via bucket's value.
---
 storage/google/cloud/storage/_helpers.py | 12 ++-
 storage/google/cloud/storage/blob.py     | 10 +++
 storage/google/cloud/storage/bucket.py   | 17 ++++-
 storage/tests/unit/test__helpers.py      | 94 ++++++++++++++++++++----
 storage/tests/unit/test_blob.py          | 16 +++-
 storage/tests/unit/test_bucket.py        | 35 +++++++--
 6 files changed, 163 insertions(+), 21 deletions(-)

diff --git a/storage/google/cloud/storage/_helpers.py b/storage/google/cloud/storage/_helpers.py
index 88f9b8dc0ca7e..9e47c10269fcb 100644
--- a/storage/google/cloud/storage/_helpers.py
+++ b/storage/google/cloud/storage/_helpers.py
@@ -67,6 +67,11 @@ def client(self):
         """Abstract getter for the object client."""
         raise NotImplementedError
 
+    @property
+    def user_project(self):
+        """Abstract getter for the object user_project."""
+        raise NotImplementedError
+
     def _require_client(self, client):
         """Check client or verify over-ride.
 
@@ -94,6 +99,8 @@ def reload(self, client=None):
         # Pass only '?projection=noAcl' here because 'acl' and related
         # are handled via custom endpoints.
         query_params = {'projection': 'noAcl'}
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
         api_response = client._connection.api_request(
             method='GET', path=self.path, query_params=query_params,
             _target_object=self)
@@ -140,11 +147,14 @@ def patch(self, client=None):
         client = self._require_client(client)
         # Pass '?projection=full' here because 'PATCH' documented not
         # to work properly w/ 'noAcl'.
+        query_params = {'projection': 'full'}
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
         update_properties = {key: self._properties[key]
                              for key in self._changes}
         api_response = client._connection.api_request(
             method='PATCH', path=self.path, data=update_properties,
-            query_params={'projection': 'full'}, _target_object=self)
+            query_params=query_params, _target_object=self)
         self._set_properties(api_response)
 
 
diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index de59fdf1f2bde..778166df92492 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -222,6 +222,16 @@ def client(self):
         """The client bound to this blob."""
         return self.bucket.client
 
+    @property
+    def user_project(self):
+        """Project ID used for API requests made via this blob.
+
+        Derived from bucket's value.
+
+        :rtype: str
+        """
+        return self.bucket.user_project
+
     @property
     def public_url(self):
         """The public URL for this blob's object.
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index 32e97306f2892..8877c679aa90f 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -85,6 +85,10 @@ class Bucket(_PropertyMixin):
     :type name: str
     :param name: The name of the bucket. Bucket names must start and end with a
                  number or letter.
+
+    :type user_project: str
+    :param user_project: (Optional) the project ID to be billed for API
+                         requests made via this instance.
     """
 
     _MAX_OBJECTS_FOR_ITERATION = 256
@@ -108,12 +112,13 @@ class Bucket(_PropertyMixin):
     https://cloud.google.com/storage/docs/storage-classes
     """
 
-    def __init__(self, client, name=None):
+    def __init__(self, client, name=None, user_project=None):
         name = _validate_name(name)
         super(Bucket, self).__init__(name=name)
         self._client = client
         self._acl = BucketACL(self)
         self._default_object_acl = DefaultObjectACL(self)
+        self._user_project = user_project
 
     def __repr__(self):
         return '<Bucket: %s>' % (self.name,)
@@ -123,6 +128,16 @@ def client(self):
         """The client bound to this bucket."""
         return self._client
 
+    @property
+    def user_project(self):
+        """Project ID to be billed for API requests made via this bucket.
+
+        If unset, API requests are billed to the bucket owner.
+
+        :rtype: str
+        """
+        return self._user_project
+
     def blob(self, blob_name, chunk_size=None, encryption_key=None):
         """Factory constructor for blob object.
 
diff --git a/storage/tests/unit/test__helpers.py b/storage/tests/unit/test__helpers.py
index 89967f3a0db09..21883e2c4ac9a 100644
--- a/storage/tests/unit/test__helpers.py
+++ b/storage/tests/unit/test__helpers.py
@@ -26,7 +26,7 @@ def _get_target_class():
     def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
-    def _derivedClass(self, path=None):
+    def _derivedClass(self, path=None, user_project=None):
 
         class Derived(self._get_target_class()):
 
@@ -36,30 +36,67 @@ class Derived(self._get_target_class()):
             def path(self):
                 return path
 
+            @property
+            def user_project(self):
+                return user_project
+
         return Derived
 
     def test_path_is_abstract(self):
         mixin = self._make_one()
-        self.assertRaises(NotImplementedError, lambda: mixin.path)
+        with self.assertRaises(NotImplementedError):
+            mixin.path
 
     def test_client_is_abstract(self):
         mixin = self._make_one()
-        self.assertRaises(NotImplementedError, lambda: mixin.client)
+        with self.assertRaises(NotImplementedError):
+            mixin.client
+
+    def test_user_project_is_abstract(self):
+        mixin = self._make_one()
+        with self.assertRaises(NotImplementedError):
+            mixin.user_project
 
     def test_reload(self):
         connection = _Connection({'foo': 'Foo'})
         client = _Client(connection)
         derived = self._derivedClass('/path')()
-        # Make sure changes is not a set, so we can observe a change.
+        # Make sure changes is not a set instance before calling reload
+        # (which will clear / replace it with an empty set), checked below.
+        derived._changes = object()
+        derived.reload(client=client)
+        self.assertEqual(derived._properties, {'foo': 'Foo'})
+        kw = connection._requested
+        self.assertEqual(len(kw), 1)
+        self.assertEqual(kw[0], {
+            'method': 'GET',
+            'path': '/path',
+            'query_params': {'projection': 'noAcl'},
+            '_target_object': derived,
+        })
+        self.assertEqual(derived._changes, set())
+
+    def test_reload_w_user_project(self):
+        user_project = 'user-project-123'
+        connection = _Connection({'foo': 'Foo'})
+        client = _Client(connection)
+        derived = self._derivedClass('/path', user_project)()
+        # Make sure changes is not a set instance before calling reload
+        # (which will clear / replace it with an empty set), checked below.
         derived._changes = object()
         derived.reload(client=client)
         self.assertEqual(derived._properties, {'foo': 'Foo'})
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'GET')
-        self.assertEqual(kw[0]['path'], '/path')
-        self.assertEqual(kw[0]['query_params'], {'projection': 'noAcl'})
-        # Make sure changes get reset by reload.
+        self.assertEqual(kw[0], {
+            'method': 'GET',
+            'path': '/path',
+            'query_params': {
+                'projection': 'noAcl',
+                'userProject': user_project,
+            },
+            '_target_object': derived,
+        })
         self.assertEqual(derived._changes, set())
 
     def test__set_properties(self):
@@ -87,11 +124,42 @@ def test_patch(self):
         self.assertEqual(derived._properties, {'foo': 'Foo'})
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'PATCH')
-        self.assertEqual(kw[0]['path'], '/path')
-        self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
-        # Since changes does not include `baz`, we don't see it sent.
-        self.assertEqual(kw[0]['data'], {'bar': BAR})
+        self.assertEqual(kw[0], {
+            'method': 'PATCH',
+            'path': '/path',
+            'query_params': {'projection': 'full'},
+            # Since changes does not include `baz`, we don't see it sent.
+            'data': {'bar': BAR},
+            '_target_object': derived,
+        })
+        # Make sure changes get reset by patch().
+        self.assertEqual(derived._changes, set())
+
+    def test_patch_w_user_project(self):
+        user_project = 'user-project-123'
+        connection = _Connection({'foo': 'Foo'})
+        client = _Client(connection)
+        derived = self._derivedClass('/path', user_project)()
+        # Make sure changes is non-empty, so we can observe a change.
+        BAR = object()
+        BAZ = object()
+        derived._properties = {'bar': BAR, 'baz': BAZ}
+        derived._changes = set(['bar'])  # Ignore baz.
+        derived.patch(client=client)
+        self.assertEqual(derived._properties, {'foo': 'Foo'})
+        kw = connection._requested
+        self.assertEqual(len(kw), 1)
+        self.assertEqual(kw[0], {
+            'method': 'PATCH',
+            'path': '/path',
+            'query_params': {
+                'projection': 'full',
+                'userProject': user_project,
+            },
+            # Since changes does not include `baz`, we don't see it sent.
+            'data': {'bar': BAR},
+            '_target_object': derived,
+        })
         # Make sure changes get reset by patch().
         self.assertEqual(derived._changes, set())
 
diff --git a/storage/tests/unit/test_blob.py b/storage/tests/unit/test_blob.py
index a5d49bc4bacb6..084745ebb54d9 100644
--- a/storage/tests/unit/test_blob.py
+++ b/storage/tests/unit/test_blob.py
@@ -141,6 +141,19 @@ def test_path_with_non_ascii(self):
         blob = self._make_one(blob_name, bucket=bucket)
         self.assertEqual(blob.path, '/b/name/o/Caf%C3%A9')
 
+    def test_client(self):
+        blob_name = 'BLOB'
+        bucket = _Bucket()
+        blob = self._make_one(blob_name, bucket=bucket)
+        self.assertIs(blob.client, bucket.client)
+
+    def test_user_project(self):
+        user_project = 'user-project-123'
+        blob_name = 'BLOB'
+        bucket = _Bucket(user_project=user_project)
+        blob = self._make_one(blob_name, bucket=bucket)
+        self.assertEqual(blob.user_project, user_project)
+
     def test_public_url(self):
         BLOB_NAME = 'blob-name'
         bucket = _Bucket()
@@ -2280,7 +2293,7 @@ def api_request(self, **kw):
 
 class _Bucket(object):
 
-    def __init__(self, client=None, name='name'):
+    def __init__(self, client=None, name='name', user_project=None):
         if client is None:
             connection = _Connection()
             client = _Client(connection)
@@ -2290,6 +2303,7 @@ def __init__(self, client=None, name='name'):
         self._deleted = []
         self.name = name
         self.path = '/b/' + name
+        self.user_project = user_project
 
     def delete_blob(self, blob_name, client=None):
         del self._blobs[blob_name]
diff --git a/storage/tests/unit/test_bucket.py b/storage/tests/unit/test_bucket.py
index 34835110bd673..d68cd4ca980a8 100644
--- a/storage/tests/unit/test_bucket.py
+++ b/storage/tests/unit/test_bucket.py
@@ -33,13 +33,16 @@ class _SigningCredentials(
 
 class Test_Bucket(unittest.TestCase):
 
-    def _make_one(self, client=None, name=None, properties=None):
+    @staticmethod
+    def _get_target_class():
         from google.cloud.storage.bucket import Bucket
+        return Bucket
 
+    def _make_one(self, client=None, name=None, properties=None):
         if client is None:
             connection = _Connection()
             client = _Client(connection)
-        bucket = Bucket(client, name=name)
+        bucket = self._get_target_class()(client, name=name)
         bucket._properties = properties or {}
         return bucket
 
@@ -53,6 +56,22 @@ def test_ctor(self):
         self.assertIs(bucket._acl.bucket, bucket)
         self.assertFalse(bucket._default_object_acl.loaded)
         self.assertIs(bucket._default_object_acl.bucket, bucket)
+        self.assertIsNone(bucket.user_project)
+
+    def test_ctor_w_user_project(self):
+        NAME = 'name'
+        USER_PROJECT = 'user-project-123'
+        connection = _Connection()
+        client = _Client(connection)
+        klass = self._get_target_class()
+        bucket = klass(client, name=NAME, user_project=USER_PROJECT)
+        self.assertEqual(bucket.name, NAME)
+        self.assertEqual(bucket._properties, {})
+        self.assertEqual(bucket.user_project, USER_PROJECT)
+        self.assertFalse(bucket._acl.loaded)
+        self.assertIs(bucket._acl.bucket, bucket)
+        self.assertFalse(bucket._default_object_acl.loaded)
+        self.assertIs(bucket._default_object_acl.bucket, bucket)
 
     def test_blob(self):
         from google.cloud.storage.blob import Blob
@@ -73,9 +92,8 @@ def test_blob(self):
         self.assertEqual(blob._encryption_key, KEY)
 
     def test_bucket_name_value(self):
-        bucket_name = 'testing123'
-        mixin = self._make_one(name=bucket_name)
-        self.assertEqual(mixin.name, bucket_name)
+        BUCKET_NAME = 'bucket-name'
+        bucket = self._make_one(name=BUCKET_NAME)
 
         bad_start_bucket_name = '/testing123'
         with self.assertRaises(ValueError):
@@ -85,6 +103,13 @@ def test_bucket_name_value(self):
         with self.assertRaises(ValueError):
             self._make_one(name=bad_end_bucket_name)
 
+    def test_user_project(self):
+        BUCKET_NAME = 'name'
+        USER_PROJECT = 'user-project-123'
+        bucket = self._make_one(name=BUCKET_NAME)
+        bucket._user_project = USER_PROJECT
+        self.assertEqual(bucket.user_project, USER_PROJECT)
+
     def test_exists_miss(self):
         from google.cloud.exceptions import NotFound
 

From 04c07a504ac2018893bbba50318dcb80dea110f4 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Tue, 13 Jun 2017 12:42:58 -0400
Subject: [PATCH 027/211] Pass 'user_project' if set for Bucket API requests
 (#3492)

* Block 'Bucket.create' if 'user_project' set:  the API does not accept that parameter.
---
 storage/google/cloud/storage/bucket.py |  84 ++++++++--
 storage/tests/unit/test_bucket.py      | 205 ++++++++++++++++++++++---
 2 files changed, 258 insertions(+), 31 deletions(-)

diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index 8877c679aa90f..e740cd4febc2e 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -175,10 +175,14 @@ def exists(self, client=None):
         :returns: True if the bucket exists in Cloud Storage.
         """
         client = self._require_client(client)
+        # We only need the status code (200 or not) so we seek to
+        # minimize the returned payload.
+        query_params = {'fields': 'name'}
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
+
         try:
-            # We only need the status code (200 or not) so we seek to
-            # minimize the returned payload.
-            query_params = {'fields': 'name'}
             # We intentionally pass `_target_object=None` since fields=name
             # would limit the local properties.
             client._connection.api_request(
@@ -204,6 +208,9 @@ def create(self, client=None):
         :param client: Optional. The client to use.  If not passed, falls back
                        to the ``client`` stored on the current bucket.
         """
+        if self.user_project is not None:
+            raise ValueError("Cannot create bucket with 'user_project' set.")
+
         client = self._require_client(client)
         query_params = {'project': client.project}
         properties = {key: self._properties[key] for key in self._changes}
@@ -264,10 +271,18 @@ def get_blob(self, blob_name, client=None):
         :returns: The blob object if it exists, otherwise None.
         """
         client = self._require_client(client)
+        query_params = {}
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
+
         blob = Blob(bucket=self, name=blob_name)
         try:
             response = client._connection.api_request(
-                method='GET', path=blob.path, _target_object=blob)
+                method='GET',
+                path=blob.path,
+                query_params=query_params,
+                _target_object=blob)
             # NOTE: We assume response.get('name') matches `blob_name`.
             blob._set_properties(response)
             # NOTE: This will not fail immediately in a batch. However, when
@@ -321,7 +336,7 @@ def list_blobs(self, max_results=None, page_token=None, prefix=None,
         :returns: Iterator of all :class:`~google.cloud.storage.blob.Blob`
                   in this bucket matching the arguments.
         """
-        extra_params = {}
+        extra_params = {'projection': projection}
 
         if prefix is not None:
             extra_params['prefix'] = prefix
@@ -332,11 +347,12 @@ def list_blobs(self, max_results=None, page_token=None, prefix=None,
         if versions is not None:
             extra_params['versions'] = versions
 
-        extra_params['projection'] = projection
-
         if fields is not None:
             extra_params['fields'] = fields
 
+        if self.user_project is not None:
+            extra_params['userProject'] = self.user_project
+
         client = self._require_client(client)
         path = self.path + '/o'
         iterator = HTTPIterator(
@@ -376,6 +392,11 @@ def delete(self, force=False, client=None):
                  contains more than 256 objects / blobs.
         """
         client = self._require_client(client)
+        query_params = {}
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
+
         if force:
             blobs = list(self.list_blobs(
                 max_results=self._MAX_OBJECTS_FOR_ITERATION + 1,
@@ -397,7 +418,10 @@ def delete(self, force=False, client=None):
         # request has no response value (whether in a standard request or
         # in a batch request).
         client._connection.api_request(
-            method='DELETE', path=self.path, _target_object=None)
+            method='DELETE',
+            path=self.path,
+            query_params=query_params,
+            _target_object=None)
 
     def delete_blob(self, blob_name, client=None):
         """Deletes a blob from the current bucket.
@@ -429,12 +453,20 @@ def delete_blob(self, blob_name, client=None):
 
         """
         client = self._require_client(client)
+        query_params = {}
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
+
         blob_path = Blob.path_helper(self.path, blob_name)
         # We intentionally pass `_target_object=None` since a DELETE
         # request has no response value (whether in a standard request or
         # in a batch request).
         client._connection.api_request(
-            method='DELETE', path=blob_path, _target_object=None)
+            method='DELETE',
+            path=blob_path,
+            query_params=query_params,
+            _target_object=None)
 
     def delete_blobs(self, blobs, on_error=None, client=None):
         """Deletes a list of blobs from the current bucket.
@@ -497,14 +529,26 @@ def copy_blob(self, blob, destination_bucket, new_name=None,
         :returns: The new Blob.
         """
         client = self._require_client(client)
+        query_params = {}
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
+
         if new_name is None:
             new_name = blob.name
+
         new_blob = Blob(bucket=destination_bucket, name=new_name)
         api_path = blob.path + '/copyTo' + new_blob.path
         copy_result = client._connection.api_request(
-            method='POST', path=api_path, _target_object=new_blob)
+            method='POST',
+            path=api_path,
+            query_params=query_params,
+            _target_object=new_blob,
+            )
+
         if not preserve_acl:
             new_blob.acl.save(acl={}, client=client)
+
         new_blob._set_properties(copy_result)
         return new_blob
 
@@ -912,9 +956,15 @@ def get_iam_policy(self, client=None):
                   the ``getIamPolicy`` API request.
         """
         client = self._require_client(client)
+        query_params = {}
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
+
         info = client._connection.api_request(
             method='GET',
             path='%s/iam' % (self.path,),
+            query_params=query_params,
             _target_object=None)
         return Policy.from_api_repr(info)
 
@@ -937,11 +987,17 @@ def set_iam_policy(self, policy, client=None):
                   the ``setIamPolicy`` API request.
         """
         client = self._require_client(client)
+        query_params = {}
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
+
         resource = policy.to_api_repr()
         resource['resourceId'] = self.path
         info = client._connection.api_request(
             method='PUT',
             path='%s/iam' % (self.path,),
+            query_params=query_params,
             data=resource,
             _target_object=None)
         return Policy.from_api_repr(info)
@@ -965,12 +1021,16 @@ def test_iam_permissions(self, permissions, client=None):
                   request.
         """
         client = self._require_client(client)
-        query = {'permissions': permissions}
+        query_params = {'permissions': permissions}
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
+
         path = '%s/iam/testPermissions' % (self.path,)
         resp = client._connection.api_request(
             method='GET',
             path=path,
-            query_params=query)
+            query_params=query_params)
         return resp.get('permissions', [])
 
     def make_public(self, recursive=False, future=False, client=None):
diff --git a/storage/tests/unit/test_bucket.py b/storage/tests/unit/test_bucket.py
index d68cd4ca980a8..b6231fa2192ac 100644
--- a/storage/tests/unit/test_bucket.py
+++ b/storage/tests/unit/test_bucket.py
@@ -38,11 +38,16 @@ def _get_target_class():
         from google.cloud.storage.bucket import Bucket
         return Bucket
 
-    def _make_one(self, client=None, name=None, properties=None):
+    def _make_one(
+            self, client=None, name=None, properties=None, user_project=None):
         if client is None:
             connection = _Connection()
             client = _Client(connection)
-        bucket = self._get_target_class()(client, name=name)
+        if user_project is None:
+            bucket = self._get_target_class()(client, name=name)
+        else:
+            bucket = self._get_target_class()(
+                client, name=name, user_project=user_project)
         bucket._properties = properties or {}
         return bucket
 
@@ -63,8 +68,7 @@ def test_ctor_w_user_project(self):
         USER_PROJECT = 'user-project-123'
         connection = _Connection()
         client = _Client(connection)
-        klass = self._get_target_class()
-        bucket = klass(client, name=NAME, user_project=USER_PROJECT)
+        bucket = self._make_one(client, name=NAME, user_project=USER_PROJECT)
         self.assertEqual(bucket.name, NAME)
         self.assertEqual(bucket._properties, {})
         self.assertEqual(bucket.user_project, USER_PROJECT)
@@ -137,7 +141,9 @@ def api_request(cls, *args, **kwargs):
         expected_cw = [((), expected_called_kwargs)]
         self.assertEqual(_FakeConnection._called_with, expected_cw)
 
-    def test_exists_hit(self):
+    def test_exists_hit_w_user_project(self):
+        USER_PROJECT = 'user-project-123'
+
         class _FakeConnection(object):
 
             _called_with = []
@@ -149,7 +155,7 @@ def api_request(cls, *args, **kwargs):
                 return object()
 
         BUCKET_NAME = 'bucket-name'
-        bucket = self._make_one(name=BUCKET_NAME)
+        bucket = self._make_one(name=BUCKET_NAME, user_project=USER_PROJECT)
         client = _Client(_FakeConnection)
         self.assertTrue(bucket.exists(client=client))
         expected_called_kwargs = {
@@ -157,17 +163,29 @@ def api_request(cls, *args, **kwargs):
             'path': bucket.path,
             'query_params': {
                 'fields': 'name',
+                'userProject': USER_PROJECT,
             },
             '_target_object': None,
         }
         expected_cw = [((), expected_called_kwargs)]
         self.assertEqual(_FakeConnection._called_with, expected_cw)
 
+    def test_create_w_user_project(self):
+        PROJECT = 'PROJECT'
+        BUCKET_NAME = 'bucket-name'
+        USER_PROJECT = 'user-project-123'
+        connection = _Connection()
+        client = _Client(connection, project=PROJECT)
+        bucket = self._make_one(client, BUCKET_NAME, user_project=USER_PROJECT)
+
+        with self.assertRaises(ValueError):
+            bucket.create()
+
     def test_create_hit(self):
+        PROJECT = 'PROJECT'
         BUCKET_NAME = 'bucket-name'
         DATA = {'name': BUCKET_NAME}
         connection = _Connection(DATA)
-        PROJECT = 'PROJECT'
         client = _Client(connection, project=PROJECT)
         bucket = self._make_one(client=client, name=BUCKET_NAME)
         bucket.create()
@@ -259,18 +277,20 @@ def test_get_blob_miss(self):
         self.assertEqual(kw['method'], 'GET')
         self.assertEqual(kw['path'], '/b/%s/o/%s' % (NAME, NONESUCH))
 
-    def test_get_blob_hit(self):
+    def test_get_blob_hit_w_user_project(self):
         NAME = 'name'
         BLOB_NAME = 'blob-name'
+        USER_PROJECT = 'user-project-123'
         connection = _Connection({'name': BLOB_NAME})
         client = _Client(connection)
-        bucket = self._make_one(name=NAME)
+        bucket = self._make_one(name=NAME, user_project=USER_PROJECT)
         blob = bucket.get_blob(BLOB_NAME, client=client)
         self.assertIs(blob.bucket, bucket)
         self.assertEqual(blob.name, BLOB_NAME)
         kw, = connection._requested
         self.assertEqual(kw['method'], 'GET')
         self.assertEqual(kw['path'], '/b/%s/o/%s' % (NAME, BLOB_NAME))
+        self.assertEqual(kw['query_params'], {'userProject': USER_PROJECT})
 
     def test_list_blobs_defaults(self):
         NAME = 'name'
@@ -285,8 +305,9 @@ def test_list_blobs_defaults(self):
         self.assertEqual(kw['path'], '/b/%s/o' % NAME)
         self.assertEqual(kw['query_params'], {'projection': 'noAcl'})
 
-    def test_list_blobs_w_all_arguments(self):
+    def test_list_blobs_w_all_arguments_and_user_project(self):
         NAME = 'name'
+        USER_PROJECT = 'user-project-123'
         MAX_RESULTS = 10
         PAGE_TOKEN = 'ABCD'
         PREFIX = 'subfolder'
@@ -302,10 +323,11 @@ def test_list_blobs_w_all_arguments(self):
             'versions': VERSIONS,
             'projection': PROJECTION,
             'fields': FIELDS,
+            'userProject': USER_PROJECT,
         }
         connection = _Connection({'items': []})
         client = _Client(connection)
-        bucket = self._make_one(name=NAME)
+        bucket = self._make_one(name=NAME, user_project=USER_PROJECT)
         iterator = bucket.list_blobs(
             max_results=MAX_RESULTS,
             page_token=PAGE_TOKEN,
@@ -347,23 +369,27 @@ def test_delete_miss(self):
         expected_cw = [{
             'method': 'DELETE',
             'path': bucket.path,
+            'query_params': {},
             '_target_object': None,
         }]
         self.assertEqual(connection._deleted_buckets, expected_cw)
 
-    def test_delete_hit(self):
+    def test_delete_hit_with_user_project(self):
         NAME = 'name'
+        USER_PROJECT = 'user-project-123'
         GET_BLOBS_RESP = {'items': []}
         connection = _Connection(GET_BLOBS_RESP)
         connection._delete_bucket = True
         client = _Client(connection)
-        bucket = self._make_one(client=client, name=NAME)
+        bucket = self._make_one(
+            client=client, name=NAME, user_project=USER_PROJECT)
         result = bucket.delete(force=True)
         self.assertIsNone(result)
         expected_cw = [{
             'method': 'DELETE',
             'path': bucket.path,
             '_target_object': None,
+            'query_params': {'userProject': USER_PROJECT},
         }]
         self.assertEqual(connection._deleted_buckets, expected_cw)
 
@@ -388,6 +414,7 @@ def test_delete_force_delete_blobs(self):
         expected_cw = [{
             'method': 'DELETE',
             'path': bucket.path,
+            'query_params': {},
             '_target_object': None,
         }]
         self.assertEqual(connection._deleted_buckets, expected_cw)
@@ -406,6 +433,7 @@ def test_delete_force_miss_blobs(self):
         expected_cw = [{
             'method': 'DELETE',
             'path': bucket.path,
+            'query_params': {},
             '_target_object': None,
         }]
         self.assertEqual(connection._deleted_buckets, expected_cw)
@@ -442,18 +470,22 @@ def test_delete_blob_miss(self):
         kw, = connection._requested
         self.assertEqual(kw['method'], 'DELETE')
         self.assertEqual(kw['path'], '/b/%s/o/%s' % (NAME, NONESUCH))
+        self.assertEqual(kw['query_params'], {})
 
-    def test_delete_blob_hit(self):
+    def test_delete_blob_hit_with_user_project(self):
         NAME = 'name'
         BLOB_NAME = 'blob-name'
+        USER_PROJECT = 'user-project-123'
         connection = _Connection({})
         client = _Client(connection)
-        bucket = self._make_one(client=client, name=NAME)
+        bucket = self._make_one(
+            client=client, name=NAME, user_project=USER_PROJECT)
         result = bucket.delete_blob(BLOB_NAME)
         self.assertIsNone(result)
         kw, = connection._requested
         self.assertEqual(kw['method'], 'DELETE')
         self.assertEqual(kw['path'], '/b/%s/o/%s' % (NAME, BLOB_NAME))
+        self.assertEqual(kw['query_params'], {'userProject': USER_PROJECT})
 
     def test_delete_blobs_empty(self):
         NAME = 'name'
@@ -463,17 +495,20 @@ def test_delete_blobs_empty(self):
         bucket.delete_blobs([])
         self.assertEqual(connection._requested, [])
 
-    def test_delete_blobs_hit(self):
+    def test_delete_blobs_hit_w_user_project(self):
         NAME = 'name'
         BLOB_NAME = 'blob-name'
+        USER_PROJECT = 'user-project-123'
         connection = _Connection({})
         client = _Client(connection)
-        bucket = self._make_one(client=client, name=NAME)
+        bucket = self._make_one(
+            client=client, name=NAME, user_project=USER_PROJECT)
         bucket.delete_blobs([BLOB_NAME])
         kw = connection._requested
         self.assertEqual(len(kw), 1)
         self.assertEqual(kw[0]['method'], 'DELETE')
         self.assertEqual(kw[0]['path'], '/b/%s/o/%s' % (NAME, BLOB_NAME))
+        self.assertEqual(kw[0]['query_params'], {'userProject': USER_PROJECT})
 
     def test_delete_blobs_miss_no_on_error(self):
         from google.cloud.exceptions import NotFound
@@ -531,6 +566,7 @@ class _Blob(object):
                                                      DEST, BLOB_NAME)
         self.assertEqual(kw['method'], 'POST')
         self.assertEqual(kw['path'], COPY_PATH)
+        self.assertEqual(kw['query_params'], {})
 
     def test_copy_blobs_preserve_acl(self):
         from google.cloud.storage.acl import ObjectACL
@@ -562,14 +598,17 @@ class _Blob(object):
         self.assertEqual(len(kw), 2)
         self.assertEqual(kw[0]['method'], 'POST')
         self.assertEqual(kw[0]['path'], COPY_PATH)
+        self.assertEqual(kw[0]['query_params'], {})
         self.assertEqual(kw[1]['method'], 'PATCH')
         self.assertEqual(kw[1]['path'], NEW_BLOB_PATH)
+        self.assertEqual(kw[1]['query_params'], {'projection': 'full'})
 
-    def test_copy_blobs_w_name(self):
+    def test_copy_blobs_w_name_and_user_project(self):
         SOURCE = 'source'
         DEST = 'dest'
         BLOB_NAME = 'blob-name'
         NEW_NAME = 'new_name'
+        USER_PROJECT = 'user-project-123'
 
         class _Blob(object):
             name = BLOB_NAME
@@ -577,7 +616,8 @@ class _Blob(object):
 
         connection = _Connection({})
         client = _Client(connection)
-        source = self._make_one(client=client, name=SOURCE)
+        source = self._make_one(
+            client=client, name=SOURCE, user_project=USER_PROJECT)
         dest = self._make_one(client=client, name=DEST)
         blob = _Blob()
         new_blob = source.copy_blob(blob, dest, NEW_NAME)
@@ -588,6 +628,7 @@ class _Blob(object):
                                                      DEST, NEW_NAME)
         self.assertEqual(kw['method'], 'POST')
         self.assertEqual(kw['path'], COPY_PATH)
+        self.assertEqual(kw['query_params'], {'userProject': USER_PROJECT})
 
     def test_rename_blob(self):
         BUCKET_NAME = 'BUCKET_NAME'
@@ -979,6 +1020,40 @@ def test_get_iam_policy(self):
         self.assertEqual(len(kw), 1)
         self.assertEqual(kw[0]['method'], 'GET')
         self.assertEqual(kw[0]['path'], '%s/iam' % (PATH,))
+        self.assertEqual(kw[0]['query_params'], {})
+
+    def test_get_iam_policy_w_user_project(self):
+        from google.cloud.iam import Policy
+
+        NAME = 'name'
+        USER_PROJECT = 'user-project-123'
+        PATH = '/b/%s' % (NAME,)
+        ETAG = 'DEADBEEF'
+        VERSION = 17
+        RETURNED = {
+            'resourceId': PATH,
+            'etag': ETAG,
+            'version': VERSION,
+            'bindings': [],
+        }
+        EXPECTED = {}
+        connection = _Connection(RETURNED)
+        client = _Client(connection, None)
+        bucket = self._make_one(
+            client=client, name=NAME, user_project=USER_PROJECT)
+
+        policy = bucket.get_iam_policy()
+
+        self.assertIsInstance(policy, Policy)
+        self.assertEqual(policy.etag, RETURNED['etag'])
+        self.assertEqual(policy.version, RETURNED['version'])
+        self.assertEqual(dict(policy), EXPECTED)
+
+        kw = connection._requested
+        self.assertEqual(len(kw), 1)
+        self.assertEqual(kw[0]['method'], 'GET')
+        self.assertEqual(kw[0]['path'], '%s/iam' % (PATH,))
+        self.assertEqual(kw[0]['query_params'], {'userProject': USER_PROJECT})
 
     def test_set_iam_policy(self):
         import operator
@@ -1025,6 +1100,66 @@ def test_set_iam_policy(self):
         self.assertEqual(len(kw), 1)
         self.assertEqual(kw[0]['method'], 'PUT')
         self.assertEqual(kw[0]['path'], '%s/iam' % (PATH,))
+        self.assertEqual(kw[0]['query_params'], {})
+        sent = kw[0]['data']
+        self.assertEqual(sent['resourceId'], PATH)
+        self.assertEqual(len(sent['bindings']), len(BINDINGS))
+        key = operator.itemgetter('role')
+        for found, expected in zip(
+            sorted(sent['bindings'], key=key),
+            sorted(BINDINGS, key=key)):
+            self.assertEqual(found['role'], expected['role'])
+            self.assertEqual(
+                sorted(found['members']), sorted(expected['members']))
+
+    def test_set_iam_policy_w_user_project(self):
+        import operator
+        from google.cloud.storage.iam import STORAGE_OWNER_ROLE
+        from google.cloud.storage.iam import STORAGE_EDITOR_ROLE
+        from google.cloud.storage.iam import STORAGE_VIEWER_ROLE
+        from google.cloud.iam import Policy
+
+        NAME = 'name'
+        USER_PROJECT = 'user-project-123'
+        PATH = '/b/%s' % (NAME,)
+        ETAG = 'DEADBEEF'
+        VERSION = 17
+        OWNER1 = 'user:phred@example.com'
+        OWNER2 = 'group:cloud-logs@google.com'
+        EDITOR1 = 'domain:google.com'
+        EDITOR2 = 'user:phred@example.com'
+        VIEWER1 = 'serviceAccount:1234-abcdef@service.example.com'
+        VIEWER2 = 'user:phred@example.com'
+        BINDINGS = [
+            {'role': STORAGE_OWNER_ROLE, 'members': [OWNER1, OWNER2]},
+            {'role': STORAGE_EDITOR_ROLE, 'members': [EDITOR1, EDITOR2]},
+            {'role': STORAGE_VIEWER_ROLE, 'members': [VIEWER1, VIEWER2]},
+        ]
+        RETURNED = {
+            'etag': ETAG,
+            'version': VERSION,
+            'bindings': BINDINGS,
+        }
+        policy = Policy()
+        for binding in BINDINGS:
+            policy[binding['role']] = binding['members']
+
+        connection = _Connection(RETURNED)
+        client = _Client(connection, None)
+        bucket = self._make_one(
+            client=client, name=NAME, user_project=USER_PROJECT)
+
+        returned = bucket.set_iam_policy(policy)
+
+        self.assertEqual(returned.etag, ETAG)
+        self.assertEqual(returned.version, VERSION)
+        self.assertEqual(dict(returned), dict(policy))
+
+        kw = connection._requested
+        self.assertEqual(len(kw), 1)
+        self.assertEqual(kw[0]['method'], 'PUT')
+        self.assertEqual(kw[0]['path'], '%s/iam' % (PATH,))
+        self.assertEqual(kw[0]['query_params'], {'userProject': USER_PROJECT})
         sent = kw[0]['data']
         self.assertEqual(sent['resourceId'], PATH)
         self.assertEqual(len(sent['bindings']), len(BINDINGS))
@@ -1064,6 +1199,38 @@ def test_test_iam_permissions(self):
         self.assertEqual(kw[0]['path'], '%s/iam/testPermissions' % (PATH,))
         self.assertEqual(kw[0]['query_params'], {'permissions': PERMISSIONS})
 
+    def test_test_iam_permissions_w_user_project(self):
+        from google.cloud.storage.iam import STORAGE_OBJECTS_LIST
+        from google.cloud.storage.iam import STORAGE_BUCKETS_GET
+        from google.cloud.storage.iam import STORAGE_BUCKETS_UPDATE
+
+        NAME = 'name'
+        USER_PROJECT = 'user-project-123'
+        PATH = '/b/%s' % (NAME,)
+        PERMISSIONS = [
+            STORAGE_OBJECTS_LIST,
+            STORAGE_BUCKETS_GET,
+            STORAGE_BUCKETS_UPDATE,
+        ]
+        ALLOWED = PERMISSIONS[1:]
+        RETURNED = {'permissions': ALLOWED}
+        connection = _Connection(RETURNED)
+        client = _Client(connection, None)
+        bucket = self._make_one(
+            client=client, name=NAME, user_project=USER_PROJECT)
+
+        allowed = bucket.test_iam_permissions(PERMISSIONS)
+
+        self.assertEqual(allowed, ALLOWED)
+
+        kw = connection._requested
+        self.assertEqual(len(kw), 1)
+        self.assertEqual(kw[0]['method'], 'GET')
+        self.assertEqual(kw[0]['path'], '%s/iam/testPermissions' % (PATH,))
+        self.assertEqual(
+            kw[0]['query_params'],
+            {'permissions': PERMISSIONS, 'userProject': USER_PROJECT})
+
     def test_make_public_defaults(self):
         from google.cloud.storage.acl import _ACLEntity
 

From 313b1fa1760d0e9dfb5886dde7a1647ee8a17372 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Tue, 13 Jun 2017 13:11:14 -0400
Subject: [PATCH 028/211] Pass 'user_project' if set for Blob API requests
 (#3495)

---
 storage/google/cloud/storage/blob.py |  83 +++++++--
 storage/tests/unit/test_blob.py      | 264 ++++++++++++++++++++++-----
 2 files changed, 284 insertions(+), 63 deletions(-)

diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index 778166df92492..aad2f47295aaf 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -340,10 +340,14 @@ def exists(self, client=None):
         :returns: True if the blob exists in Cloud Storage.
         """
         client = self._require_client(client)
+        # We only need the status code (200 or not) so we seek to
+        # minimize the returned payload.
+        query_params = {'fields': 'name'}
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
+
         try:
-            # We only need the status code (200 or not) so we seek to
-            # minimize the returned payload.
-            query_params = {'fields': 'name'}
             # We intentionally pass `_target_object=None` since fields=name
             # would limit the local properties.
             client._connection.api_request(
@@ -403,6 +407,8 @@ def _get_download_url(self):
             download_url = _DOWNLOAD_URL_TEMPLATE.format(path=self.path)
             if self.generation is not None:
                 download_url += u'&generation={:d}'.format(self.generation)
+            if self.user_project is not None:
+                download_url += u'&userProject={}'.format(self.user_project)
             return download_url
         else:
             return self.media_link
@@ -654,6 +660,10 @@ def _do_multipart_upload(self, client, stream, content_type,
 
         upload_url = _MULTIPART_URL_TEMPLATE.format(
             bucket_path=self.bucket.path)
+
+        if self.user_project is not None:
+            upload_url += '&userProject={}'.format(self.user_project)
+
         upload = MultipartUpload(upload_url, headers=headers)
 
         if num_retries is not None:
@@ -726,6 +736,10 @@ def _initiate_resumable_upload(self, client, stream, content_type,
 
         upload_url = _RESUMABLE_URL_TEMPLATE.format(
             bucket_path=self.bucket.path)
+
+        if self.user_project is not None:
+            upload_url += '&userProject={}'.format(self.user_project)
+
         upload = ResumableUpload(upload_url, chunk_size, headers=headers)
 
         if num_retries is not None:
@@ -1079,9 +1093,16 @@ def get_iam_policy(self, client=None):
                   the ``getIamPolicy`` API request.
         """
         client = self._require_client(client)
+
+        query_params = {}
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
+
         info = client._connection.api_request(
             method='GET',
             path='%s/iam' % (self.path,),
+            query_params=query_params,
             _target_object=None)
         return Policy.from_api_repr(info)
 
@@ -1104,11 +1125,18 @@ def set_iam_policy(self, policy, client=None):
                   the ``setIamPolicy`` API request.
         """
         client = self._require_client(client)
+
+        query_params = {}
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
+
         resource = policy.to_api_repr()
         resource['resourceId'] = self.path
         info = client._connection.api_request(
             method='PUT',
             path='%s/iam' % (self.path,),
+            query_params=query_params,
             data=resource,
             _target_object=None)
         return Policy.from_api_repr(info)
@@ -1132,12 +1160,17 @@ def test_iam_permissions(self, permissions, client=None):
                   request.
         """
         client = self._require_client(client)
-        query = {'permissions': permissions}
+        query_params = {'permissions': permissions}
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
+
         path = '%s/iam/testPermissions' % (self.path,)
         resp = client._connection.api_request(
             method='GET',
             path=path,
-            query_params=query)
+            query_params=query_params)
+
         return resp.get('permissions', [])
 
     def make_public(self, client=None):
@@ -1167,13 +1200,22 @@ def compose(self, sources, client=None):
         """
         if self.content_type is None:
             raise ValueError("Destination 'content_type' not set.")
+
         client = self._require_client(client)
+        query_params = {}
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
+
         request = {
             'sourceObjects': [{'name': source.name} for source in sources],
             'destination': self._properties.copy(),
         }
         api_response = client._connection.api_request(
-            method='POST', path=self.path + '/compose', data=request,
+            method='POST',
+            path=self.path + '/compose',
+            query_params=query_params,
+            data=request,
             _target_object=self)
         self._set_properties(api_response)
 
@@ -1205,14 +1247,20 @@ def rewrite(self, source, token=None, client=None):
         headers.update(_get_encryption_headers(
             source._encryption_key, source=True))
 
+        query_params = {}
+
         if token:
-            query_params = {'rewriteToken': token}
-        else:
-            query_params = {}
+            query_params['rewriteToken'] = token
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
 
         api_response = client._connection.api_request(
-            method='POST', path=source.path + '/rewriteTo' + self.path,
-            query_params=query_params, data=self._properties, headers=headers,
+            method='POST',
+            path=source.path + '/rewriteTo' + self.path,
+            query_params=query_params,
+            data=self._properties,
+            headers=headers,
             _target_object=self)
         rewritten = int(api_response['totalBytesRewritten'])
         size = int(api_response['objectSize'])
@@ -1243,13 +1291,22 @@ def update_storage_class(self, new_class, client=None):
             raise ValueError("Invalid storage class: %s" % (new_class,))
 
         client = self._require_client(client)
+
+        query_params = {}
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
+
         headers = _get_encryption_headers(self._encryption_key)
         headers.update(_get_encryption_headers(
             self._encryption_key, source=True))
 
         api_response = client._connection.api_request(
-            method='POST', path=self.path + '/rewriteTo' + self.path,
-            data={'storageClass': new_class}, headers=headers,
+            method='POST',
+            path=self.path + '/rewriteTo' + self.path,
+            query_params=query_params,
+            data={'storageClass': new_class},
+            headers=headers,
             _target_object=self)
         self._set_properties(api_response['resource'])
 
diff --git a/storage/tests/unit/test_blob.py b/storage/tests/unit/test_blob.py
index 084745ebb54d9..1c31e9ea1b0f7 100644
--- a/storage/tests/unit/test_blob.py
+++ b/storage/tests/unit/test_blob.py
@@ -317,16 +317,31 @@ def test_exists_miss(self):
         bucket = _Bucket(client)
         blob = self._make_one(NONESUCH, bucket=bucket)
         self.assertFalse(blob.exists())
+        self.assertEqual(len(connection._requested), 1)
+        self.assertEqual(connection._requested[0], {
+            'method': 'GET',
+            'path': '/b/name/o/{}'.format(NONESUCH),
+            'query_params': {'fields': 'name'},
+            '_target_object': None,
+        })
 
-    def test_exists_hit(self):
+    def test_exists_hit_w_user_project(self):
         BLOB_NAME = 'blob-name'
+        USER_PROJECT = 'user-project-123'
         found_response = ({'status': http_client.OK}, b'')
         connection = _Connection(found_response)
         client = _Client(connection)
-        bucket = _Bucket(client)
+        bucket = _Bucket(client, user_project=USER_PROJECT)
         blob = self._make_one(BLOB_NAME, bucket=bucket)
         bucket._blobs[BLOB_NAME] = 1
         self.assertTrue(blob.exists())
+        self.assertEqual(len(connection._requested), 1)
+        self.assertEqual(connection._requested[0], {
+            'method': 'GET',
+            'path': '/b/name/o/{}'.format(BLOB_NAME),
+            'query_params': {'fields': 'name', 'userProject': USER_PROJECT},
+            '_target_object': None,
+        })
 
     def test_delete(self):
         BLOB_NAME = 'blob-name'
@@ -362,7 +377,7 @@ def test__get_download_url_with_media_link(self):
 
     def test__get_download_url_on_the_fly(self):
         blob_name = 'bzzz-fly.txt'
-        bucket = mock.Mock(path='/b/buhkit', spec=['path'])
+        bucket = _Bucket(name='buhkit')
         blob = self._make_one(blob_name, bucket=bucket)
 
         self.assertIsNone(blob.media_link)
@@ -374,7 +389,7 @@ def test__get_download_url_on_the_fly(self):
 
     def test__get_download_url_on_the_fly_with_generation(self):
         blob_name = 'pretend.txt'
-        bucket = mock.Mock(path='/b/fictional', spec=['path'])
+        bucket = _Bucket(name='fictional')
         blob = self._make_one(blob_name, bucket=bucket)
         generation = 1493058489532987
         # Set the media link on the blob
@@ -387,6 +402,20 @@ def test__get_download_url_on_the_fly_with_generation(self):
             'fictional/o/pretend.txt?alt=media&generation=1493058489532987')
         self.assertEqual(download_url, expected_url)
 
+    def test__get_download_url_on_the_fly_with_user_project(self):
+        blob_name = 'pretend.txt'
+        user_project = 'user-project-123'
+        bucket = _Bucket(name='fictional', user_project=user_project)
+        blob = self._make_one(blob_name, bucket=bucket)
+
+        self.assertIsNone(blob.media_link)
+        download_url = blob._get_download_url()
+        expected_url = (
+            'https://www.googleapis.com/download/storage/v1/b/'
+            'fictional/o/pretend.txt?alt=media&userProject={}'.format(
+                user_project))
+        self.assertEqual(download_url, expected_url)
+
     @staticmethod
     def _mock_requests_response(status_code, headers, content=b''):
         return mock.Mock(
@@ -778,8 +807,8 @@ def _mock_transport(self, status_code, headers, content=b''):
         return fake_transport
 
     def _do_multipart_success(self, mock_get_boundary, size=None,
-                              num_retries=None):
-        bucket = mock.Mock(path='/b/w00t', spec=[u'path'])
+                              num_retries=None, user_project=None):
+        bucket = _Bucket(name='w00t', user_project=user_project)
         blob = self._make_one(u'blob-name', bucket=bucket)
         self.assertIsNone(blob.chunk_size)
 
@@ -811,6 +840,8 @@ def _do_multipart_success(self, mock_get_boundary, size=None,
             'https://www.googleapis.com/upload/storage/v1' +
             bucket.path +
             '/o?uploadType=multipart')
+        if user_project is not None:
+            upload_url += '&userProject={}'.format(user_project)
         payload = (
             b'--==0==\r\n' +
             b'content-type: application/json; charset=UTF-8\r\n\r\n' +
@@ -833,6 +864,13 @@ def test__do_multipart_upload_no_size(self, mock_get_boundary):
     def test__do_multipart_upload_with_size(self, mock_get_boundary):
         self._do_multipart_success(mock_get_boundary, size=10)
 
+    @mock.patch(u'google.resumable_media._upload.get_boundary',
+                return_value=b'==0==')
+    def test__do_multipart_upload_with_user_project(self, mock_get_boundary):
+        user_project = 'user-project-123'
+        self._do_multipart_success(
+            mock_get_boundary, user_project=user_project)
+
     @mock.patch(u'google.resumable_media._upload.get_boundary',
                 return_value=b'==0==')
     def test__do_multipart_upload_with_retry(self, mock_get_boundary):
@@ -854,11 +892,12 @@ def test__do_multipart_upload_bad_size(self):
             'was specified but the file-like object only had', exc_contents)
         self.assertEqual(stream.tell(), len(data))
 
-    def _initiate_resumable_helper(self, size=None, extra_headers=None,
-                                   chunk_size=None, num_retries=None):
+    def _initiate_resumable_helper(
+            self, size=None, extra_headers=None, chunk_size=None,
+            num_retries=None, user_project=None):
         from google.resumable_media.requests import ResumableUpload
 
-        bucket = mock.Mock(path='/b/whammy', spec=[u'path'])
+        bucket = _Bucket(name='whammy', user_project=user_project)
         blob = self._make_one(u'blob-name', bucket=bucket)
         blob.metadata = {'rook': 'takes knight'}
         blob.chunk_size = 3 * blob._CHUNK_SIZE_MULTIPLE
@@ -892,6 +931,8 @@ def _initiate_resumable_helper(self, size=None, extra_headers=None,
             'https://www.googleapis.com/upload/storage/v1' +
             bucket.path +
             '/o?uploadType=resumable')
+        if user_project is not None:
+            upload_url += '&userProject={}'.format(user_project)
         self.assertEqual(upload.upload_url, upload_url)
         if extra_headers is None:
             self.assertEqual(upload._headers, {})
@@ -944,6 +985,10 @@ def test__initiate_resumable_upload_no_size(self):
     def test__initiate_resumable_upload_with_size(self):
         self._initiate_resumable_helper(size=10000)
 
+    def test__initiate_resumable_upload_with_user_project(self):
+        user_project = 'user-project-123'
+        self._initiate_resumable_helper(user_project=user_project)
+
     def test__initiate_resumable_upload_with_chunk_size(self):
         one_mb = 1048576
         self._initiate_resumable_helper(chunk_size=one_mb)
@@ -1023,7 +1068,7 @@ def _do_resumable_upload_call2(blob, content_type, data,
             'PUT', resumable_url, data=payload, headers=expected_headers)
 
     def _do_resumable_helper(self, use_size=False, num_retries=None):
-        bucket = mock.Mock(path='/b/yesterday', spec=[u'path'])
+        bucket = _Bucket(name='yesterday')
         blob = self._make_one(u'blob-name', bucket=bucket)
         blob.chunk_size = blob._CHUNK_SIZE_MULTIPLE
         self.assertIsNotNone(blob.chunk_size)
@@ -1266,7 +1311,7 @@ def test_upload_from_string_w_text(self):
 
     def _create_resumable_upload_session_helper(self, origin=None,
                                                 side_effect=None):
-        bucket = mock.Mock(path='/b/alex-trebek', spec=[u'path'])
+        bucket = _Bucket(name='alex-trebek')
         blob = self._make_one('blob-name', bucket=bucket)
         chunk_size = 99 * blob._CHUNK_SIZE_MULTIPLE
         blob.chunk_size = chunk_size
@@ -1377,8 +1422,49 @@ def test_get_iam_policy(self):
 
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'GET')
-        self.assertEqual(kw[0]['path'], '%s/iam' % (PATH,))
+        self.assertEqual(kw[0], {
+            'method': 'GET',
+            'path': '%s/iam' % (PATH,),
+            'query_params': {},
+            '_target_object': None,
+        })
+
+    def test_get_iam_policy_w_user_project(self):
+        from google.cloud.iam import Policy
+
+        BLOB_NAME = 'blob-name'
+        USER_PROJECT = 'user-project-123'
+        PATH = '/b/name/o/%s' % (BLOB_NAME,)
+        ETAG = 'DEADBEEF'
+        VERSION = 17
+        RETURNED = {
+            'resourceId': PATH,
+            'etag': ETAG,
+            'version': VERSION,
+            'bindings': [],
+        }
+        after = ({'status': http_client.OK}, RETURNED)
+        EXPECTED = {}
+        connection = _Connection(after)
+        client = _Client(connection)
+        bucket = _Bucket(client=client, user_project=USER_PROJECT)
+        blob = self._make_one(BLOB_NAME, bucket=bucket)
+
+        policy = blob.get_iam_policy()
+
+        self.assertIsInstance(policy, Policy)
+        self.assertEqual(policy.etag, RETURNED['etag'])
+        self.assertEqual(policy.version, RETURNED['version'])
+        self.assertEqual(dict(policy), EXPECTED)
+
+        kw = connection._requested
+        self.assertEqual(len(kw), 1)
+        self.assertEqual(kw[0], {
+            'method': 'GET',
+            'path': '%s/iam' % (PATH,),
+            'query_params': {'userProject': USER_PROJECT},
+            '_target_object': None,
+        })
 
     def test_set_iam_policy(self):
         import operator
@@ -1427,6 +1513,7 @@ def test_set_iam_policy(self):
         self.assertEqual(len(kw), 1)
         self.assertEqual(kw[0]['method'], 'PUT')
         self.assertEqual(kw[0]['path'], '%s/iam' % (PATH,))
+        self.assertEqual(kw[0]['query_params'], {})
         sent = kw[0]['data']
         self.assertEqual(sent['resourceId'], PATH)
         self.assertEqual(len(sent['bindings']), len(BINDINGS))
@@ -1438,6 +1525,41 @@ def test_set_iam_policy(self):
             self.assertEqual(
                 sorted(found['members']), sorted(expected['members']))
 
+    def test_set_iam_policy_w_user_project(self):
+        from google.cloud.iam import Policy
+
+        BLOB_NAME = 'blob-name'
+        USER_PROJECT = 'user-project-123'
+        PATH = '/b/name/o/%s' % (BLOB_NAME,)
+        ETAG = 'DEADBEEF'
+        VERSION = 17
+        BINDINGS = []
+        RETURNED = {
+            'etag': ETAG,
+            'version': VERSION,
+            'bindings': BINDINGS,
+        }
+        after = ({'status': http_client.OK}, RETURNED)
+        policy = Policy()
+
+        connection = _Connection(after)
+        client = _Client(connection)
+        bucket = _Bucket(client=client, user_project=USER_PROJECT)
+        blob = self._make_one(BLOB_NAME, bucket=bucket)
+
+        returned = blob.set_iam_policy(policy)
+
+        self.assertEqual(returned.etag, ETAG)
+        self.assertEqual(returned.version, VERSION)
+        self.assertEqual(dict(returned), dict(policy))
+
+        kw = connection._requested
+        self.assertEqual(len(kw), 1)
+        self.assertEqual(kw[0]['method'], 'PUT')
+        self.assertEqual(kw[0]['path'], '%s/iam' % (PATH,))
+        self.assertEqual(kw[0]['query_params'], {'userProject': USER_PROJECT})
+        self.assertEqual(kw[0]['data'], {'resourceId': PATH})
+
     def test_test_iam_permissions(self):
         from google.cloud.storage.iam import STORAGE_OBJECTS_LIST
         from google.cloud.storage.iam import STORAGE_BUCKETS_GET
@@ -1468,6 +1590,39 @@ def test_test_iam_permissions(self):
         self.assertEqual(kw[0]['path'], '%s/iam/testPermissions' % (PATH,))
         self.assertEqual(kw[0]['query_params'], {'permissions': PERMISSIONS})
 
+    def test_test_iam_permissions_w_user_project(self):
+        from google.cloud.storage.iam import STORAGE_OBJECTS_LIST
+        from google.cloud.storage.iam import STORAGE_BUCKETS_GET
+        from google.cloud.storage.iam import STORAGE_BUCKETS_UPDATE
+
+        BLOB_NAME = 'blob-name'
+        USER_PROJECT = 'user-project-123'
+        PATH = '/b/name/o/%s' % (BLOB_NAME,)
+        PERMISSIONS = [
+            STORAGE_OBJECTS_LIST,
+            STORAGE_BUCKETS_GET,
+            STORAGE_BUCKETS_UPDATE,
+        ]
+        ALLOWED = PERMISSIONS[1:]
+        RETURNED = {'permissions': ALLOWED}
+        after = ({'status': http_client.OK}, RETURNED)
+        connection = _Connection(after)
+        client = _Client(connection)
+        bucket = _Bucket(client=client, user_project=USER_PROJECT)
+        blob = self._make_one(BLOB_NAME, bucket=bucket)
+
+        allowed = blob.test_iam_permissions(PERMISSIONS)
+
+        self.assertEqual(allowed, ALLOWED)
+
+        kw = connection._requested
+        self.assertEqual(len(kw), 1)
+        self.assertEqual(kw[0]['method'], 'GET')
+        self.assertEqual(kw[0]['path'], '%s/iam/testPermissions' % (PATH,))
+        self.assertEqual(
+            kw[0]['query_params'],
+            {'permissions': PERMISSIONS, 'userProject': USER_PROJECT})
+
     def test_make_public(self):
         from google.cloud.storage.acl import _ACLEntity
 
@@ -1502,17 +1657,18 @@ def test_compose_wo_content_type_set(self):
         with self.assertRaises(ValueError):
             destination.compose(sources=[source_1, source_2])
 
-    def test_compose_minimal(self):
+    def test_compose_minimal_w_user_project(self):
         SOURCE_1 = 'source-1'
         SOURCE_2 = 'source-2'
         DESTINATION = 'destinaton'
         RESOURCE = {
             'etag': 'DEADBEEF'
         }
+        USER_PROJECT = 'user-project-123'
         after = ({'status': http_client.OK}, RESOURCE)
         connection = _Connection(after)
         client = _Client(connection)
-        bucket = _Bucket(client=client)
+        bucket = _Bucket(client=client, user_project=USER_PROJECT)
         source_1 = self._make_one(SOURCE_1, bucket=bucket)
         source_2 = self._make_one(SOURCE_2, bucket=bucket)
         destination = self._make_one(DESTINATION, bucket=bucket)
@@ -1522,20 +1678,23 @@ def test_compose_minimal(self):
 
         self.assertEqual(destination.etag, 'DEADBEEF')
 
-        SENT = {
-            'sourceObjects': [
-                {'name': source_1.name},
-                {'name': source_2.name},
-            ],
-            'destination': {
-                'contentType': 'text/plain',
-            },
-        }
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'POST')
-        self.assertEqual(kw[0]['path'], '/b/name/o/%s/compose' % DESTINATION)
-        self.assertEqual(kw[0]['data'], SENT)
+        self.assertEqual(kw[0], {
+            'method': 'POST',
+            'path': '/b/name/o/%s/compose' % DESTINATION,
+            'query_params': {'userProject': USER_PROJECT},
+            'data':  {
+                'sourceObjects': [
+                    {'name': source_1.name},
+                    {'name': source_2.name},
+                ],
+                'destination': {
+                    'contentType': 'text/plain',
+                },
+            },
+            '_target_object': destination,
+        })
 
     def test_compose_w_additional_property_changes(self):
         SOURCE_1 = 'source-1'
@@ -1559,24 +1718,27 @@ def test_compose_w_additional_property_changes(self):
 
         self.assertEqual(destination.etag, 'DEADBEEF')
 
-        SENT = {
-            'sourceObjects': [
-                {'name': source_1.name},
-                {'name': source_2.name},
-            ],
-            'destination': {
-                'contentType': 'text/plain',
-                'contentLanguage': 'en-US',
-                'metadata': {
-                    'my-key': 'my-value',
-                }
-            },
-        }
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'POST')
-        self.assertEqual(kw[0]['path'], '/b/name/o/%s/compose' % DESTINATION)
-        self.assertEqual(kw[0]['data'], SENT)
+        self.assertEqual(kw[0], {
+            'method': 'POST',
+            'path': '/b/name/o/%s/compose' % DESTINATION,
+            'query_params': {},
+            'data':  {
+                'sourceObjects': [
+                    {'name': source_1.name},
+                    {'name': source_2.name},
+                ],
+                'destination': {
+                    'contentType': 'text/plain',
+                    'contentLanguage': 'en-US',
+                    'metadata': {
+                        'my-key': 'my-value',
+                    }
+                },
+            },
+            '_target_object': destination,
+        })
 
     def test_rewrite_response_without_resource(self):
         SOURCE_BLOB = 'source'
@@ -1648,7 +1810,7 @@ def test_rewrite_other_bucket_other_name_no_encryption_partial(self):
         self.assertNotIn('X-Goog-Encryption-Key', headers)
         self.assertNotIn('X-Goog-Encryption-Key-Sha256', headers)
 
-    def test_rewrite_same_name_no_old_key_new_key_done(self):
+    def test_rewrite_same_name_no_old_key_new_key_done_w_user_project(self):
         import base64
         import hashlib
 
@@ -1657,6 +1819,7 @@ def test_rewrite_same_name_no_old_key_new_key_done(self):
         KEY_HASH = hashlib.sha256(KEY).digest()
         KEY_HASH_B64 = base64.b64encode(KEY_HASH).rstrip().decode('ascii')
         BLOB_NAME = 'blob'
+        USER_PROJECT = 'user-project-123'
         RESPONSE = {
             'totalBytesRewritten': 42,
             'objectSize': 42,
@@ -1666,7 +1829,7 @@ def test_rewrite_same_name_no_old_key_new_key_done(self):
         response = ({'status': http_client.OK}, RESPONSE)
         connection = _Connection(response)
         client = _Client(connection)
-        bucket = _Bucket(client=client)
+        bucket = _Bucket(client=client, user_project=USER_PROJECT)
         plain = self._make_one(BLOB_NAME, bucket=bucket)
         encrypted = self._make_one(BLOB_NAME, bucket=bucket,
                                    encryption_key=KEY)
@@ -1682,7 +1845,7 @@ def test_rewrite_same_name_no_old_key_new_key_done(self):
         self.assertEqual(kw[0]['method'], 'POST')
         PATH = '/b/name/o/%s/rewriteTo/b/name/o/%s' % (BLOB_NAME, BLOB_NAME)
         self.assertEqual(kw[0]['path'], PATH)
-        self.assertEqual(kw[0]['query_params'], {})
+        self.assertEqual(kw[0]['query_params'], {'userProject': USER_PROJECT})
         SENT = {}
         self.assertEqual(kw[0]['data'], SENT)
 
@@ -1785,7 +1948,7 @@ def test_update_storage_class_wo_encryption_key(self):
         self.assertEqual(kw[0]['method'], 'POST')
         PATH = '/b/name/o/%s/rewriteTo/b/name/o/%s' % (BLOB_NAME, BLOB_NAME)
         self.assertEqual(kw[0]['path'], PATH)
-        self.assertNotIn('query_params', kw[0])
+        self.assertEqual(kw[0]['query_params'], {})
         SENT = {'storageClass': STORAGE_CLASS}
         self.assertEqual(kw[0]['data'], SENT)
 
@@ -1799,7 +1962,7 @@ def test_update_storage_class_wo_encryption_key(self):
         self.assertNotIn('X-Goog-Encryption-Key', headers)
         self.assertNotIn('X-Goog-Encryption-Key-Sha256', headers)
 
-    def test_update_storage_class_w_encryption_key(self):
+    def test_update_storage_class_w_encryption_key_w_user_project(self):
         import base64
         import hashlib
 
@@ -1810,13 +1973,14 @@ def test_update_storage_class_w_encryption_key(self):
         BLOB_KEY_HASH_B64 = base64.b64encode(
             BLOB_KEY_HASH).rstrip().decode('ascii')
         STORAGE_CLASS = u'NEARLINE'
+        USER_PROJECT = 'user-project-123'
         RESPONSE = {
             'resource': {'storageClass': STORAGE_CLASS},
         }
         response = ({'status': http_client.OK}, RESPONSE)
         connection = _Connection(response)
         client = _Client(connection)
-        bucket = _Bucket(client=client)
+        bucket = _Bucket(client=client, user_project=USER_PROJECT)
         blob = self._make_one(
             BLOB_NAME, bucket=bucket, encryption_key=BLOB_KEY)
 
@@ -1829,7 +1993,7 @@ def test_update_storage_class_w_encryption_key(self):
         self.assertEqual(kw[0]['method'], 'POST')
         PATH = '/b/name/o/%s/rewriteTo/b/name/o/%s' % (BLOB_NAME, BLOB_NAME)
         self.assertEqual(kw[0]['path'], PATH)
-        self.assertNotIn('query_params', kw[0])
+        self.assertEqual(kw[0]['query_params'], {'userProject': USER_PROJECT})
         SENT = {'storageClass': STORAGE_CLASS}
         self.assertEqual(kw[0]['data'], SENT)
 

From f14bde39ab184407695b266becec05f42f2bf013 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Tue, 13 Jun 2017 15:51:20 -0400
Subject: [PATCH 029/211] Pass 'user_project' if set for BucketACL/BlobACL API
 requests (#3499)

---
 storage/google/cloud/storage/acl.py |  25 +++++-
 storage/tests/unit/test_acl.py      | 135 ++++++++++++++++++++--------
 2 files changed, 124 insertions(+), 36 deletions(-)

diff --git a/storage/google/cloud/storage/acl.py b/storage/google/cloud/storage/acl.py
index c4525ea887357..240662c4dc8dc 100644
--- a/storage/google/cloud/storage/acl.py
+++ b/storage/google/cloud/storage/acl.py
@@ -198,6 +198,7 @@ class ACL(object):
     # as properties).
     reload_path = None
     save_path = None
+    user_project = None
 
     def __init__(self):
         self.entities = {}
@@ -405,10 +406,18 @@ def reload(self, client=None):
         """
         path = self.reload_path
         client = self._require_client(client)
+        query_params = {}
+
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
 
         self.entities.clear()
 
-        found = client._connection.api_request(method='GET', path=path)
+        found = client._connection.api_request(
+            method='GET',
+            path=path,
+            query_params=query_params,
+        )
         self.loaded = True
         for entry in found.get('items', ()):
             self.add_entity(self.entity_from_dict(entry))
@@ -435,8 +444,12 @@ def _save(self, acl, predefined, client):
             acl = []
             query_params[self._PREDEFINED_QUERY_PARAM] = predefined
 
+        if self.user_project is not None:
+            query_params['userProject'] = self.user_project
+
         path = self.save_path
         client = self._require_client(client)
+
         result = client._connection.api_request(
             method='PATCH',
             path=path,
@@ -532,6 +545,11 @@ def save_path(self):
         """Compute the path for PATCH API requests for this ACL."""
         return self.bucket.path
 
+    @property
+    def user_project(self):
+        """Compute the user project charged for API requests for this ACL."""
+        return self.bucket.user_project
+
 
 class DefaultObjectACL(BucketACL):
     """A class representing the default object ACL for a bucket."""
@@ -565,3 +583,8 @@ def reload_path(self):
     def save_path(self):
         """Compute the path for PATCH API requests for this ACL."""
         return self.blob.path
+
+    @property
+    def user_project(self):
+        """Compute the user project charged for API requests for this ACL."""
+        return self.blob.user_project
diff --git a/storage/tests/unit/test_acl.py b/storage/tests/unit/test_acl.py
index 1159c8c1f2aac..4e4018ae7c8cf 100644
--- a/storage/tests/unit/test_acl.py
+++ b/storage/tests/unit/test_acl.py
@@ -532,8 +532,11 @@ def test_reload_missing(self):
         self.assertEqual(list(acl), [])
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'GET')
-        self.assertEqual(kw[0]['path'], '/testing/acl')
+        self.assertEqual(kw[0], {
+            'method': 'GET',
+            'path': '/testing/acl',
+            'query_params': {},
+        })
 
     def test_reload_empty_result_clears_local(self):
         ROLE = 'role'
@@ -543,29 +546,41 @@ def test_reload_empty_result_clears_local(self):
         acl.reload_path = '/testing/acl'
         acl.loaded = True
         acl.entity('allUsers', ROLE)
+
         acl.reload(client=client)
+
         self.assertTrue(acl.loaded)
         self.assertEqual(list(acl), [])
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'GET')
-        self.assertEqual(kw[0]['path'], '/testing/acl')
+        self.assertEqual(kw[0], {
+            'method': 'GET',
+            'path': '/testing/acl',
+            'query_params': {},
+        })
 
-    def test_reload_nonempty_result(self):
+    def test_reload_nonempty_result_w_user_project(self):
         ROLE = 'role'
+        USER_PROJECT = 'user-project-123'
         connection = _Connection(
             {'items': [{'entity': 'allUsers', 'role': ROLE}]})
         client = _Client(connection)
         acl = self._make_one()
         acl.reload_path = '/testing/acl'
         acl.loaded = True
+        acl.user_project = USER_PROJECT
+
         acl.reload(client=client)
+
         self.assertTrue(acl.loaded)
         self.assertEqual(list(acl), [{'entity': 'allUsers', 'role': ROLE}])
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'GET')
-        self.assertEqual(kw[0]['path'], '/testing/acl')
+        self.assertEqual(kw[0], {
+            'method': 'GET',
+            'path': '/testing/acl',
+            'query_params': {'userProject': USER_PROJECT},
+        })
 
     def test_save_none_set_none_passed(self):
         connection = _Connection()
@@ -606,30 +621,43 @@ def test_save_no_acl(self):
         self.assertEqual(len(kw), 1)
         self.assertEqual(kw[0]['method'], 'PATCH')
         self.assertEqual(kw[0]['path'], '/testing')
-        self.assertEqual(kw[0]['data'], {'acl': AFTER})
-        self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
-
-    def test_save_w_acl(self):
+        self.assertEqual(kw[0], {
+            'method': 'PATCH',
+            'path': '/testing',
+            'query_params': {'projection': 'full'},
+            'data': {'acl': AFTER},
+        })
+
+    def test_save_w_acl_w_user_project(self):
         ROLE1 = 'role1'
         ROLE2 = 'role2'
         STICKY = {'entity': 'allUsers', 'role': ROLE2}
+        USER_PROJECT = 'user-project-123'
         new_acl = [{'entity': 'allUsers', 'role': ROLE1}]
         connection = _Connection({'acl': [STICKY] + new_acl})
         client = _Client(connection)
         acl = self._make_one()
         acl.save_path = '/testing'
         acl.loaded = True
+        acl.user_project = USER_PROJECT
+
         acl.save(new_acl, client=client)
+
         entries = list(acl)
         self.assertEqual(len(entries), 2)
         self.assertTrue(STICKY in entries)
         self.assertTrue(new_acl[0] in entries)
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'PATCH')
-        self.assertEqual(kw[0]['path'], '/testing')
-        self.assertEqual(kw[0]['data'], {'acl': new_acl})
-        self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
+        self.assertEqual(kw[0], {
+            'method': 'PATCH',
+            'path': '/testing',
+            'query_params': {
+                'projection': 'full',
+                'userProject': USER_PROJECT,
+            },
+            'data': {'acl': new_acl},
+        })
 
     def test_save_prefefined_invalid(self):
         connection = _Connection()
@@ -652,11 +680,15 @@ def test_save_predefined_valid(self):
         self.assertEqual(len(entries), 0)
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'PATCH')
-        self.assertEqual(kw[0]['path'], '/testing')
-        self.assertEqual(kw[0]['data'], {'acl': []})
-        self.assertEqual(kw[0]['query_params'],
-                         {'projection': 'full', 'predefinedAcl': PREDEFINED})
+        self.assertEqual(kw[0], {
+            'method': 'PATCH',
+            'path': '/testing',
+            'query_params': {
+                'projection': 'full',
+                'predefinedAcl': PREDEFINED,
+            },
+            'data': {'acl': []},
+        })
 
     def test_save_predefined_w_XML_alias(self):
         PREDEFINED_XML = 'project-private'
@@ -671,12 +703,15 @@ def test_save_predefined_w_XML_alias(self):
         self.assertEqual(len(entries), 0)
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'PATCH')
-        self.assertEqual(kw[0]['path'], '/testing')
-        self.assertEqual(kw[0]['data'], {'acl': []})
-        self.assertEqual(kw[0]['query_params'],
-                         {'projection': 'full',
-                          'predefinedAcl': PREDEFINED_JSON})
+        self.assertEqual(kw[0], {
+            'method': 'PATCH',
+            'path': '/testing',
+            'query_params': {
+                'projection': 'full',
+                'predefinedAcl': PREDEFINED_JSON,
+            },
+            'data': {'acl': []},
+        })
 
     def test_save_predefined_valid_w_alternate_query_param(self):
         # Cover case where subclass overrides _PREDEFINED_QUERY_PARAM
@@ -692,11 +727,15 @@ def test_save_predefined_valid_w_alternate_query_param(self):
         self.assertEqual(len(entries), 0)
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'PATCH')
-        self.assertEqual(kw[0]['path'], '/testing')
-        self.assertEqual(kw[0]['data'], {'acl': []})
-        self.assertEqual(kw[0]['query_params'],
-                         {'projection': 'full', 'alternate': PREDEFINED})
+        self.assertEqual(kw[0], {
+            'method': 'PATCH',
+            'path': '/testing',
+            'query_params': {
+                'projection': 'full',
+                'alternate': PREDEFINED,
+            },
+            'data': {'acl': []},
+        })
 
     def test_clear(self):
         ROLE1 = 'role1'
@@ -712,10 +751,12 @@ def test_clear(self):
         self.assertEqual(list(acl), [STICKY])
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'PATCH')
-        self.assertEqual(kw[0]['path'], '/testing')
-        self.assertEqual(kw[0]['data'], {'acl': []})
-        self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
+        self.assertEqual(kw[0], {
+            'method': 'PATCH',
+            'path': '/testing',
+            'query_params': {'projection': 'full'},
+            'data': {'acl': []},
+        })
 
 
 class Test_BucketACL(unittest.TestCase):
@@ -739,6 +780,15 @@ def test_ctor(self):
         self.assertEqual(acl.reload_path, '/b/%s/acl' % NAME)
         self.assertEqual(acl.save_path, '/b/%s' % NAME)
 
+    def test_user_project(self):
+        NAME = 'name'
+        USER_PROJECT = 'user-project-123'
+        bucket = _Bucket(NAME)
+        acl = self._make_one(bucket)
+        self.assertIsNone(acl.user_project)
+        bucket.user_project = USER_PROJECT
+        self.assertEqual(acl.user_project, USER_PROJECT)
+
 
 class Test_DefaultObjectACL(unittest.TestCase):
 
@@ -785,9 +835,22 @@ def test_ctor(self):
         self.assertEqual(acl.reload_path, '/b/%s/o/%s/acl' % (NAME, BLOB_NAME))
         self.assertEqual(acl.save_path, '/b/%s/o/%s' % (NAME, BLOB_NAME))
 
+    def test_user_project(self):
+        NAME = 'name'
+        BLOB_NAME = 'blob-name'
+        USER_PROJECT = 'user-project-123'
+        bucket = _Bucket(NAME)
+        blob = _Blob(bucket, BLOB_NAME)
+        acl = self._make_one(blob)
+        self.assertIsNone(acl.user_project)
+        blob.user_project = USER_PROJECT
+        self.assertEqual(acl.user_project, USER_PROJECT)
+
 
 class _Blob(object):
 
+    user_project = None
+
     def __init__(self, bucket, blob):
         self.bucket = bucket
         self.blob = blob
@@ -799,6 +862,8 @@ def path(self):
 
 class _Bucket(object):
 
+    user_project = None
+
     def __init__(self, name):
         self.name = name
 

From 7e3fae0a485bfc6c9c336d8dcc2dfa491235638a Mon Sep 17 00:00:00 2001
From: Gary Elliott <garye@users.noreply.github.com>
Date: Mon, 19 Jun 2017 12:04:00 -0400
Subject: [PATCH 030/211] Add sentence about row ordering (#3504)

I'm not sure if this is the best place for this, but we want to make sure it's documented that rows are returned in row key order.
---
 bigtable/google/cloud/bigtable/row_data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigtable/google/cloud/bigtable/row_data.py b/bigtable/google/cloud/bigtable/row_data.py
index 60fc1f0ef1e8c..78179db25c4e5 100644
--- a/bigtable/google/cloud/bigtable/row_data.py
+++ b/bigtable/google/cloud/bigtable/row_data.py
@@ -256,7 +256,7 @@ def consume_next(self):
         """Consume the next ``ReadRowsResponse`` from the stream.
 
         Parse the response and its chunks into a new/existing row in
-        :attr:`_rows`
+        :attr:`_rows`. Rows are returned in order by row key.
         """
         response = six.next(self._response_iterator)
         self._counter += 1

From 661816540f1387bcc6e08b0fd722f4abae585b37 Mon Sep 17 00:00:00 2001
From: Dima Timofeev <dimkat@gmail.com>
Date: Mon, 19 Jun 2017 21:45:23 +0100
Subject: [PATCH 031/211] Allow bulk update of records via 'MutateRows' API
 (#3401)

---
 bigtable/google/cloud/bigtable/table.py | 111 +++++++++++++++++-
 bigtable/tests/system.py                |  27 +++++
 bigtable/tests/unit/test_row.py         |   1 +
 bigtable/tests/unit/test_table.py       | 148 ++++++++++++++++++++++++
 4 files changed, 286 insertions(+), 1 deletion(-)

diff --git a/bigtable/google/cloud/bigtable/table.py b/bigtable/google/cloud/bigtable/table.py
index 3fbd198d6b655..8dbf8c1ce6fbf 100644
--- a/bigtable/google/cloud/bigtable/table.py
+++ b/bigtable/google/cloud/bigtable/table.py
@@ -12,7 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""User friendly container for Google Cloud Bigtable Table."""
+"""User-friendly container for Google Cloud Bigtable Table."""
+
+
+import six
 
 from google.cloud._helpers import _to_bytes
 from google.cloud.bigtable._generated import (
@@ -29,6 +32,19 @@
 from google.cloud.bigtable.row_data import PartialRowsData
 
 
+# Maximum number of mutations in bulk (MutateRowsRequest message):
+# https://cloud.google.com/bigtable/docs/reference/data/rpc/google.bigtable.v2#google.bigtable.v2.MutateRowRequest
+_MAX_BULK_MUTATIONS = 100000
+
+
+class TableMismatchError(ValueError):
+    """Row from another table."""
+
+
+class TooManyMutationsError(ValueError):
+    """The number of mutations for bulk request is too big."""
+
+
 class Table(object):
     """Representation of a Google Cloud Bigtable Table.
 
@@ -276,6 +292,35 @@ def read_rows(self, start_key=None, end_key=None, limit=None,
         # We expect an iterator of `data_messages_v2_pb2.ReadRowsResponse`
         return PartialRowsData(response_iterator)
 
+    def mutate_rows(self, rows):
+        """Mutates multiple rows in bulk.
+
+        The method tries to update all specified rows.
+        If some of the rows weren't updated, it would not remove mutations.
+        They can be applied to the row separately.
+        If row mutations finished successfully, they would be cleaned up.
+
+        :type rows: list
+        :param rows: List or other iterable of :class:`.DirectRow` instances.
+
+        :rtype: list
+        :returns: A list of response statuses (`google.rpc.status_pb2.Status`)
+                  corresponding to success or failure of each row mutation
+                  sent. These will be in the same order as the `rows`.
+        """
+        mutate_rows_request = _mutate_rows_request(self.name, rows)
+        client = self._instance._client
+        responses = client._data_stub.MutateRows(mutate_rows_request)
+
+        responses_statuses = [
+            None for _ in six.moves.xrange(len(mutate_rows_request.entries))]
+        for response in responses:
+            for entry in response.entries:
+                responses_statuses[entry.index] = entry.status
+                if entry.status.code == 0:
+                    rows[entry.index].clear()
+        return responses_statuses
+
     def sample_row_keys(self):
         """Read a sample of row keys in the table.
 
@@ -373,3 +418,67 @@ def _create_row_request(table_name, row_key=None, start_key=None, end_key=None,
         message.rows.row_ranges.add(**range_kwargs)
 
     return message
+
+
+def _mutate_rows_request(table_name, rows):
+    """Creates a request to mutate rows in a table.
+
+    :type table_name: str
+    :param table_name: The name of the table to write to.
+
+    :type rows: list
+    :param rows: List or other iterable of :class:`.DirectRow` instances.
+
+    :rtype: :class:`data_messages_v2_pb2.MutateRowsRequest`
+    :returns: The ``MutateRowsRequest`` protobuf corresponding to the inputs.
+    :raises: :exc:`~.table.TooManyMutationsError` if the number of mutations is
+             greater than 100,000
+    """
+    request_pb = data_messages_v2_pb2.MutateRowsRequest(table_name=table_name)
+    mutations_count = 0
+    for row in rows:
+        _check_row_table_name(table_name, row)
+        _check_row_type(row)
+        entry = request_pb.entries.add()
+        entry.row_key = row.row_key
+        # NOTE: Since `_check_row_type` has verified `row` is a `DirectRow`,
+        #  the mutations have no state.
+        for mutation in row._get_mutations(None):
+            mutations_count += 1
+            entry.mutations.add().CopyFrom(mutation)
+    if mutations_count > _MAX_BULK_MUTATIONS:
+        raise TooManyMutationsError('Maximum number of mutations is %s' %
+                                    (_MAX_BULK_MUTATIONS,))
+    return request_pb
+
+
+def _check_row_table_name(table_name, row):
+    """Checks that a row belongs to a table.
+
+    :type table_name: str
+    :param table_name: The name of the table.
+
+    :type row: :class:`.Row`
+    :param row: An instance of :class:`.Row` subclasses.
+
+    :raises: :exc:`~.table.TableMismatchError` if the row does not belong to
+             the table.
+    """
+    if row.table.name != table_name:
+        raise TableMismatchError(
+            'Row %s is a part of %s table. Current table: %s' %
+            (row.row_key, row.table.name, table_name))
+
+
+def _check_row_type(row):
+    """Checks that a row is an instance of :class:`.DirectRow`.
+
+    :type row: :class:`.Row`
+    :param row: An instance of :class:`.Row` subclasses.
+
+    :raises: :class:`TypeError <exceptions.TypeError>` if the row is not an
+             instance of DirectRow.
+    """
+    if not isinstance(row, DirectRow):
+        raise TypeError('Bulk processing can not be applied for '
+                        'conditional or append mutations.')
diff --git a/bigtable/tests/system.py b/bigtable/tests/system.py
index faed85fdb302f..1fcda808db397 100644
--- a/bigtable/tests/system.py
+++ b/bigtable/tests/system.py
@@ -356,6 +356,33 @@ def _write_to_row(self, row1=None, row2=None, row3=None, row4=None):
         cell4 = Cell(CELL_VAL4, timestamp4)
         return cell1, cell2, cell3, cell4
 
+    def test_mutate_rows(self):
+        row1 = self._table.row(ROW_KEY)
+        row1.set_cell(COLUMN_FAMILY_ID1, COL_NAME1, CELL_VAL1)
+        row1.commit()
+        self.rows_to_delete.append(row1)
+        row2 = self._table.row(ROW_KEY_ALT)
+        row2.set_cell(COLUMN_FAMILY_ID1, COL_NAME1, CELL_VAL2)
+        row2.commit()
+        self.rows_to_delete.append(row2)
+
+        # Change the contents
+        row1.set_cell(COLUMN_FAMILY_ID1, COL_NAME1, CELL_VAL3)
+        row2.set_cell(COLUMN_FAMILY_ID1, COL_NAME1, CELL_VAL4)
+        rows = [row1, row2]
+        statuses = self._table.mutate_rows(rows)
+        result = [status.code for status in statuses]
+        expected_result = [0, 0]
+        self.assertEqual(result, expected_result)
+
+        # Check the contents
+        row1_data = self._table.read_row(ROW_KEY)
+        self.assertEqual(
+            row1_data.cells[COLUMN_FAMILY_ID1][COL_NAME1][0].value, CELL_VAL3)
+        row2_data = self._table.read_row(ROW_KEY_ALT)
+        self.assertEqual(
+            row2_data.cells[COLUMN_FAMILY_ID1][COL_NAME1][0].value, CELL_VAL4)
+
     def test_read_large_cell_limit(self):
         row = self._table.row(ROW_KEY)
         self.rows_to_delete.append(row)
diff --git a/bigtable/tests/unit/test_row.py b/bigtable/tests/unit/test_row.py
index 046934ca1f272..156a517b351a7 100644
--- a/bigtable/tests/unit/test_row.py
+++ b/bigtable/tests/unit/test_row.py
@@ -21,6 +21,7 @@ class TestRow(unittest.TestCase):
     @staticmethod
     def _get_target_class():
         from google.cloud.bigtable.row import Row
+
         return Row
 
     def _make_one(self, *args, **kwargs):
diff --git a/bigtable/tests/unit/test_table.py b/bigtable/tests/unit/test_table.py
index 63844f5d48b72..5867e76aff733 100644
--- a/bigtable/tests/unit/test_table.py
+++ b/bigtable/tests/unit/test_table.py
@@ -15,6 +15,109 @@
 
 import unittest
 
+import mock
+
+
+class Test___mutate_rows_request(unittest.TestCase):
+
+    def _call_fut(self, table_name, rows):
+        from google.cloud.bigtable.table import _mutate_rows_request
+
+        return _mutate_rows_request(table_name, rows)
+
+    @mock.patch('google.cloud.bigtable.table._MAX_BULK_MUTATIONS', new=3)
+    def test__mutate_rows_too_many_mutations(self):
+        from google.cloud.bigtable.row import DirectRow
+        from google.cloud.bigtable.table import TooManyMutationsError
+
+        table = mock.Mock(name='table', spec=['name'])
+        table.name = 'table'
+        rows = [DirectRow(row_key=b'row_key', table=table),
+                DirectRow(row_key=b'row_key_2', table=table)]
+        rows[0].set_cell('cf1', b'c1', 1)
+        rows[0].set_cell('cf1', b'c1', 2)
+        rows[1].set_cell('cf1', b'c1', 3)
+        rows[1].set_cell('cf1', b'c1', 4)
+        with self.assertRaises(TooManyMutationsError):
+            self._call_fut('table', rows)
+
+    def test__mutate_rows_request(self):
+        from google.cloud.bigtable.row import DirectRow
+
+        table = mock.Mock(name='table', spec=['name'])
+        table.name = 'table'
+        rows = [DirectRow(row_key=b'row_key', table=table),
+                DirectRow(row_key=b'row_key_2', table=table)]
+        rows[0].set_cell('cf1', b'c1', b'1')
+        rows[1].set_cell('cf1', b'c1', b'2')
+        result = self._call_fut('table', rows)
+
+        expected_result = _mutate_rows_request_pb(table_name='table')
+        entry1 = expected_result.entries.add()
+        entry1.row_key = b'row_key'
+        mutations1 = entry1.mutations.add()
+        mutations1.set_cell.family_name = 'cf1'
+        mutations1.set_cell.column_qualifier = b'c1'
+        mutations1.set_cell.timestamp_micros = -1
+        mutations1.set_cell.value = b'1'
+        entry2 = expected_result.entries.add()
+        entry2.row_key = b'row_key_2'
+        mutations2 = entry2.mutations.add()
+        mutations2.set_cell.family_name = 'cf1'
+        mutations2.set_cell.column_qualifier = b'c1'
+        mutations2.set_cell.timestamp_micros = -1
+        mutations2.set_cell.value = b'2'
+
+        self.assertEqual(result, expected_result)
+
+
+class Test__check_row_table_name(unittest.TestCase):
+
+    def _call_fut(self, table_name, row):
+        from google.cloud.bigtable.table import _check_row_table_name
+
+        return _check_row_table_name(table_name, row)
+
+    def test_wrong_table_name(self):
+        from google.cloud.bigtable.table import TableMismatchError
+        from google.cloud.bigtable.row import DirectRow
+
+        table = mock.Mock(name='table', spec=['name'])
+        table.name = 'table'
+        row = DirectRow(row_key=b'row_key', table=table)
+        with self.assertRaises(TableMismatchError):
+            self._call_fut('other_table', row)
+
+    def test_right_table_name(self):
+        from google.cloud.bigtable.row import DirectRow
+
+        table = mock.Mock(name='table', spec=['name'])
+        table.name = 'table'
+        row = DirectRow(row_key=b'row_key', table=table)
+        result = self._call_fut('table', row)
+        self.assertFalse(result)
+
+
+class Test__check_row_type(unittest.TestCase):
+    def _call_fut(self, row):
+        from google.cloud.bigtable.table import _check_row_type
+
+        return _check_row_type(row)
+
+    def test_test_wrong_row_type(self):
+        from google.cloud.bigtable.row import ConditionalRow
+
+        row = ConditionalRow(row_key=b'row_key', table='table', filter_=None)
+        with self.assertRaises(TypeError):
+            self._call_fut(row)
+
+    def test_right_row_type(self):
+        from google.cloud.bigtable.row import DirectRow
+
+        row = DirectRow(row_key=b'row_key', table='table')
+        result = self._call_fut(row)
+        self.assertFalse(result)
+
 
 class TestTable(unittest.TestCase):
 
@@ -348,6 +451,44 @@ def test_read_row_still_partial(self):
         with self.assertRaises(ValueError):
             self._read_row_helper(chunks, None)
 
+    def test_mutate_rows(self):
+        from google.cloud.bigtable._generated.bigtable_pb2 import (
+            MutateRowsResponse)
+        from google.cloud.bigtable.row import DirectRow
+        from google.rpc.status_pb2 import Status
+        from tests.unit._testing import _FakeStub
+
+        client = _Client()
+        instance = _Instance(self.INSTANCE_NAME, client=client)
+        table = self._make_one(self.TABLE_ID, instance)
+
+        row_1 = DirectRow(row_key=b'row_key', table=table)
+        row_1.set_cell('cf', b'col', b'value1')
+        row_2 = DirectRow(row_key=b'row_key_2', table=table)
+        row_2.set_cell('cf', b'col', b'value2')
+
+        response = MutateRowsResponse(
+            entries=[
+                MutateRowsResponse.Entry(
+                    index=0,
+                    status=Status(code=0),
+                ),
+                MutateRowsResponse.Entry(
+                    index=1,
+                    status=Status(code=1),
+                ),
+            ],
+        )
+
+        # Patch the stub used by the API method.
+        client._data_stub = _FakeStub([response])
+        statuses = table.mutate_rows([row_1, row_2])
+        result = [status.code for status in statuses]
+        expected_result = [0, 1]
+
+        self.assertEqual(result, expected_result)
+
+
     def test_read_rows(self):
         from google.cloud._testing import _Monkey
         from tests.unit._testing import _FakeStub
@@ -570,6 +711,13 @@ def _SampleRowKeysRequestPB(*args, **kw):
     return messages_v2_pb2.SampleRowKeysRequest(*args, **kw)
 
 
+def _mutate_rows_request_pb(*args, **kw):
+    from google.cloud.bigtable._generated import (
+        bigtable_pb2 as data_messages_v2_pb2)
+
+    return data_messages_v2_pb2.MutateRowsRequest(*args, **kw)
+
+
 def _TablePB(*args, **kw):
     from google.cloud.bigtable._generated import (
         table_pb2 as table_v2_pb2)

From 013949fc6872f07573da517910dbbd372c5e03cc Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <apartheniou@electricalengineer.ca>
Date: Wed, 21 Jun 2017 10:39:29 -0400
Subject: [PATCH 032/211] Fix broken link in the client Google Auth credentials
 help text (#3517)

---
 core/google/cloud/client.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/google/cloud/client.py b/core/google/cloud/client.py
index e7e43faf1e452..9bdbf507d2014 100644
--- a/core/google/cloud/client.py
+++ b/core/google/cloud/client.py
@@ -29,8 +29,8 @@
 
 _GOOGLE_AUTH_CREDENTIALS_HELP = (
     'This library only supports credentials from google-auth-library-python. '
-    'See https://google-cloud-python.readthedocs.io/en/latest/'
-    'google-cloud-auth.html for help on authentication with this library.'
+    'See https://google-cloud-python.readthedocs.io/en/latest/core/auth.html '
+    'for help on authentication with this library.'
 )
 
 

From 46ced007015eea8b7b8fe9a23e3d84cd8629eaeb Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Thu, 22 Jun 2017 12:46:11 -0700
Subject: [PATCH 033/211] Add back pylint as info-only for core (#3515)

---
 .gitignore            |  3 ++-
 core/nox.py           | 15 ++++++++++-----
 core/pylint.config.py | 25 +++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 core/pylint.config.py

diff --git a/.gitignore b/.gitignore
index df4fe06fa5aee..dbce921dd1eb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,7 +56,8 @@ coverage.xml
 system_tests/local_test_setup
 
 # Make sure a generated file isn't accidentally committed.
-scripts/pylintrc_reduced
+pylintrc
+pylintrc.test
 
 # Directories used for creating generated PB2 files
 generated_python/
diff --git a/core/nox.py b/core/nox.py
index d941d60092b81..38268bcd2f904 100644
--- a/core/nox.py
+++ b/core/nox.py
@@ -14,8 +14,6 @@
 
 from __future__ import absolute_import
 
-import os
-
 import nox
 
 
@@ -43,15 +41,22 @@ def unit_tests(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8')
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools')
     session.install('.')
     session.run('flake8', 'google/cloud/core')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/core/pylint.config.py b/core/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/core/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)

From 27dcf5aa5ecaee1c06021b788286b68e7b294e46 Mon Sep 17 00:00:00 2001
From: smasue <samuel.masue@gmail.com>
Date: Fri, 23 Jun 2017 18:28:31 +0200
Subject: [PATCH 034/211] BigQuery _EnumProperty ValueError messages are not
 displayed properly (#3520)

---
 bigquery/google/cloud/bigquery/_helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigquery/google/cloud/bigquery/_helpers.py b/bigquery/google/cloud/bigquery/_helpers.py
index 7557111d100e2..6641fbe01b422 100644
--- a/bigquery/google/cloud/bigquery/_helpers.py
+++ b/bigquery/google/cloud/bigquery/_helpers.py
@@ -318,7 +318,7 @@ def _validate(self, value):
         :raises: ValueError if value is not allowed.
         """
         if value not in self.ALLOWED:
-            raise ValueError('Pass one of: %s' ', '.join(self.ALLOWED))
+            raise ValueError('Pass one of: %s' % ', '.join(self.ALLOWED))
 
 
 class UDFResource(object):

From cbf073bc5469bac9398a5bf7aa5e93e6cb637211 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Fri, 23 Jun 2017 15:08:10 -0700
Subject: [PATCH 035/211] Re-enable pylint in info-only mode for all packages
 (#3519)

---
 bigquery/nox.py                          | 13 +++++++++---
 bigquery/pylint.config.py                | 25 ++++++++++++++++++++++++
 bigtable/nox.py                          | 13 +++++++++---
 bigtable/pylint.config.py                | 25 ++++++++++++++++++++++++
 datastore/nox.py                         | 13 +++++++++---
 datastore/pylint.config.py               | 25 ++++++++++++++++++++++++
 dns/nox.py                               | 15 ++++++++++----
 dns/pylint.config.py                     | 25 ++++++++++++++++++++++++
 error_reporting/nox.py                   | 13 +++++++++---
 error_reporting/pylint.config.py         | 25 ++++++++++++++++++++++++
 language/nox.py                          | 13 +++++++++---
 language/pylint.config.py                | 25 ++++++++++++++++++++++++
 logging/nox.py                           | 13 +++++++++---
 logging/pylint.config.py                 | 25 ++++++++++++++++++++++++
 monitoring/nox.py                        | 13 +++++++++---
 monitoring/pylint.config.py              | 25 ++++++++++++++++++++++++
 pubsub/nox.py                            | 13 +++++++++---
 pubsub/pylint.config.py                  | 25 ++++++++++++++++++++++++
 resource_manager/nox.py                  | 13 +++++++++---
 resource_manager/pylint.config.py        | 25 ++++++++++++++++++++++++
 runtimeconfig/nox.py                     | 13 +++++++++---
 runtimeconfig/pylint.config.py           | 25 ++++++++++++++++++++++++
 spanner/nox.py                           | 13 +++++++++---
 spanner/pylint.config.py                 | 25 ++++++++++++++++++++++++
 speech/nox.py                            | 13 +++++++++---
 speech/pylint.config.py                  | 25 ++++++++++++++++++++++++
 storage/nox.py                           | 13 +++++++++---
 storage/pylint.config.py                 | 25 ++++++++++++++++++++++++
 translate/nox.py                         | 13 +++++++++---
 translate/pylint.config.py               | 25 ++++++++++++++++++++++++
 videointelligence/pylint.config.py       | 25 ++++++++++++++++++++++++
 vision/google/cloud/vision/__init__.py   |  2 +-
 vision/google/cloud/vision/decorators.py |  2 --
 vision/google/cloud/vision/helpers.py    |  2 --
 vision/nox.py                            | 15 ++++++++++----
 vision/pylint.config.py                  | 25 ++++++++++++++++++++++++
 36 files changed, 588 insertions(+), 55 deletions(-)
 create mode 100644 bigquery/pylint.config.py
 create mode 100644 bigtable/pylint.config.py
 create mode 100644 datastore/pylint.config.py
 create mode 100644 dns/pylint.config.py
 create mode 100644 error_reporting/pylint.config.py
 create mode 100644 language/pylint.config.py
 create mode 100644 logging/pylint.config.py
 create mode 100644 monitoring/pylint.config.py
 create mode 100644 pubsub/pylint.config.py
 create mode 100644 resource_manager/pylint.config.py
 create mode 100644 runtimeconfig/pylint.config.py
 create mode 100644 spanner/pylint.config.py
 create mode 100644 speech/pylint.config.py
 create mode 100644 storage/pylint.config.py
 create mode 100644 translate/pylint.config.py
 create mode 100644 videointelligence/pylint.config.py
 create mode 100644 vision/pylint.config.py

diff --git a/bigquery/nox.py b/bigquery/nox.py
index 27bfb7f87ac42..a08e9fb307c28 100644
--- a/bigquery/nox.py
+++ b/bigquery/nox.py
@@ -66,15 +66,22 @@ def system_tests(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/bigquery')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/bigquery/pylint.config.py b/bigquery/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/bigquery/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/bigtable/nox.py b/bigtable/nox.py
index bc60a19c82177..611de0bc93386 100644
--- a/bigtable/nox.py
+++ b/bigtable/nox.py
@@ -65,15 +65,22 @@ def system_tests(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/bigtable')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/bigtable/pylint.config.py b/bigtable/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/bigtable/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/datastore/nox.py b/datastore/nox.py
index 7894b1ae0b232..5171bf0bb0120 100644
--- a/datastore/nox.py
+++ b/datastore/nox.py
@@ -90,15 +90,22 @@ def doctests(session):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/datastore')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/datastore/pylint.config.py b/datastore/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/datastore/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/dns/nox.py b/dns/nox.py
index 0fc4850053ec8..f4e81c1ab9e42 100644
--- a/dns/nox.py
+++ b/dns/nox.py
@@ -44,15 +44,22 @@ def unit_tests(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
-    session.run('flake8', 'google/cloud/dns')
+    session.run('flake8', 'google/cloud/datastore')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/dns/pylint.config.py b/dns/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/dns/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/error_reporting/nox.py b/error_reporting/nox.py
index 1deed376b6e7c..db245cfd74e85 100644
--- a/error_reporting/nox.py
+++ b/error_reporting/nox.py
@@ -44,15 +44,22 @@ def unit_tests(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/error_reporting')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/error_reporting/pylint.config.py b/error_reporting/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/error_reporting/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/language/nox.py b/language/nox.py
index 2b4f372786edc..569bcb925fac2 100644
--- a/language/nox.py
+++ b/language/nox.py
@@ -66,15 +66,22 @@ def system_tests(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/language')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/language/pylint.config.py b/language/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/language/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/logging/nox.py b/logging/nox.py
index fbbbec1958c19..9a9eb10ef3d3a 100644
--- a/logging/nox.py
+++ b/logging/nox.py
@@ -70,15 +70,22 @@ def system_tests(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/logging')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/logging/pylint.config.py b/logging/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/logging/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/monitoring/nox.py b/monitoring/nox.py
index ad69f1c610b3c..b4271686aa5af 100644
--- a/monitoring/nox.py
+++ b/monitoring/nox.py
@@ -66,15 +66,22 @@ def system_tests(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/monitoring')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/monitoring/pylint.config.py b/monitoring/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/monitoring/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/pubsub/nox.py b/pubsub/nox.py
index 209ed41f9bfc6..acd70b44ce0bc 100644
--- a/pubsub/nox.py
+++ b/pubsub/nox.py
@@ -66,15 +66,22 @@ def system_tests(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/pubsub')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/pubsub/pylint.config.py b/pubsub/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/pubsub/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/resource_manager/nox.py b/resource_manager/nox.py
index 8a5cb2f6fa5ee..f3c0b5aa8f210 100644
--- a/resource_manager/nox.py
+++ b/resource_manager/nox.py
@@ -44,15 +44,22 @@ def unit_tests(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/resource_manager')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/resource_manager/pylint.config.py b/resource_manager/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/resource_manager/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/runtimeconfig/nox.py b/runtimeconfig/nox.py
index 3d228059a8d0b..f1f3177e521fe 100644
--- a/runtimeconfig/nox.py
+++ b/runtimeconfig/nox.py
@@ -44,15 +44,22 @@ def unit_tests(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/runtimeconfig')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/runtimeconfig/pylint.config.py b/runtimeconfig/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/runtimeconfig/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/spanner/nox.py b/spanner/nox.py
index fa551267dde11..5c81a7d4c6717 100644
--- a/spanner/nox.py
+++ b/spanner/nox.py
@@ -66,15 +66,22 @@ def system_tests(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/spanner')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/spanner/pylint.config.py b/spanner/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/spanner/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/speech/nox.py b/speech/nox.py
index 272a602314916..57c0cc4f7e069 100644
--- a/speech/nox.py
+++ b/speech/nox.py
@@ -66,15 +66,22 @@ def system_tests(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/speech')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/speech/pylint.config.py b/speech/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/speech/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/storage/nox.py b/storage/nox.py
index 3f33119f93a0e..171050be8be1d 100644
--- a/storage/nox.py
+++ b/storage/nox.py
@@ -67,15 +67,22 @@ def system_tests(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/storage')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/storage/pylint.config.py b/storage/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/storage/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/translate/nox.py b/translate/nox.py
index 43fb3612de2a0..f59a2825ed9b0 100644
--- a/translate/nox.py
+++ b/translate/nox.py
@@ -66,15 +66,22 @@ def system_tests(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', *LOCAL_DEPS)
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/translate')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/translate/pylint.config.py b/translate/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/translate/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/videointelligence/pylint.config.py b/videointelligence/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/videointelligence/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)
diff --git a/vision/google/cloud/vision/__init__.py b/vision/google/cloud/vision/__init__.py
index 9867337983cf2..f446c00ca5787 100644
--- a/vision/google/cloud/vision/__init__.py
+++ b/vision/google/cloud/vision/__init__.py
@@ -34,7 +34,7 @@
 __version__ = get_distribution('google-cloud-vision').version
 
 from google.cloud.vision.client import Client
-from google.cloud.vision_v1 import *
+from google.cloud.vision_v1 import *  # noqa
 
 
 __all__ = (
diff --git a/vision/google/cloud/vision/decorators.py b/vision/google/cloud/vision/decorators.py
index ae280c579e5e2..a29e8162afbb9 100644
--- a/vision/google/cloud/vision/decorators.py
+++ b/vision/google/cloud/vision/decorators.py
@@ -13,8 +13,6 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-import functools
-import sys
 
 
 def add_single_feature_methods(cls):
diff --git a/vision/google/cloud/vision/helpers.py b/vision/google/cloud/vision/helpers.py
index 0ce8b0311b220..d85f8fab04f8a 100644
--- a/vision/google/cloud/vision/helpers.py
+++ b/vision/google/cloud/vision/helpers.py
@@ -13,9 +13,7 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-import collections
 import io
-import six
 
 from google.gax.utils import protobuf
 
diff --git a/vision/nox.py b/vision/nox.py
index 984adfe7db007..d5d3f3412ef75 100644
--- a/vision/nox.py
+++ b/vision/nox.py
@@ -83,15 +83,22 @@ def system_tests_manual_layer(session, python_version):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8')
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools')
     session.install('.')
-    session.run('flake8', 'google/cloud/vision.py')
+    session.run('flake8', 'google/cloud/vision')
+    session.run(
+        'gcp-devrel-py-tools', 'run-pylint',
+        '--config', 'pylint.config.py',
+        '--library-filesets', 'google',
+        '--test-filesets', 'tests',
+        # Temporarily allow this to fail.
+        success_codes=range(0, 100))
 
 
 @nox.session
diff --git a/vision/pylint.config.py b/vision/pylint.config.py
new file mode 100644
index 0000000000000..d8ca7b92e85ee
--- /dev/null
+++ b/vision/pylint.config.py
@@ -0,0 +1,25 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module is used to configure gcp-devrel-py-tools run-pylint."""
+
+# Library configuration
+
+# library_additions = {}
+# library_replacements = {}
+
+# Test configuration
+
+# test_additions = copy.deepcopy(library_additions)
+# test_replacements = copy.deepcopy(library_replacements)

From dbdc6a63ecc0782e0b757fcd9fb636deadb038b2 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 15:08:47 -0400
Subject: [PATCH 036/211] Pass 'user_project' if set for blob downloads w/
 'mediaLink' set (#3500)

---
 storage/google/cloud/storage/blob.py | 53 ++++++++++++++++++++++------
 storage/tests/unit/test_blob.py      | 46 +++++++++++++++++++++++-
 2 files changed, 88 insertions(+), 11 deletions(-)

diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index aad2f47295aaf..898d84d1b7917 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -35,7 +35,11 @@
 import warnings
 
 import httplib2
+from six.moves.urllib.parse import parse_qsl
 from six.moves.urllib.parse import quote
+from six.moves.urllib.parse import urlencode
+from six.moves.urllib.parse import urlsplit
+from six.moves.urllib.parse import urlunsplit
 
 import google.auth.transport.requests
 from google import resumable_media
@@ -403,15 +407,19 @@ def _get_download_url(self):
         :rtype: str
         :returns: The download URL for the current blob.
         """
+        name_value_pairs = []
         if self.media_link is None:
-            download_url = _DOWNLOAD_URL_TEMPLATE.format(path=self.path)
+            base_url = _DOWNLOAD_URL_TEMPLATE.format(path=self.path)
             if self.generation is not None:
-                download_url += u'&generation={:d}'.format(self.generation)
-            if self.user_project is not None:
-                download_url += u'&userProject={}'.format(self.user_project)
-            return download_url
+                name_value_pairs.append(
+                    ('generation', '{:d}'.format(self.generation)))
         else:
-            return self.media_link
+            base_url = self.media_link
+
+        if self.user_project is not None:
+            name_value_pairs.append(('userProject', self.user_project))
+
+        return _add_query_parameters(base_url, name_value_pairs)
 
     def _do_download(self, transport, file_obj, download_url, headers):
         """Perform a download without any error handling.
@@ -658,12 +666,14 @@ def _do_multipart_upload(self, client, stream, content_type,
         info = self._get_upload_arguments(content_type)
         headers, object_metadata, content_type = info
 
-        upload_url = _MULTIPART_URL_TEMPLATE.format(
+        base_url = _MULTIPART_URL_TEMPLATE.format(
             bucket_path=self.bucket.path)
+        name_value_pairs = []
 
         if self.user_project is not None:
-            upload_url += '&userProject={}'.format(self.user_project)
+            name_value_pairs.append(('userProject', self.user_project))
 
+        upload_url = _add_query_parameters(base_url, name_value_pairs)
         upload = MultipartUpload(upload_url, headers=headers)
 
         if num_retries is not None:
@@ -734,12 +744,14 @@ def _initiate_resumable_upload(self, client, stream, content_type,
         if extra_headers is not None:
             headers.update(extra_headers)
 
-        upload_url = _RESUMABLE_URL_TEMPLATE.format(
+        base_url = _RESUMABLE_URL_TEMPLATE.format(
             bucket_path=self.bucket.path)
+        name_value_pairs = []
 
         if self.user_project is not None:
-            upload_url += '&userProject={}'.format(self.user_project)
+            name_value_pairs.append(('userProject', self.user_project))
 
+        upload_url = _add_query_parameters(base_url, name_value_pairs)
         upload = ResumableUpload(upload_url, chunk_size, headers=headers)
 
         if num_retries is not None:
@@ -1676,3 +1688,24 @@ def _raise_from_invalid_response(error, error_info=None):
     faux_response = httplib2.Response({'status': response.status_code})
     raise make_exception(faux_response, response.content,
                          error_info=error_info, use_json=False)
+
+
+def _add_query_parameters(base_url, name_value_pairs):
+    """Add one query parameter to a base URL.
+
+    :type base_url: string
+    :param base_url: Base URL (may already contain query parameters)
+
+    :type name_value_pairs: list of (string, string) tuples.
+    :param name_value_pairs: Names and values of the query parameters to add
+
+    :rtype: string
+    :returns: URL with additional query strings appended.
+    """
+    if len(name_value_pairs) == 0:
+        return base_url
+
+    scheme, netloc, path, query, frag = urlsplit(base_url)
+    query = parse_qsl(query)
+    query.extend(name_value_pairs)
+    return urlunsplit((scheme, netloc, path, urlencode(query), frag))
diff --git a/storage/tests/unit/test_blob.py b/storage/tests/unit/test_blob.py
index 1c31e9ea1b0f7..ad0f88b5129f3 100644
--- a/storage/tests/unit/test_blob.py
+++ b/storage/tests/unit/test_blob.py
@@ -366,7 +366,7 @@ def test__make_transport(self, fake_session_factory):
 
     def test__get_download_url_with_media_link(self):
         blob_name = 'something.txt'
-        bucket = mock.Mock(spec=[])
+        bucket = _Bucket(name='IRRELEVANT')
         blob = self._make_one(blob_name, bucket=bucket)
         media_link = 'http://test.invalid'
         # Set the media link on the blob
@@ -375,6 +375,19 @@ def test__get_download_url_with_media_link(self):
         download_url = blob._get_download_url()
         self.assertEqual(download_url, media_link)
 
+    def test__get_download_url_with_media_link_w_user_project(self):
+        blob_name = 'something.txt'
+        user_project = 'user-project-123'
+        bucket = _Bucket(name='IRRELEVANT', user_project=user_project)
+        blob = self._make_one(blob_name, bucket=bucket)
+        media_link = 'http://test.invalid'
+        # Set the media link on the blob
+        blob._properties['mediaLink'] = media_link
+
+        download_url = blob._get_download_url()
+        self.assertEqual(
+            download_url, '{}?userProject={}'.format(media_link, user_project))
+
     def test__get_download_url_on_the_fly(self):
         blob_name = 'bzzz-fly.txt'
         bucket = _Bucket(name='buhkit')
@@ -2430,6 +2443,37 @@ def test_with_error_info(self):
         self.assertEqual(exc_info.exception.errors, [])
 
 
+class Test__add_query_parameters(unittest.TestCase):
+
+    @staticmethod
+    def _call_fut(*args, **kwargs):
+        from google.cloud.storage.blob import _add_query_parameters
+
+        return _add_query_parameters(*args, **kwargs)
+
+    def test_w_empty_list(self):
+        BASE_URL = 'https://test.example.com/base'
+        self.assertEqual(self._call_fut(BASE_URL, []), BASE_URL)
+
+    def test_wo_existing_qs(self):
+        BASE_URL = 'https://test.example.com/base'
+        NV_LIST = [('one', 'One'), ('two', 'Two')]
+        expected = '&'.join([
+            '{}={}'.format(name, value) for name, value in NV_LIST])
+        self.assertEqual(
+            self._call_fut(BASE_URL, NV_LIST),
+            '{}?{}'.format(BASE_URL, expected))
+
+    def test_w_existing_qs(self):
+        BASE_URL = 'https://test.example.com/base?one=Three'
+        NV_LIST = [('one', 'One'), ('two', 'Two')]
+        expected = '&'.join([
+            '{}={}'.format(name, value) for name, value in NV_LIST])
+        self.assertEqual(
+            self._call_fut(BASE_URL, NV_LIST),
+            '{}&{}'.format(BASE_URL, expected))
+
+
 class _Connection(object):
 
     API_BASE_URL = 'http://example.com'

From 89cfbc24db8bedde0381a7f937243feedadaea5f Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 16:17:09 -0400
Subject: [PATCH 037/211] Back out support for 'requester pays' buckets.
 (#3538)

The feature is not GA, which makes system testing problematic.

Development continues on the 'storage-requester_pays-feature' branch.
---
 storage/google/cloud/storage/_helpers.py |  12 +-
 storage/google/cloud/storage/acl.py      |  25 +-
 storage/google/cloud/storage/blob.py     | 138 ++--------
 storage/google/cloud/storage/bucket.py   | 133 +--------
 storage/google/cloud/storage/client.py   |   9 +-
 storage/tests/system.py                  |  11 -
 storage/tests/unit/test__helpers.py      |  94 +------
 storage/tests/unit/test_acl.py           | 135 +++-------
 storage/tests/unit/test_blob.py          | 326 ++++-------------------
 storage/tests/unit/test_bucket.py        | 252 ++----------------
 storage/tests/unit/test_client.py        |  41 ++-
 11 files changed, 173 insertions(+), 1003 deletions(-)

diff --git a/storage/google/cloud/storage/_helpers.py b/storage/google/cloud/storage/_helpers.py
index 9e47c10269fcb..88f9b8dc0ca7e 100644
--- a/storage/google/cloud/storage/_helpers.py
+++ b/storage/google/cloud/storage/_helpers.py
@@ -67,11 +67,6 @@ def client(self):
         """Abstract getter for the object client."""
         raise NotImplementedError
 
-    @property
-    def user_project(self):
-        """Abstract getter for the object user_project."""
-        raise NotImplementedError
-
     def _require_client(self, client):
         """Check client or verify over-ride.
 
@@ -99,8 +94,6 @@ def reload(self, client=None):
         # Pass only '?projection=noAcl' here because 'acl' and related
         # are handled via custom endpoints.
         query_params = {'projection': 'noAcl'}
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
         api_response = client._connection.api_request(
             method='GET', path=self.path, query_params=query_params,
             _target_object=self)
@@ -147,14 +140,11 @@ def patch(self, client=None):
         client = self._require_client(client)
         # Pass '?projection=full' here because 'PATCH' documented not
         # to work properly w/ 'noAcl'.
-        query_params = {'projection': 'full'}
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
         update_properties = {key: self._properties[key]
                              for key in self._changes}
         api_response = client._connection.api_request(
             method='PATCH', path=self.path, data=update_properties,
-            query_params=query_params, _target_object=self)
+            query_params={'projection': 'full'}, _target_object=self)
         self._set_properties(api_response)
 
 
diff --git a/storage/google/cloud/storage/acl.py b/storage/google/cloud/storage/acl.py
index 240662c4dc8dc..c4525ea887357 100644
--- a/storage/google/cloud/storage/acl.py
+++ b/storage/google/cloud/storage/acl.py
@@ -198,7 +198,6 @@ class ACL(object):
     # as properties).
     reload_path = None
     save_path = None
-    user_project = None
 
     def __init__(self):
         self.entities = {}
@@ -406,18 +405,10 @@ def reload(self, client=None):
         """
         path = self.reload_path
         client = self._require_client(client)
-        query_params = {}
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
 
         self.entities.clear()
 
-        found = client._connection.api_request(
-            method='GET',
-            path=path,
-            query_params=query_params,
-        )
+        found = client._connection.api_request(method='GET', path=path)
         self.loaded = True
         for entry in found.get('items', ()):
             self.add_entity(self.entity_from_dict(entry))
@@ -444,12 +435,8 @@ def _save(self, acl, predefined, client):
             acl = []
             query_params[self._PREDEFINED_QUERY_PARAM] = predefined
 
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
-
         path = self.save_path
         client = self._require_client(client)
-
         result = client._connection.api_request(
             method='PATCH',
             path=path,
@@ -545,11 +532,6 @@ def save_path(self):
         """Compute the path for PATCH API requests for this ACL."""
         return self.bucket.path
 
-    @property
-    def user_project(self):
-        """Compute the user project charged for API requests for this ACL."""
-        return self.bucket.user_project
-
 
 class DefaultObjectACL(BucketACL):
     """A class representing the default object ACL for a bucket."""
@@ -583,8 +565,3 @@ def reload_path(self):
     def save_path(self):
         """Compute the path for PATCH API requests for this ACL."""
         return self.blob.path
-
-    @property
-    def user_project(self):
-        """Compute the user project charged for API requests for this ACL."""
-        return self.blob.user_project
diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index 898d84d1b7917..de59fdf1f2bde 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -35,11 +35,7 @@
 import warnings
 
 import httplib2
-from six.moves.urllib.parse import parse_qsl
 from six.moves.urllib.parse import quote
-from six.moves.urllib.parse import urlencode
-from six.moves.urllib.parse import urlsplit
-from six.moves.urllib.parse import urlunsplit
 
 import google.auth.transport.requests
 from google import resumable_media
@@ -226,16 +222,6 @@ def client(self):
         """The client bound to this blob."""
         return self.bucket.client
 
-    @property
-    def user_project(self):
-        """Project ID used for API requests made via this blob.
-
-        Derived from bucket's value.
-
-        :rtype: str
-        """
-        return self.bucket.user_project
-
     @property
     def public_url(self):
         """The public URL for this blob's object.
@@ -344,14 +330,10 @@ def exists(self, client=None):
         :returns: True if the blob exists in Cloud Storage.
         """
         client = self._require_client(client)
-        # We only need the status code (200 or not) so we seek to
-        # minimize the returned payload.
-        query_params = {'fields': 'name'}
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
-
         try:
+            # We only need the status code (200 or not) so we seek to
+            # minimize the returned payload.
+            query_params = {'fields': 'name'}
             # We intentionally pass `_target_object=None` since fields=name
             # would limit the local properties.
             client._connection.api_request(
@@ -407,19 +389,13 @@ def _get_download_url(self):
         :rtype: str
         :returns: The download URL for the current blob.
         """
-        name_value_pairs = []
         if self.media_link is None:
-            base_url = _DOWNLOAD_URL_TEMPLATE.format(path=self.path)
+            download_url = _DOWNLOAD_URL_TEMPLATE.format(path=self.path)
             if self.generation is not None:
-                name_value_pairs.append(
-                    ('generation', '{:d}'.format(self.generation)))
+                download_url += u'&generation={:d}'.format(self.generation)
+            return download_url
         else:
-            base_url = self.media_link
-
-        if self.user_project is not None:
-            name_value_pairs.append(('userProject', self.user_project))
-
-        return _add_query_parameters(base_url, name_value_pairs)
+            return self.media_link
 
     def _do_download(self, transport, file_obj, download_url, headers):
         """Perform a download without any error handling.
@@ -666,14 +642,8 @@ def _do_multipart_upload(self, client, stream, content_type,
         info = self._get_upload_arguments(content_type)
         headers, object_metadata, content_type = info
 
-        base_url = _MULTIPART_URL_TEMPLATE.format(
+        upload_url = _MULTIPART_URL_TEMPLATE.format(
             bucket_path=self.bucket.path)
-        name_value_pairs = []
-
-        if self.user_project is not None:
-            name_value_pairs.append(('userProject', self.user_project))
-
-        upload_url = _add_query_parameters(base_url, name_value_pairs)
         upload = MultipartUpload(upload_url, headers=headers)
 
         if num_retries is not None:
@@ -744,14 +714,8 @@ def _initiate_resumable_upload(self, client, stream, content_type,
         if extra_headers is not None:
             headers.update(extra_headers)
 
-        base_url = _RESUMABLE_URL_TEMPLATE.format(
+        upload_url = _RESUMABLE_URL_TEMPLATE.format(
             bucket_path=self.bucket.path)
-        name_value_pairs = []
-
-        if self.user_project is not None:
-            name_value_pairs.append(('userProject', self.user_project))
-
-        upload_url = _add_query_parameters(base_url, name_value_pairs)
         upload = ResumableUpload(upload_url, chunk_size, headers=headers)
 
         if num_retries is not None:
@@ -1105,16 +1069,9 @@ def get_iam_policy(self, client=None):
                   the ``getIamPolicy`` API request.
         """
         client = self._require_client(client)
-
-        query_params = {}
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
-
         info = client._connection.api_request(
             method='GET',
             path='%s/iam' % (self.path,),
-            query_params=query_params,
             _target_object=None)
         return Policy.from_api_repr(info)
 
@@ -1137,18 +1094,11 @@ def set_iam_policy(self, policy, client=None):
                   the ``setIamPolicy`` API request.
         """
         client = self._require_client(client)
-
-        query_params = {}
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
-
         resource = policy.to_api_repr()
         resource['resourceId'] = self.path
         info = client._connection.api_request(
             method='PUT',
             path='%s/iam' % (self.path,),
-            query_params=query_params,
             data=resource,
             _target_object=None)
         return Policy.from_api_repr(info)
@@ -1172,17 +1122,12 @@ def test_iam_permissions(self, permissions, client=None):
                   request.
         """
         client = self._require_client(client)
-        query_params = {'permissions': permissions}
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
-
+        query = {'permissions': permissions}
         path = '%s/iam/testPermissions' % (self.path,)
         resp = client._connection.api_request(
             method='GET',
             path=path,
-            query_params=query_params)
-
+            query_params=query)
         return resp.get('permissions', [])
 
     def make_public(self, client=None):
@@ -1212,22 +1157,13 @@ def compose(self, sources, client=None):
         """
         if self.content_type is None:
             raise ValueError("Destination 'content_type' not set.")
-
         client = self._require_client(client)
-        query_params = {}
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
-
         request = {
             'sourceObjects': [{'name': source.name} for source in sources],
             'destination': self._properties.copy(),
         }
         api_response = client._connection.api_request(
-            method='POST',
-            path=self.path + '/compose',
-            query_params=query_params,
-            data=request,
+            method='POST', path=self.path + '/compose', data=request,
             _target_object=self)
         self._set_properties(api_response)
 
@@ -1259,20 +1195,14 @@ def rewrite(self, source, token=None, client=None):
         headers.update(_get_encryption_headers(
             source._encryption_key, source=True))
 
-        query_params = {}
-
         if token:
-            query_params['rewriteToken'] = token
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
+            query_params = {'rewriteToken': token}
+        else:
+            query_params = {}
 
         api_response = client._connection.api_request(
-            method='POST',
-            path=source.path + '/rewriteTo' + self.path,
-            query_params=query_params,
-            data=self._properties,
-            headers=headers,
+            method='POST', path=source.path + '/rewriteTo' + self.path,
+            query_params=query_params, data=self._properties, headers=headers,
             _target_object=self)
         rewritten = int(api_response['totalBytesRewritten'])
         size = int(api_response['objectSize'])
@@ -1303,22 +1233,13 @@ def update_storage_class(self, new_class, client=None):
             raise ValueError("Invalid storage class: %s" % (new_class,))
 
         client = self._require_client(client)
-
-        query_params = {}
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
-
         headers = _get_encryption_headers(self._encryption_key)
         headers.update(_get_encryption_headers(
             self._encryption_key, source=True))
 
         api_response = client._connection.api_request(
-            method='POST',
-            path=self.path + '/rewriteTo' + self.path,
-            query_params=query_params,
-            data={'storageClass': new_class},
-            headers=headers,
+            method='POST', path=self.path + '/rewriteTo' + self.path,
+            data={'storageClass': new_class}, headers=headers,
             _target_object=self)
         self._set_properties(api_response['resource'])
 
@@ -1688,24 +1609,3 @@ def _raise_from_invalid_response(error, error_info=None):
     faux_response = httplib2.Response({'status': response.status_code})
     raise make_exception(faux_response, response.content,
                          error_info=error_info, use_json=False)
-
-
-def _add_query_parameters(base_url, name_value_pairs):
-    """Add one query parameter to a base URL.
-
-    :type base_url: string
-    :param base_url: Base URL (may already contain query parameters)
-
-    :type name_value_pairs: list of (string, string) tuples.
-    :param name_value_pairs: Names and values of the query parameters to add
-
-    :rtype: string
-    :returns: URL with additional query strings appended.
-    """
-    if len(name_value_pairs) == 0:
-        return base_url
-
-    scheme, netloc, path, query, frag = urlsplit(base_url)
-    query = parse_qsl(query)
-    query.extend(name_value_pairs)
-    return urlunsplit((scheme, netloc, path, urlencode(query), frag))
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index e740cd4febc2e..865a23840af4a 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -85,10 +85,6 @@ class Bucket(_PropertyMixin):
     :type name: str
     :param name: The name of the bucket. Bucket names must start and end with a
                  number or letter.
-
-    :type user_project: str
-    :param user_project: (Optional) the project ID to be billed for API
-                         requests made via this instance.
     """
 
     _MAX_OBJECTS_FOR_ITERATION = 256
@@ -112,13 +108,12 @@ class Bucket(_PropertyMixin):
     https://cloud.google.com/storage/docs/storage-classes
     """
 
-    def __init__(self, client, name=None, user_project=None):
+    def __init__(self, client, name=None):
         name = _validate_name(name)
         super(Bucket, self).__init__(name=name)
         self._client = client
         self._acl = BucketACL(self)
         self._default_object_acl = DefaultObjectACL(self)
-        self._user_project = user_project
 
     def __repr__(self):
         return '<Bucket: %s>' % (self.name,)
@@ -128,16 +123,6 @@ def client(self):
         """The client bound to this bucket."""
         return self._client
 
-    @property
-    def user_project(self):
-        """Project ID to be billed for API requests made via this bucket.
-
-        If unset, API requests are billed to the bucket owner.
-
-        :rtype: str
-        """
-        return self._user_project
-
     def blob(self, blob_name, chunk_size=None, encryption_key=None):
         """Factory constructor for blob object.
 
@@ -175,14 +160,10 @@ def exists(self, client=None):
         :returns: True if the bucket exists in Cloud Storage.
         """
         client = self._require_client(client)
-        # We only need the status code (200 or not) so we seek to
-        # minimize the returned payload.
-        query_params = {'fields': 'name'}
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
-
         try:
+            # We only need the status code (200 or not) so we seek to
+            # minimize the returned payload.
+            query_params = {'fields': 'name'}
             # We intentionally pass `_target_object=None` since fields=name
             # would limit the local properties.
             client._connection.api_request(
@@ -208,9 +189,6 @@ def create(self, client=None):
         :param client: Optional. The client to use.  If not passed, falls back
                        to the ``client`` stored on the current bucket.
         """
-        if self.user_project is not None:
-            raise ValueError("Cannot create bucket with 'user_project' set.")
-
         client = self._require_client(client)
         query_params = {'project': client.project}
         properties = {key: self._properties[key] for key in self._changes}
@@ -271,18 +249,10 @@ def get_blob(self, blob_name, client=None):
         :returns: The blob object if it exists, otherwise None.
         """
         client = self._require_client(client)
-        query_params = {}
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
-
         blob = Blob(bucket=self, name=blob_name)
         try:
             response = client._connection.api_request(
-                method='GET',
-                path=blob.path,
-                query_params=query_params,
-                _target_object=blob)
+                method='GET', path=blob.path, _target_object=blob)
             # NOTE: We assume response.get('name') matches `blob_name`.
             blob._set_properties(response)
             # NOTE: This will not fail immediately in a batch. However, when
@@ -336,7 +306,7 @@ def list_blobs(self, max_results=None, page_token=None, prefix=None,
         :returns: Iterator of all :class:`~google.cloud.storage.blob.Blob`
                   in this bucket matching the arguments.
         """
-        extra_params = {'projection': projection}
+        extra_params = {}
 
         if prefix is not None:
             extra_params['prefix'] = prefix
@@ -347,12 +317,11 @@ def list_blobs(self, max_results=None, page_token=None, prefix=None,
         if versions is not None:
             extra_params['versions'] = versions
 
+        extra_params['projection'] = projection
+
         if fields is not None:
             extra_params['fields'] = fields
 
-        if self.user_project is not None:
-            extra_params['userProject'] = self.user_project
-
         client = self._require_client(client)
         path = self.path + '/o'
         iterator = HTTPIterator(
@@ -392,11 +361,6 @@ def delete(self, force=False, client=None):
                  contains more than 256 objects / blobs.
         """
         client = self._require_client(client)
-        query_params = {}
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
-
         if force:
             blobs = list(self.list_blobs(
                 max_results=self._MAX_OBJECTS_FOR_ITERATION + 1,
@@ -418,10 +382,7 @@ def delete(self, force=False, client=None):
         # request has no response value (whether in a standard request or
         # in a batch request).
         client._connection.api_request(
-            method='DELETE',
-            path=self.path,
-            query_params=query_params,
-            _target_object=None)
+            method='DELETE', path=self.path, _target_object=None)
 
     def delete_blob(self, blob_name, client=None):
         """Deletes a blob from the current bucket.
@@ -453,20 +414,12 @@ def delete_blob(self, blob_name, client=None):
 
         """
         client = self._require_client(client)
-        query_params = {}
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
-
         blob_path = Blob.path_helper(self.path, blob_name)
         # We intentionally pass `_target_object=None` since a DELETE
         # request has no response value (whether in a standard request or
         # in a batch request).
         client._connection.api_request(
-            method='DELETE',
-            path=blob_path,
-            query_params=query_params,
-            _target_object=None)
+            method='DELETE', path=blob_path, _target_object=None)
 
     def delete_blobs(self, blobs, on_error=None, client=None):
         """Deletes a list of blobs from the current bucket.
@@ -529,26 +482,14 @@ def copy_blob(self, blob, destination_bucket, new_name=None,
         :returns: The new Blob.
         """
         client = self._require_client(client)
-        query_params = {}
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
-
         if new_name is None:
             new_name = blob.name
-
         new_blob = Blob(bucket=destination_bucket, name=new_name)
         api_path = blob.path + '/copyTo' + new_blob.path
         copy_result = client._connection.api_request(
-            method='POST',
-            path=api_path,
-            query_params=query_params,
-            _target_object=new_blob,
-            )
-
+            method='POST', path=api_path, _target_object=new_blob)
         if not preserve_acl:
             new_blob.acl.save(acl={}, client=client)
-
         new_blob._set_properties(copy_result)
         return new_blob
 
@@ -857,40 +798,10 @@ def versioning_enabled(self, value):
         details.
 
         :type value: convertible to boolean
-        :param value: should versioning be enabled for the bucket?
+        :param value: should versioning be anabled for the bucket?
         """
         self._patch_property('versioning', {'enabled': bool(value)})
 
-    @property
-    def requester_pays(self):
-        """Does the requester pay for API requests for this bucket?
-
-        .. note::
-
-           No public docs exist yet for the "requester pays" feature.
-
-        :setter: Update whether requester pays for this bucket.
-        :getter: Query whether requester pays for this bucket.
-
-        :rtype: bool
-        :returns: True if requester pays for API requests for the bucket,
-                  else False.
-        """
-        versioning = self._properties.get('billing', {})
-        return versioning.get('requesterPays', False)
-
-    @requester_pays.setter
-    def requester_pays(self, value):
-        """Update whether requester pays for API requests for this bucket.
-
-        See  https://cloud.google.com/storage/docs/<DOCS-MISSING> for
-        details.
-
-        :type value: convertible to boolean
-        :param value: should requester pay for API requests for the bucket?
-        """
-        self._patch_property('billing', {'requesterPays': bool(value)})
-
     def configure_website(self, main_page_suffix=None, not_found_page=None):
         """Configure website-related properties.
 
@@ -956,15 +867,9 @@ def get_iam_policy(self, client=None):
                   the ``getIamPolicy`` API request.
         """
         client = self._require_client(client)
-        query_params = {}
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
-
         info = client._connection.api_request(
             method='GET',
             path='%s/iam' % (self.path,),
-            query_params=query_params,
             _target_object=None)
         return Policy.from_api_repr(info)
 
@@ -987,17 +892,11 @@ def set_iam_policy(self, policy, client=None):
                   the ``setIamPolicy`` API request.
         """
         client = self._require_client(client)
-        query_params = {}
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
-
         resource = policy.to_api_repr()
         resource['resourceId'] = self.path
         info = client._connection.api_request(
             method='PUT',
             path='%s/iam' % (self.path,),
-            query_params=query_params,
             data=resource,
             _target_object=None)
         return Policy.from_api_repr(info)
@@ -1021,16 +920,12 @@ def test_iam_permissions(self, permissions, client=None):
                   request.
         """
         client = self._require_client(client)
-        query_params = {'permissions': permissions}
-
-        if self.user_project is not None:
-            query_params['userProject'] = self.user_project
-
+        query = {'permissions': permissions}
         path = '%s/iam/testPermissions' % (self.path,)
         resp = client._connection.api_request(
             method='GET',
             path=path,
-            query_params=query_params)
+            query_params=query)
         return resp.get('permissions', [])
 
     def make_public(self, recursive=False, future=False, client=None):
diff --git a/storage/google/cloud/storage/client.py b/storage/google/cloud/storage/client.py
index 51cad4d70c54b..93785e05269fc 100644
--- a/storage/google/cloud/storage/client.py
+++ b/storage/google/cloud/storage/client.py
@@ -194,7 +194,7 @@ def lookup_bucket(self, bucket_name):
         except NotFound:
             return None
 
-    def create_bucket(self, bucket_name, requester_pays=None):
+    def create_bucket(self, bucket_name):
         """Create a new bucket.
 
         For example:
@@ -211,17 +211,10 @@ def create_bucket(self, bucket_name, requester_pays=None):
         :type bucket_name: str
         :param bucket_name: The bucket name to create.
 
-        :type requester_pays: bool
-        :param requester_pays:
-            (Optional) Whether requester pays for API requests for this
-            bucket and its blobs.
-
         :rtype: :class:`google.cloud.storage.bucket.Bucket`
         :returns: The newly created bucket.
         """
         bucket = Bucket(self, name=bucket_name)
-        if requester_pays is not None:
-            bucket.requester_pays = requester_pays
         bucket.create(client=self)
         return bucket
 
diff --git a/storage/tests/system.py b/storage/tests/system.py
index 06f50b26128b5..afab659882bfc 100644
--- a/storage/tests/system.py
+++ b/storage/tests/system.py
@@ -30,8 +30,6 @@
 
 HTTP = httplib2.Http()
 
-REQUESTER_PAYS_ENABLED = False  # query from environment?
-
 
 def _bad_copy(bad_request):
     """Predicate: pass only exceptions for a failed copyTo."""
@@ -101,15 +99,6 @@ def test_create_bucket(self):
         self.case_buckets_to_delete.append(new_bucket_name)
         self.assertEqual(created.name, new_bucket_name)
 
-    @unittest.skipUnless(REQUESTER_PAYS_ENABLED, "requesterPays not enabled")
-    def test_create_bucket_with_requester_pays(self):
-        new_bucket_name = 'w-requester-pays' + unique_resource_id('-')
-        created = Config.CLIENT.create_bucket(
-            new_bucket_name, requester_pays=True)
-        self.case_buckets_to_delete.append(new_bucket_name)
-        self.assertEqual(created.name, new_bucket_name)
-        self.assertTrue(created.requester_pays)
-
     def test_list_buckets(self):
         buckets_to_create = [
             'new' + unique_resource_id(),
diff --git a/storage/tests/unit/test__helpers.py b/storage/tests/unit/test__helpers.py
index 21883e2c4ac9a..89967f3a0db09 100644
--- a/storage/tests/unit/test__helpers.py
+++ b/storage/tests/unit/test__helpers.py
@@ -26,7 +26,7 @@ def _get_target_class():
     def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
-    def _derivedClass(self, path=None, user_project=None):
+    def _derivedClass(self, path=None):
 
         class Derived(self._get_target_class()):
 
@@ -36,67 +36,30 @@ class Derived(self._get_target_class()):
             def path(self):
                 return path
 
-            @property
-            def user_project(self):
-                return user_project
-
         return Derived
 
     def test_path_is_abstract(self):
         mixin = self._make_one()
-        with self.assertRaises(NotImplementedError):
-            mixin.path
+        self.assertRaises(NotImplementedError, lambda: mixin.path)
 
     def test_client_is_abstract(self):
         mixin = self._make_one()
-        with self.assertRaises(NotImplementedError):
-            mixin.client
-
-    def test_user_project_is_abstract(self):
-        mixin = self._make_one()
-        with self.assertRaises(NotImplementedError):
-            mixin.user_project
+        self.assertRaises(NotImplementedError, lambda: mixin.client)
 
     def test_reload(self):
         connection = _Connection({'foo': 'Foo'})
         client = _Client(connection)
         derived = self._derivedClass('/path')()
-        # Make sure changes is not a set instance before calling reload
-        # (which will clear / replace it with an empty set), checked below.
-        derived._changes = object()
-        derived.reload(client=client)
-        self.assertEqual(derived._properties, {'foo': 'Foo'})
-        kw = connection._requested
-        self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'GET',
-            'path': '/path',
-            'query_params': {'projection': 'noAcl'},
-            '_target_object': derived,
-        })
-        self.assertEqual(derived._changes, set())
-
-    def test_reload_w_user_project(self):
-        user_project = 'user-project-123'
-        connection = _Connection({'foo': 'Foo'})
-        client = _Client(connection)
-        derived = self._derivedClass('/path', user_project)()
-        # Make sure changes is not a set instance before calling reload
-        # (which will clear / replace it with an empty set), checked below.
+        # Make sure changes is not a set, so we can observe a change.
         derived._changes = object()
         derived.reload(client=client)
         self.assertEqual(derived._properties, {'foo': 'Foo'})
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'GET',
-            'path': '/path',
-            'query_params': {
-                'projection': 'noAcl',
-                'userProject': user_project,
-            },
-            '_target_object': derived,
-        })
+        self.assertEqual(kw[0]['method'], 'GET')
+        self.assertEqual(kw[0]['path'], '/path')
+        self.assertEqual(kw[0]['query_params'], {'projection': 'noAcl'})
+        # Make sure changes get reset by reload.
         self.assertEqual(derived._changes, set())
 
     def test__set_properties(self):
@@ -124,42 +87,11 @@ def test_patch(self):
         self.assertEqual(derived._properties, {'foo': 'Foo'})
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'PATCH',
-            'path': '/path',
-            'query_params': {'projection': 'full'},
-            # Since changes does not include `baz`, we don't see it sent.
-            'data': {'bar': BAR},
-            '_target_object': derived,
-        })
-        # Make sure changes get reset by patch().
-        self.assertEqual(derived._changes, set())
-
-    def test_patch_w_user_project(self):
-        user_project = 'user-project-123'
-        connection = _Connection({'foo': 'Foo'})
-        client = _Client(connection)
-        derived = self._derivedClass('/path', user_project)()
-        # Make sure changes is non-empty, so we can observe a change.
-        BAR = object()
-        BAZ = object()
-        derived._properties = {'bar': BAR, 'baz': BAZ}
-        derived._changes = set(['bar'])  # Ignore baz.
-        derived.patch(client=client)
-        self.assertEqual(derived._properties, {'foo': 'Foo'})
-        kw = connection._requested
-        self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'PATCH',
-            'path': '/path',
-            'query_params': {
-                'projection': 'full',
-                'userProject': user_project,
-            },
-            # Since changes does not include `baz`, we don't see it sent.
-            'data': {'bar': BAR},
-            '_target_object': derived,
-        })
+        self.assertEqual(kw[0]['method'], 'PATCH')
+        self.assertEqual(kw[0]['path'], '/path')
+        self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
+        # Since changes does not include `baz`, we don't see it sent.
+        self.assertEqual(kw[0]['data'], {'bar': BAR})
         # Make sure changes get reset by patch().
         self.assertEqual(derived._changes, set())
 
diff --git a/storage/tests/unit/test_acl.py b/storage/tests/unit/test_acl.py
index 4e4018ae7c8cf..1159c8c1f2aac 100644
--- a/storage/tests/unit/test_acl.py
+++ b/storage/tests/unit/test_acl.py
@@ -532,11 +532,8 @@ def test_reload_missing(self):
         self.assertEqual(list(acl), [])
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'GET',
-            'path': '/testing/acl',
-            'query_params': {},
-        })
+        self.assertEqual(kw[0]['method'], 'GET')
+        self.assertEqual(kw[0]['path'], '/testing/acl')
 
     def test_reload_empty_result_clears_local(self):
         ROLE = 'role'
@@ -546,41 +543,29 @@ def test_reload_empty_result_clears_local(self):
         acl.reload_path = '/testing/acl'
         acl.loaded = True
         acl.entity('allUsers', ROLE)
-
         acl.reload(client=client)
-
         self.assertTrue(acl.loaded)
         self.assertEqual(list(acl), [])
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'GET',
-            'path': '/testing/acl',
-            'query_params': {},
-        })
+        self.assertEqual(kw[0]['method'], 'GET')
+        self.assertEqual(kw[0]['path'], '/testing/acl')
 
-    def test_reload_nonempty_result_w_user_project(self):
+    def test_reload_nonempty_result(self):
         ROLE = 'role'
-        USER_PROJECT = 'user-project-123'
         connection = _Connection(
             {'items': [{'entity': 'allUsers', 'role': ROLE}]})
         client = _Client(connection)
         acl = self._make_one()
         acl.reload_path = '/testing/acl'
         acl.loaded = True
-        acl.user_project = USER_PROJECT
-
         acl.reload(client=client)
-
         self.assertTrue(acl.loaded)
         self.assertEqual(list(acl), [{'entity': 'allUsers', 'role': ROLE}])
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'GET',
-            'path': '/testing/acl',
-            'query_params': {'userProject': USER_PROJECT},
-        })
+        self.assertEqual(kw[0]['method'], 'GET')
+        self.assertEqual(kw[0]['path'], '/testing/acl')
 
     def test_save_none_set_none_passed(self):
         connection = _Connection()
@@ -621,43 +606,30 @@ def test_save_no_acl(self):
         self.assertEqual(len(kw), 1)
         self.assertEqual(kw[0]['method'], 'PATCH')
         self.assertEqual(kw[0]['path'], '/testing')
-        self.assertEqual(kw[0], {
-            'method': 'PATCH',
-            'path': '/testing',
-            'query_params': {'projection': 'full'},
-            'data': {'acl': AFTER},
-        })
-
-    def test_save_w_acl_w_user_project(self):
+        self.assertEqual(kw[0]['data'], {'acl': AFTER})
+        self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
+
+    def test_save_w_acl(self):
         ROLE1 = 'role1'
         ROLE2 = 'role2'
         STICKY = {'entity': 'allUsers', 'role': ROLE2}
-        USER_PROJECT = 'user-project-123'
         new_acl = [{'entity': 'allUsers', 'role': ROLE1}]
         connection = _Connection({'acl': [STICKY] + new_acl})
         client = _Client(connection)
         acl = self._make_one()
         acl.save_path = '/testing'
         acl.loaded = True
-        acl.user_project = USER_PROJECT
-
         acl.save(new_acl, client=client)
-
         entries = list(acl)
         self.assertEqual(len(entries), 2)
         self.assertTrue(STICKY in entries)
         self.assertTrue(new_acl[0] in entries)
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'PATCH',
-            'path': '/testing',
-            'query_params': {
-                'projection': 'full',
-                'userProject': USER_PROJECT,
-            },
-            'data': {'acl': new_acl},
-        })
+        self.assertEqual(kw[0]['method'], 'PATCH')
+        self.assertEqual(kw[0]['path'], '/testing')
+        self.assertEqual(kw[0]['data'], {'acl': new_acl})
+        self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
 
     def test_save_prefefined_invalid(self):
         connection = _Connection()
@@ -680,15 +652,11 @@ def test_save_predefined_valid(self):
         self.assertEqual(len(entries), 0)
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'PATCH',
-            'path': '/testing',
-            'query_params': {
-                'projection': 'full',
-                'predefinedAcl': PREDEFINED,
-            },
-            'data': {'acl': []},
-        })
+        self.assertEqual(kw[0]['method'], 'PATCH')
+        self.assertEqual(kw[0]['path'], '/testing')
+        self.assertEqual(kw[0]['data'], {'acl': []})
+        self.assertEqual(kw[0]['query_params'],
+                         {'projection': 'full', 'predefinedAcl': PREDEFINED})
 
     def test_save_predefined_w_XML_alias(self):
         PREDEFINED_XML = 'project-private'
@@ -703,15 +671,12 @@ def test_save_predefined_w_XML_alias(self):
         self.assertEqual(len(entries), 0)
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'PATCH',
-            'path': '/testing',
-            'query_params': {
-                'projection': 'full',
-                'predefinedAcl': PREDEFINED_JSON,
-            },
-            'data': {'acl': []},
-        })
+        self.assertEqual(kw[0]['method'], 'PATCH')
+        self.assertEqual(kw[0]['path'], '/testing')
+        self.assertEqual(kw[0]['data'], {'acl': []})
+        self.assertEqual(kw[0]['query_params'],
+                         {'projection': 'full',
+                          'predefinedAcl': PREDEFINED_JSON})
 
     def test_save_predefined_valid_w_alternate_query_param(self):
         # Cover case where subclass overrides _PREDEFINED_QUERY_PARAM
@@ -727,15 +692,11 @@ def test_save_predefined_valid_w_alternate_query_param(self):
         self.assertEqual(len(entries), 0)
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'PATCH',
-            'path': '/testing',
-            'query_params': {
-                'projection': 'full',
-                'alternate': PREDEFINED,
-            },
-            'data': {'acl': []},
-        })
+        self.assertEqual(kw[0]['method'], 'PATCH')
+        self.assertEqual(kw[0]['path'], '/testing')
+        self.assertEqual(kw[0]['data'], {'acl': []})
+        self.assertEqual(kw[0]['query_params'],
+                         {'projection': 'full', 'alternate': PREDEFINED})
 
     def test_clear(self):
         ROLE1 = 'role1'
@@ -751,12 +712,10 @@ def test_clear(self):
         self.assertEqual(list(acl), [STICKY])
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'PATCH',
-            'path': '/testing',
-            'query_params': {'projection': 'full'},
-            'data': {'acl': []},
-        })
+        self.assertEqual(kw[0]['method'], 'PATCH')
+        self.assertEqual(kw[0]['path'], '/testing')
+        self.assertEqual(kw[0]['data'], {'acl': []})
+        self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
 
 
 class Test_BucketACL(unittest.TestCase):
@@ -780,15 +739,6 @@ def test_ctor(self):
         self.assertEqual(acl.reload_path, '/b/%s/acl' % NAME)
         self.assertEqual(acl.save_path, '/b/%s' % NAME)
 
-    def test_user_project(self):
-        NAME = 'name'
-        USER_PROJECT = 'user-project-123'
-        bucket = _Bucket(NAME)
-        acl = self._make_one(bucket)
-        self.assertIsNone(acl.user_project)
-        bucket.user_project = USER_PROJECT
-        self.assertEqual(acl.user_project, USER_PROJECT)
-
 
 class Test_DefaultObjectACL(unittest.TestCase):
 
@@ -835,22 +785,9 @@ def test_ctor(self):
         self.assertEqual(acl.reload_path, '/b/%s/o/%s/acl' % (NAME, BLOB_NAME))
         self.assertEqual(acl.save_path, '/b/%s/o/%s' % (NAME, BLOB_NAME))
 
-    def test_user_project(self):
-        NAME = 'name'
-        BLOB_NAME = 'blob-name'
-        USER_PROJECT = 'user-project-123'
-        bucket = _Bucket(NAME)
-        blob = _Blob(bucket, BLOB_NAME)
-        acl = self._make_one(blob)
-        self.assertIsNone(acl.user_project)
-        blob.user_project = USER_PROJECT
-        self.assertEqual(acl.user_project, USER_PROJECT)
-
 
 class _Blob(object):
 
-    user_project = None
-
     def __init__(self, bucket, blob):
         self.bucket = bucket
         self.blob = blob
@@ -862,8 +799,6 @@ def path(self):
 
 class _Bucket(object):
 
-    user_project = None
-
     def __init__(self, name):
         self.name = name
 
diff --git a/storage/tests/unit/test_blob.py b/storage/tests/unit/test_blob.py
index ad0f88b5129f3..a5d49bc4bacb6 100644
--- a/storage/tests/unit/test_blob.py
+++ b/storage/tests/unit/test_blob.py
@@ -141,19 +141,6 @@ def test_path_with_non_ascii(self):
         blob = self._make_one(blob_name, bucket=bucket)
         self.assertEqual(blob.path, '/b/name/o/Caf%C3%A9')
 
-    def test_client(self):
-        blob_name = 'BLOB'
-        bucket = _Bucket()
-        blob = self._make_one(blob_name, bucket=bucket)
-        self.assertIs(blob.client, bucket.client)
-
-    def test_user_project(self):
-        user_project = 'user-project-123'
-        blob_name = 'BLOB'
-        bucket = _Bucket(user_project=user_project)
-        blob = self._make_one(blob_name, bucket=bucket)
-        self.assertEqual(blob.user_project, user_project)
-
     def test_public_url(self):
         BLOB_NAME = 'blob-name'
         bucket = _Bucket()
@@ -317,31 +304,16 @@ def test_exists_miss(self):
         bucket = _Bucket(client)
         blob = self._make_one(NONESUCH, bucket=bucket)
         self.assertFalse(blob.exists())
-        self.assertEqual(len(connection._requested), 1)
-        self.assertEqual(connection._requested[0], {
-            'method': 'GET',
-            'path': '/b/name/o/{}'.format(NONESUCH),
-            'query_params': {'fields': 'name'},
-            '_target_object': None,
-        })
 
-    def test_exists_hit_w_user_project(self):
+    def test_exists_hit(self):
         BLOB_NAME = 'blob-name'
-        USER_PROJECT = 'user-project-123'
         found_response = ({'status': http_client.OK}, b'')
         connection = _Connection(found_response)
         client = _Client(connection)
-        bucket = _Bucket(client, user_project=USER_PROJECT)
+        bucket = _Bucket(client)
         blob = self._make_one(BLOB_NAME, bucket=bucket)
         bucket._blobs[BLOB_NAME] = 1
         self.assertTrue(blob.exists())
-        self.assertEqual(len(connection._requested), 1)
-        self.assertEqual(connection._requested[0], {
-            'method': 'GET',
-            'path': '/b/name/o/{}'.format(BLOB_NAME),
-            'query_params': {'fields': 'name', 'userProject': USER_PROJECT},
-            '_target_object': None,
-        })
 
     def test_delete(self):
         BLOB_NAME = 'blob-name'
@@ -366,7 +338,7 @@ def test__make_transport(self, fake_session_factory):
 
     def test__get_download_url_with_media_link(self):
         blob_name = 'something.txt'
-        bucket = _Bucket(name='IRRELEVANT')
+        bucket = mock.Mock(spec=[])
         blob = self._make_one(blob_name, bucket=bucket)
         media_link = 'http://test.invalid'
         # Set the media link on the blob
@@ -375,22 +347,9 @@ def test__get_download_url_with_media_link(self):
         download_url = blob._get_download_url()
         self.assertEqual(download_url, media_link)
 
-    def test__get_download_url_with_media_link_w_user_project(self):
-        blob_name = 'something.txt'
-        user_project = 'user-project-123'
-        bucket = _Bucket(name='IRRELEVANT', user_project=user_project)
-        blob = self._make_one(blob_name, bucket=bucket)
-        media_link = 'http://test.invalid'
-        # Set the media link on the blob
-        blob._properties['mediaLink'] = media_link
-
-        download_url = blob._get_download_url()
-        self.assertEqual(
-            download_url, '{}?userProject={}'.format(media_link, user_project))
-
     def test__get_download_url_on_the_fly(self):
         blob_name = 'bzzz-fly.txt'
-        bucket = _Bucket(name='buhkit')
+        bucket = mock.Mock(path='/b/buhkit', spec=['path'])
         blob = self._make_one(blob_name, bucket=bucket)
 
         self.assertIsNone(blob.media_link)
@@ -402,7 +361,7 @@ def test__get_download_url_on_the_fly(self):
 
     def test__get_download_url_on_the_fly_with_generation(self):
         blob_name = 'pretend.txt'
-        bucket = _Bucket(name='fictional')
+        bucket = mock.Mock(path='/b/fictional', spec=['path'])
         blob = self._make_one(blob_name, bucket=bucket)
         generation = 1493058489532987
         # Set the media link on the blob
@@ -415,20 +374,6 @@ def test__get_download_url_on_the_fly_with_generation(self):
             'fictional/o/pretend.txt?alt=media&generation=1493058489532987')
         self.assertEqual(download_url, expected_url)
 
-    def test__get_download_url_on_the_fly_with_user_project(self):
-        blob_name = 'pretend.txt'
-        user_project = 'user-project-123'
-        bucket = _Bucket(name='fictional', user_project=user_project)
-        blob = self._make_one(blob_name, bucket=bucket)
-
-        self.assertIsNone(blob.media_link)
-        download_url = blob._get_download_url()
-        expected_url = (
-            'https://www.googleapis.com/download/storage/v1/b/'
-            'fictional/o/pretend.txt?alt=media&userProject={}'.format(
-                user_project))
-        self.assertEqual(download_url, expected_url)
-
     @staticmethod
     def _mock_requests_response(status_code, headers, content=b''):
         return mock.Mock(
@@ -820,8 +765,8 @@ def _mock_transport(self, status_code, headers, content=b''):
         return fake_transport
 
     def _do_multipart_success(self, mock_get_boundary, size=None,
-                              num_retries=None, user_project=None):
-        bucket = _Bucket(name='w00t', user_project=user_project)
+                              num_retries=None):
+        bucket = mock.Mock(path='/b/w00t', spec=[u'path'])
         blob = self._make_one(u'blob-name', bucket=bucket)
         self.assertIsNone(blob.chunk_size)
 
@@ -853,8 +798,6 @@ def _do_multipart_success(self, mock_get_boundary, size=None,
             'https://www.googleapis.com/upload/storage/v1' +
             bucket.path +
             '/o?uploadType=multipart')
-        if user_project is not None:
-            upload_url += '&userProject={}'.format(user_project)
         payload = (
             b'--==0==\r\n' +
             b'content-type: application/json; charset=UTF-8\r\n\r\n' +
@@ -877,13 +820,6 @@ def test__do_multipart_upload_no_size(self, mock_get_boundary):
     def test__do_multipart_upload_with_size(self, mock_get_boundary):
         self._do_multipart_success(mock_get_boundary, size=10)
 
-    @mock.patch(u'google.resumable_media._upload.get_boundary',
-                return_value=b'==0==')
-    def test__do_multipart_upload_with_user_project(self, mock_get_boundary):
-        user_project = 'user-project-123'
-        self._do_multipart_success(
-            mock_get_boundary, user_project=user_project)
-
     @mock.patch(u'google.resumable_media._upload.get_boundary',
                 return_value=b'==0==')
     def test__do_multipart_upload_with_retry(self, mock_get_boundary):
@@ -905,12 +841,11 @@ def test__do_multipart_upload_bad_size(self):
             'was specified but the file-like object only had', exc_contents)
         self.assertEqual(stream.tell(), len(data))
 
-    def _initiate_resumable_helper(
-            self, size=None, extra_headers=None, chunk_size=None,
-            num_retries=None, user_project=None):
+    def _initiate_resumable_helper(self, size=None, extra_headers=None,
+                                   chunk_size=None, num_retries=None):
         from google.resumable_media.requests import ResumableUpload
 
-        bucket = _Bucket(name='whammy', user_project=user_project)
+        bucket = mock.Mock(path='/b/whammy', spec=[u'path'])
         blob = self._make_one(u'blob-name', bucket=bucket)
         blob.metadata = {'rook': 'takes knight'}
         blob.chunk_size = 3 * blob._CHUNK_SIZE_MULTIPLE
@@ -944,8 +879,6 @@ def _initiate_resumable_helper(
             'https://www.googleapis.com/upload/storage/v1' +
             bucket.path +
             '/o?uploadType=resumable')
-        if user_project is not None:
-            upload_url += '&userProject={}'.format(user_project)
         self.assertEqual(upload.upload_url, upload_url)
         if extra_headers is None:
             self.assertEqual(upload._headers, {})
@@ -998,10 +931,6 @@ def test__initiate_resumable_upload_no_size(self):
     def test__initiate_resumable_upload_with_size(self):
         self._initiate_resumable_helper(size=10000)
 
-    def test__initiate_resumable_upload_with_user_project(self):
-        user_project = 'user-project-123'
-        self._initiate_resumable_helper(user_project=user_project)
-
     def test__initiate_resumable_upload_with_chunk_size(self):
         one_mb = 1048576
         self._initiate_resumable_helper(chunk_size=one_mb)
@@ -1081,7 +1010,7 @@ def _do_resumable_upload_call2(blob, content_type, data,
             'PUT', resumable_url, data=payload, headers=expected_headers)
 
     def _do_resumable_helper(self, use_size=False, num_retries=None):
-        bucket = _Bucket(name='yesterday')
+        bucket = mock.Mock(path='/b/yesterday', spec=[u'path'])
         blob = self._make_one(u'blob-name', bucket=bucket)
         blob.chunk_size = blob._CHUNK_SIZE_MULTIPLE
         self.assertIsNotNone(blob.chunk_size)
@@ -1324,7 +1253,7 @@ def test_upload_from_string_w_text(self):
 
     def _create_resumable_upload_session_helper(self, origin=None,
                                                 side_effect=None):
-        bucket = _Bucket(name='alex-trebek')
+        bucket = mock.Mock(path='/b/alex-trebek', spec=[u'path'])
         blob = self._make_one('blob-name', bucket=bucket)
         chunk_size = 99 * blob._CHUNK_SIZE_MULTIPLE
         blob.chunk_size = chunk_size
@@ -1435,49 +1364,8 @@ def test_get_iam_policy(self):
 
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'GET',
-            'path': '%s/iam' % (PATH,),
-            'query_params': {},
-            '_target_object': None,
-        })
-
-    def test_get_iam_policy_w_user_project(self):
-        from google.cloud.iam import Policy
-
-        BLOB_NAME = 'blob-name'
-        USER_PROJECT = 'user-project-123'
-        PATH = '/b/name/o/%s' % (BLOB_NAME,)
-        ETAG = 'DEADBEEF'
-        VERSION = 17
-        RETURNED = {
-            'resourceId': PATH,
-            'etag': ETAG,
-            'version': VERSION,
-            'bindings': [],
-        }
-        after = ({'status': http_client.OK}, RETURNED)
-        EXPECTED = {}
-        connection = _Connection(after)
-        client = _Client(connection)
-        bucket = _Bucket(client=client, user_project=USER_PROJECT)
-        blob = self._make_one(BLOB_NAME, bucket=bucket)
-
-        policy = blob.get_iam_policy()
-
-        self.assertIsInstance(policy, Policy)
-        self.assertEqual(policy.etag, RETURNED['etag'])
-        self.assertEqual(policy.version, RETURNED['version'])
-        self.assertEqual(dict(policy), EXPECTED)
-
-        kw = connection._requested
-        self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'GET',
-            'path': '%s/iam' % (PATH,),
-            'query_params': {'userProject': USER_PROJECT},
-            '_target_object': None,
-        })
+        self.assertEqual(kw[0]['method'], 'GET')
+        self.assertEqual(kw[0]['path'], '%s/iam' % (PATH,))
 
     def test_set_iam_policy(self):
         import operator
@@ -1526,7 +1414,6 @@ def test_set_iam_policy(self):
         self.assertEqual(len(kw), 1)
         self.assertEqual(kw[0]['method'], 'PUT')
         self.assertEqual(kw[0]['path'], '%s/iam' % (PATH,))
-        self.assertEqual(kw[0]['query_params'], {})
         sent = kw[0]['data']
         self.assertEqual(sent['resourceId'], PATH)
         self.assertEqual(len(sent['bindings']), len(BINDINGS))
@@ -1538,41 +1425,6 @@ def test_set_iam_policy(self):
             self.assertEqual(
                 sorted(found['members']), sorted(expected['members']))
 
-    def test_set_iam_policy_w_user_project(self):
-        from google.cloud.iam import Policy
-
-        BLOB_NAME = 'blob-name'
-        USER_PROJECT = 'user-project-123'
-        PATH = '/b/name/o/%s' % (BLOB_NAME,)
-        ETAG = 'DEADBEEF'
-        VERSION = 17
-        BINDINGS = []
-        RETURNED = {
-            'etag': ETAG,
-            'version': VERSION,
-            'bindings': BINDINGS,
-        }
-        after = ({'status': http_client.OK}, RETURNED)
-        policy = Policy()
-
-        connection = _Connection(after)
-        client = _Client(connection)
-        bucket = _Bucket(client=client, user_project=USER_PROJECT)
-        blob = self._make_one(BLOB_NAME, bucket=bucket)
-
-        returned = blob.set_iam_policy(policy)
-
-        self.assertEqual(returned.etag, ETAG)
-        self.assertEqual(returned.version, VERSION)
-        self.assertEqual(dict(returned), dict(policy))
-
-        kw = connection._requested
-        self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'PUT')
-        self.assertEqual(kw[0]['path'], '%s/iam' % (PATH,))
-        self.assertEqual(kw[0]['query_params'], {'userProject': USER_PROJECT})
-        self.assertEqual(kw[0]['data'], {'resourceId': PATH})
-
     def test_test_iam_permissions(self):
         from google.cloud.storage.iam import STORAGE_OBJECTS_LIST
         from google.cloud.storage.iam import STORAGE_BUCKETS_GET
@@ -1603,39 +1455,6 @@ def test_test_iam_permissions(self):
         self.assertEqual(kw[0]['path'], '%s/iam/testPermissions' % (PATH,))
         self.assertEqual(kw[0]['query_params'], {'permissions': PERMISSIONS})
 
-    def test_test_iam_permissions_w_user_project(self):
-        from google.cloud.storage.iam import STORAGE_OBJECTS_LIST
-        from google.cloud.storage.iam import STORAGE_BUCKETS_GET
-        from google.cloud.storage.iam import STORAGE_BUCKETS_UPDATE
-
-        BLOB_NAME = 'blob-name'
-        USER_PROJECT = 'user-project-123'
-        PATH = '/b/name/o/%s' % (BLOB_NAME,)
-        PERMISSIONS = [
-            STORAGE_OBJECTS_LIST,
-            STORAGE_BUCKETS_GET,
-            STORAGE_BUCKETS_UPDATE,
-        ]
-        ALLOWED = PERMISSIONS[1:]
-        RETURNED = {'permissions': ALLOWED}
-        after = ({'status': http_client.OK}, RETURNED)
-        connection = _Connection(after)
-        client = _Client(connection)
-        bucket = _Bucket(client=client, user_project=USER_PROJECT)
-        blob = self._make_one(BLOB_NAME, bucket=bucket)
-
-        allowed = blob.test_iam_permissions(PERMISSIONS)
-
-        self.assertEqual(allowed, ALLOWED)
-
-        kw = connection._requested
-        self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'GET')
-        self.assertEqual(kw[0]['path'], '%s/iam/testPermissions' % (PATH,))
-        self.assertEqual(
-            kw[0]['query_params'],
-            {'permissions': PERMISSIONS, 'userProject': USER_PROJECT})
-
     def test_make_public(self):
         from google.cloud.storage.acl import _ACLEntity
 
@@ -1670,18 +1489,17 @@ def test_compose_wo_content_type_set(self):
         with self.assertRaises(ValueError):
             destination.compose(sources=[source_1, source_2])
 
-    def test_compose_minimal_w_user_project(self):
+    def test_compose_minimal(self):
         SOURCE_1 = 'source-1'
         SOURCE_2 = 'source-2'
         DESTINATION = 'destinaton'
         RESOURCE = {
             'etag': 'DEADBEEF'
         }
-        USER_PROJECT = 'user-project-123'
         after = ({'status': http_client.OK}, RESOURCE)
         connection = _Connection(after)
         client = _Client(connection)
-        bucket = _Bucket(client=client, user_project=USER_PROJECT)
+        bucket = _Bucket(client=client)
         source_1 = self._make_one(SOURCE_1, bucket=bucket)
         source_2 = self._make_one(SOURCE_2, bucket=bucket)
         destination = self._make_one(DESTINATION, bucket=bucket)
@@ -1691,23 +1509,20 @@ def test_compose_minimal_w_user_project(self):
 
         self.assertEqual(destination.etag, 'DEADBEEF')
 
+        SENT = {
+            'sourceObjects': [
+                {'name': source_1.name},
+                {'name': source_2.name},
+            ],
+            'destination': {
+                'contentType': 'text/plain',
+            },
+        }
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'POST',
-            'path': '/b/name/o/%s/compose' % DESTINATION,
-            'query_params': {'userProject': USER_PROJECT},
-            'data':  {
-                'sourceObjects': [
-                    {'name': source_1.name},
-                    {'name': source_2.name},
-                ],
-                'destination': {
-                    'contentType': 'text/plain',
-                },
-            },
-            '_target_object': destination,
-        })
+        self.assertEqual(kw[0]['method'], 'POST')
+        self.assertEqual(kw[0]['path'], '/b/name/o/%s/compose' % DESTINATION)
+        self.assertEqual(kw[0]['data'], SENT)
 
     def test_compose_w_additional_property_changes(self):
         SOURCE_1 = 'source-1'
@@ -1731,27 +1546,24 @@ def test_compose_w_additional_property_changes(self):
 
         self.assertEqual(destination.etag, 'DEADBEEF')
 
+        SENT = {
+            'sourceObjects': [
+                {'name': source_1.name},
+                {'name': source_2.name},
+            ],
+            'destination': {
+                'contentType': 'text/plain',
+                'contentLanguage': 'en-US',
+                'metadata': {
+                    'my-key': 'my-value',
+                }
+            },
+        }
         kw = connection._requested
         self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0], {
-            'method': 'POST',
-            'path': '/b/name/o/%s/compose' % DESTINATION,
-            'query_params': {},
-            'data':  {
-                'sourceObjects': [
-                    {'name': source_1.name},
-                    {'name': source_2.name},
-                ],
-                'destination': {
-                    'contentType': 'text/plain',
-                    'contentLanguage': 'en-US',
-                    'metadata': {
-                        'my-key': 'my-value',
-                    }
-                },
-            },
-            '_target_object': destination,
-        })
+        self.assertEqual(kw[0]['method'], 'POST')
+        self.assertEqual(kw[0]['path'], '/b/name/o/%s/compose' % DESTINATION)
+        self.assertEqual(kw[0]['data'], SENT)
 
     def test_rewrite_response_without_resource(self):
         SOURCE_BLOB = 'source'
@@ -1823,7 +1635,7 @@ def test_rewrite_other_bucket_other_name_no_encryption_partial(self):
         self.assertNotIn('X-Goog-Encryption-Key', headers)
         self.assertNotIn('X-Goog-Encryption-Key-Sha256', headers)
 
-    def test_rewrite_same_name_no_old_key_new_key_done_w_user_project(self):
+    def test_rewrite_same_name_no_old_key_new_key_done(self):
         import base64
         import hashlib
 
@@ -1832,7 +1644,6 @@ def test_rewrite_same_name_no_old_key_new_key_done_w_user_project(self):
         KEY_HASH = hashlib.sha256(KEY).digest()
         KEY_HASH_B64 = base64.b64encode(KEY_HASH).rstrip().decode('ascii')
         BLOB_NAME = 'blob'
-        USER_PROJECT = 'user-project-123'
         RESPONSE = {
             'totalBytesRewritten': 42,
             'objectSize': 42,
@@ -1842,7 +1653,7 @@ def test_rewrite_same_name_no_old_key_new_key_done_w_user_project(self):
         response = ({'status': http_client.OK}, RESPONSE)
         connection = _Connection(response)
         client = _Client(connection)
-        bucket = _Bucket(client=client, user_project=USER_PROJECT)
+        bucket = _Bucket(client=client)
         plain = self._make_one(BLOB_NAME, bucket=bucket)
         encrypted = self._make_one(BLOB_NAME, bucket=bucket,
                                    encryption_key=KEY)
@@ -1858,7 +1669,7 @@ def test_rewrite_same_name_no_old_key_new_key_done_w_user_project(self):
         self.assertEqual(kw[0]['method'], 'POST')
         PATH = '/b/name/o/%s/rewriteTo/b/name/o/%s' % (BLOB_NAME, BLOB_NAME)
         self.assertEqual(kw[0]['path'], PATH)
-        self.assertEqual(kw[0]['query_params'], {'userProject': USER_PROJECT})
+        self.assertEqual(kw[0]['query_params'], {})
         SENT = {}
         self.assertEqual(kw[0]['data'], SENT)
 
@@ -1961,7 +1772,7 @@ def test_update_storage_class_wo_encryption_key(self):
         self.assertEqual(kw[0]['method'], 'POST')
         PATH = '/b/name/o/%s/rewriteTo/b/name/o/%s' % (BLOB_NAME, BLOB_NAME)
         self.assertEqual(kw[0]['path'], PATH)
-        self.assertEqual(kw[0]['query_params'], {})
+        self.assertNotIn('query_params', kw[0])
         SENT = {'storageClass': STORAGE_CLASS}
         self.assertEqual(kw[0]['data'], SENT)
 
@@ -1975,7 +1786,7 @@ def test_update_storage_class_wo_encryption_key(self):
         self.assertNotIn('X-Goog-Encryption-Key', headers)
         self.assertNotIn('X-Goog-Encryption-Key-Sha256', headers)
 
-    def test_update_storage_class_w_encryption_key_w_user_project(self):
+    def test_update_storage_class_w_encryption_key(self):
         import base64
         import hashlib
 
@@ -1986,14 +1797,13 @@ def test_update_storage_class_w_encryption_key_w_user_project(self):
         BLOB_KEY_HASH_B64 = base64.b64encode(
             BLOB_KEY_HASH).rstrip().decode('ascii')
         STORAGE_CLASS = u'NEARLINE'
-        USER_PROJECT = 'user-project-123'
         RESPONSE = {
             'resource': {'storageClass': STORAGE_CLASS},
         }
         response = ({'status': http_client.OK}, RESPONSE)
         connection = _Connection(response)
         client = _Client(connection)
-        bucket = _Bucket(client=client, user_project=USER_PROJECT)
+        bucket = _Bucket(client=client)
         blob = self._make_one(
             BLOB_NAME, bucket=bucket, encryption_key=BLOB_KEY)
 
@@ -2006,7 +1816,7 @@ def test_update_storage_class_w_encryption_key_w_user_project(self):
         self.assertEqual(kw[0]['method'], 'POST')
         PATH = '/b/name/o/%s/rewriteTo/b/name/o/%s' % (BLOB_NAME, BLOB_NAME)
         self.assertEqual(kw[0]['path'], PATH)
-        self.assertEqual(kw[0]['query_params'], {'userProject': USER_PROJECT})
+        self.assertNotIn('query_params', kw[0])
         SENT = {'storageClass': STORAGE_CLASS}
         self.assertEqual(kw[0]['data'], SENT)
 
@@ -2443,37 +2253,6 @@ def test_with_error_info(self):
         self.assertEqual(exc_info.exception.errors, [])
 
 
-class Test__add_query_parameters(unittest.TestCase):
-
-    @staticmethod
-    def _call_fut(*args, **kwargs):
-        from google.cloud.storage.blob import _add_query_parameters
-
-        return _add_query_parameters(*args, **kwargs)
-
-    def test_w_empty_list(self):
-        BASE_URL = 'https://test.example.com/base'
-        self.assertEqual(self._call_fut(BASE_URL, []), BASE_URL)
-
-    def test_wo_existing_qs(self):
-        BASE_URL = 'https://test.example.com/base'
-        NV_LIST = [('one', 'One'), ('two', 'Two')]
-        expected = '&'.join([
-            '{}={}'.format(name, value) for name, value in NV_LIST])
-        self.assertEqual(
-            self._call_fut(BASE_URL, NV_LIST),
-            '{}?{}'.format(BASE_URL, expected))
-
-    def test_w_existing_qs(self):
-        BASE_URL = 'https://test.example.com/base?one=Three'
-        NV_LIST = [('one', 'One'), ('two', 'Two')]
-        expected = '&'.join([
-            '{}={}'.format(name, value) for name, value in NV_LIST])
-        self.assertEqual(
-            self._call_fut(BASE_URL, NV_LIST),
-            '{}&{}'.format(BASE_URL, expected))
-
-
 class _Connection(object):
 
     API_BASE_URL = 'http://example.com'
@@ -2501,7 +2280,7 @@ def api_request(self, **kw):
 
 class _Bucket(object):
 
-    def __init__(self, client=None, name='name', user_project=None):
+    def __init__(self, client=None, name='name'):
         if client is None:
             connection = _Connection()
             client = _Client(connection)
@@ -2511,7 +2290,6 @@ def __init__(self, client=None, name='name', user_project=None):
         self._deleted = []
         self.name = name
         self.path = '/b/' + name
-        self.user_project = user_project
 
     def delete_blob(self, blob_name, client=None):
         del self._blobs[blob_name]
diff --git a/storage/tests/unit/test_bucket.py b/storage/tests/unit/test_bucket.py
index b6231fa2192ac..5e4a915751977 100644
--- a/storage/tests/unit/test_bucket.py
+++ b/storage/tests/unit/test_bucket.py
@@ -33,21 +33,13 @@ class _SigningCredentials(
 
 class Test_Bucket(unittest.TestCase):
 
-    @staticmethod
-    def _get_target_class():
+    def _make_one(self, client=None, name=None, properties=None):
         from google.cloud.storage.bucket import Bucket
-        return Bucket
 
-    def _make_one(
-            self, client=None, name=None, properties=None, user_project=None):
         if client is None:
             connection = _Connection()
             client = _Client(connection)
-        if user_project is None:
-            bucket = self._get_target_class()(client, name=name)
-        else:
-            bucket = self._get_target_class()(
-                client, name=name, user_project=user_project)
+        bucket = Bucket(client, name=name)
         bucket._properties = properties or {}
         return bucket
 
@@ -61,21 +53,6 @@ def test_ctor(self):
         self.assertIs(bucket._acl.bucket, bucket)
         self.assertFalse(bucket._default_object_acl.loaded)
         self.assertIs(bucket._default_object_acl.bucket, bucket)
-        self.assertIsNone(bucket.user_project)
-
-    def test_ctor_w_user_project(self):
-        NAME = 'name'
-        USER_PROJECT = 'user-project-123'
-        connection = _Connection()
-        client = _Client(connection)
-        bucket = self._make_one(client, name=NAME, user_project=USER_PROJECT)
-        self.assertEqual(bucket.name, NAME)
-        self.assertEqual(bucket._properties, {})
-        self.assertEqual(bucket.user_project, USER_PROJECT)
-        self.assertFalse(bucket._acl.loaded)
-        self.assertIs(bucket._acl.bucket, bucket)
-        self.assertFalse(bucket._default_object_acl.loaded)
-        self.assertIs(bucket._default_object_acl.bucket, bucket)
 
     def test_blob(self):
         from google.cloud.storage.blob import Blob
@@ -96,8 +73,9 @@ def test_blob(self):
         self.assertEqual(blob._encryption_key, KEY)
 
     def test_bucket_name_value(self):
-        BUCKET_NAME = 'bucket-name'
-        bucket = self._make_one(name=BUCKET_NAME)
+        bucket_name = 'testing123'
+        mixin = self._make_one(name=bucket_name)
+        self.assertEqual(mixin.name, bucket_name)
 
         bad_start_bucket_name = '/testing123'
         with self.assertRaises(ValueError):
@@ -107,13 +85,6 @@ def test_bucket_name_value(self):
         with self.assertRaises(ValueError):
             self._make_one(name=bad_end_bucket_name)
 
-    def test_user_project(self):
-        BUCKET_NAME = 'name'
-        USER_PROJECT = 'user-project-123'
-        bucket = self._make_one(name=BUCKET_NAME)
-        bucket._user_project = USER_PROJECT
-        self.assertEqual(bucket.user_project, USER_PROJECT)
-
     def test_exists_miss(self):
         from google.cloud.exceptions import NotFound
 
@@ -141,9 +112,7 @@ def api_request(cls, *args, **kwargs):
         expected_cw = [((), expected_called_kwargs)]
         self.assertEqual(_FakeConnection._called_with, expected_cw)
 
-    def test_exists_hit_w_user_project(self):
-        USER_PROJECT = 'user-project-123'
-
+    def test_exists_hit(self):
         class _FakeConnection(object):
 
             _called_with = []
@@ -155,7 +124,7 @@ def api_request(cls, *args, **kwargs):
                 return object()
 
         BUCKET_NAME = 'bucket-name'
-        bucket = self._make_one(name=BUCKET_NAME, user_project=USER_PROJECT)
+        bucket = self._make_one(name=BUCKET_NAME)
         client = _Client(_FakeConnection)
         self.assertTrue(bucket.exists(client=client))
         expected_called_kwargs = {
@@ -163,29 +132,17 @@ def api_request(cls, *args, **kwargs):
             'path': bucket.path,
             'query_params': {
                 'fields': 'name',
-                'userProject': USER_PROJECT,
             },
             '_target_object': None,
         }
         expected_cw = [((), expected_called_kwargs)]
         self.assertEqual(_FakeConnection._called_with, expected_cw)
 
-    def test_create_w_user_project(self):
-        PROJECT = 'PROJECT'
-        BUCKET_NAME = 'bucket-name'
-        USER_PROJECT = 'user-project-123'
-        connection = _Connection()
-        client = _Client(connection, project=PROJECT)
-        bucket = self._make_one(client, BUCKET_NAME, user_project=USER_PROJECT)
-
-        with self.assertRaises(ValueError):
-            bucket.create()
-
     def test_create_hit(self):
-        PROJECT = 'PROJECT'
         BUCKET_NAME = 'bucket-name'
         DATA = {'name': BUCKET_NAME}
         connection = _Connection(DATA)
+        PROJECT = 'PROJECT'
         client = _Client(connection, project=PROJECT)
         bucket = self._make_one(client=client, name=BUCKET_NAME)
         bucket.create()
@@ -219,7 +176,6 @@ def test_create_w_extra_properties(self):
             'location': LOCATION,
             'storageClass': STORAGE_CLASS,
             'versioning': {'enabled': True},
-            'billing': {'requesterPays': True},
             'labels': LABELS,
         }
         connection = _Connection(DATA)
@@ -230,7 +186,6 @@ def test_create_w_extra_properties(self):
         bucket.location = LOCATION
         bucket.storage_class = STORAGE_CLASS
         bucket.versioning_enabled = True
-        bucket.requester_pays = True
         bucket.labels = LABELS
         bucket.create()
 
@@ -277,20 +232,18 @@ def test_get_blob_miss(self):
         self.assertEqual(kw['method'], 'GET')
         self.assertEqual(kw['path'], '/b/%s/o/%s' % (NAME, NONESUCH))
 
-    def test_get_blob_hit_w_user_project(self):
+    def test_get_blob_hit(self):
         NAME = 'name'
         BLOB_NAME = 'blob-name'
-        USER_PROJECT = 'user-project-123'
         connection = _Connection({'name': BLOB_NAME})
         client = _Client(connection)
-        bucket = self._make_one(name=NAME, user_project=USER_PROJECT)
+        bucket = self._make_one(name=NAME)
         blob = bucket.get_blob(BLOB_NAME, client=client)
         self.assertIs(blob.bucket, bucket)
         self.assertEqual(blob.name, BLOB_NAME)
         kw, = connection._requested
         self.assertEqual(kw['method'], 'GET')
         self.assertEqual(kw['path'], '/b/%s/o/%s' % (NAME, BLOB_NAME))
-        self.assertEqual(kw['query_params'], {'userProject': USER_PROJECT})
 
     def test_list_blobs_defaults(self):
         NAME = 'name'
@@ -305,9 +258,8 @@ def test_list_blobs_defaults(self):
         self.assertEqual(kw['path'], '/b/%s/o' % NAME)
         self.assertEqual(kw['query_params'], {'projection': 'noAcl'})
 
-    def test_list_blobs_w_all_arguments_and_user_project(self):
+    def test_list_blobs_w_all_arguments(self):
         NAME = 'name'
-        USER_PROJECT = 'user-project-123'
         MAX_RESULTS = 10
         PAGE_TOKEN = 'ABCD'
         PREFIX = 'subfolder'
@@ -323,11 +275,10 @@ def test_list_blobs_w_all_arguments_and_user_project(self):
             'versions': VERSIONS,
             'projection': PROJECTION,
             'fields': FIELDS,
-            'userProject': USER_PROJECT,
         }
         connection = _Connection({'items': []})
         client = _Client(connection)
-        bucket = self._make_one(name=NAME, user_project=USER_PROJECT)
+        bucket = self._make_one(name=NAME)
         iterator = bucket.list_blobs(
             max_results=MAX_RESULTS,
             page_token=PAGE_TOKEN,
@@ -369,27 +320,23 @@ def test_delete_miss(self):
         expected_cw = [{
             'method': 'DELETE',
             'path': bucket.path,
-            'query_params': {},
             '_target_object': None,
         }]
         self.assertEqual(connection._deleted_buckets, expected_cw)
 
-    def test_delete_hit_with_user_project(self):
+    def test_delete_hit(self):
         NAME = 'name'
-        USER_PROJECT = 'user-project-123'
         GET_BLOBS_RESP = {'items': []}
         connection = _Connection(GET_BLOBS_RESP)
         connection._delete_bucket = True
         client = _Client(connection)
-        bucket = self._make_one(
-            client=client, name=NAME, user_project=USER_PROJECT)
+        bucket = self._make_one(client=client, name=NAME)
         result = bucket.delete(force=True)
         self.assertIsNone(result)
         expected_cw = [{
             'method': 'DELETE',
             'path': bucket.path,
             '_target_object': None,
-            'query_params': {'userProject': USER_PROJECT},
         }]
         self.assertEqual(connection._deleted_buckets, expected_cw)
 
@@ -414,7 +361,6 @@ def test_delete_force_delete_blobs(self):
         expected_cw = [{
             'method': 'DELETE',
             'path': bucket.path,
-            'query_params': {},
             '_target_object': None,
         }]
         self.assertEqual(connection._deleted_buckets, expected_cw)
@@ -433,7 +379,6 @@ def test_delete_force_miss_blobs(self):
         expected_cw = [{
             'method': 'DELETE',
             'path': bucket.path,
-            'query_params': {},
             '_target_object': None,
         }]
         self.assertEqual(connection._deleted_buckets, expected_cw)
@@ -470,22 +415,18 @@ def test_delete_blob_miss(self):
         kw, = connection._requested
         self.assertEqual(kw['method'], 'DELETE')
         self.assertEqual(kw['path'], '/b/%s/o/%s' % (NAME, NONESUCH))
-        self.assertEqual(kw['query_params'], {})
 
-    def test_delete_blob_hit_with_user_project(self):
+    def test_delete_blob_hit(self):
         NAME = 'name'
         BLOB_NAME = 'blob-name'
-        USER_PROJECT = 'user-project-123'
         connection = _Connection({})
         client = _Client(connection)
-        bucket = self._make_one(
-            client=client, name=NAME, user_project=USER_PROJECT)
+        bucket = self._make_one(client=client, name=NAME)
         result = bucket.delete_blob(BLOB_NAME)
         self.assertIsNone(result)
         kw, = connection._requested
         self.assertEqual(kw['method'], 'DELETE')
         self.assertEqual(kw['path'], '/b/%s/o/%s' % (NAME, BLOB_NAME))
-        self.assertEqual(kw['query_params'], {'userProject': USER_PROJECT})
 
     def test_delete_blobs_empty(self):
         NAME = 'name'
@@ -495,20 +436,17 @@ def test_delete_blobs_empty(self):
         bucket.delete_blobs([])
         self.assertEqual(connection._requested, [])
 
-    def test_delete_blobs_hit_w_user_project(self):
+    def test_delete_blobs_hit(self):
         NAME = 'name'
         BLOB_NAME = 'blob-name'
-        USER_PROJECT = 'user-project-123'
         connection = _Connection({})
         client = _Client(connection)
-        bucket = self._make_one(
-            client=client, name=NAME, user_project=USER_PROJECT)
+        bucket = self._make_one(client=client, name=NAME)
         bucket.delete_blobs([BLOB_NAME])
         kw = connection._requested
         self.assertEqual(len(kw), 1)
         self.assertEqual(kw[0]['method'], 'DELETE')
         self.assertEqual(kw[0]['path'], '/b/%s/o/%s' % (NAME, BLOB_NAME))
-        self.assertEqual(kw[0]['query_params'], {'userProject': USER_PROJECT})
 
     def test_delete_blobs_miss_no_on_error(self):
         from google.cloud.exceptions import NotFound
@@ -566,7 +504,6 @@ class _Blob(object):
                                                      DEST, BLOB_NAME)
         self.assertEqual(kw['method'], 'POST')
         self.assertEqual(kw['path'], COPY_PATH)
-        self.assertEqual(kw['query_params'], {})
 
     def test_copy_blobs_preserve_acl(self):
         from google.cloud.storage.acl import ObjectACL
@@ -598,17 +535,14 @@ class _Blob(object):
         self.assertEqual(len(kw), 2)
         self.assertEqual(kw[0]['method'], 'POST')
         self.assertEqual(kw[0]['path'], COPY_PATH)
-        self.assertEqual(kw[0]['query_params'], {})
         self.assertEqual(kw[1]['method'], 'PATCH')
         self.assertEqual(kw[1]['path'], NEW_BLOB_PATH)
-        self.assertEqual(kw[1]['query_params'], {'projection': 'full'})
 
-    def test_copy_blobs_w_name_and_user_project(self):
+    def test_copy_blobs_w_name(self):
         SOURCE = 'source'
         DEST = 'dest'
         BLOB_NAME = 'blob-name'
         NEW_NAME = 'new_name'
-        USER_PROJECT = 'user-project-123'
 
         class _Blob(object):
             name = BLOB_NAME
@@ -616,8 +550,7 @@ class _Blob(object):
 
         connection = _Connection({})
         client = _Client(connection)
-        source = self._make_one(
-            client=client, name=SOURCE, user_project=USER_PROJECT)
+        source = self._make_one(client=client, name=SOURCE)
         dest = self._make_one(client=client, name=DEST)
         blob = _Blob()
         new_blob = source.copy_blob(blob, dest, NEW_NAME)
@@ -628,7 +561,6 @@ class _Blob(object):
                                                      DEST, NEW_NAME)
         self.assertEqual(kw['method'], 'POST')
         self.assertEqual(kw['path'], COPY_PATH)
-        self.assertEqual(kw['query_params'], {'userProject': USER_PROJECT})
 
     def test_rename_blob(self):
         BUCKET_NAME = 'BUCKET_NAME'
@@ -934,24 +866,6 @@ def test_versioning_enabled_setter(self):
         bucket.versioning_enabled = True
         self.assertTrue(bucket.versioning_enabled)
 
-    def test_requester_pays_getter_missing(self):
-        NAME = 'name'
-        bucket = self._make_one(name=NAME)
-        self.assertEqual(bucket.requester_pays, False)
-
-    def test_requester_pays_getter(self):
-        NAME = 'name'
-        before = {'billing': {'requesterPays': True}}
-        bucket = self._make_one(name=NAME, properties=before)
-        self.assertEqual(bucket.requester_pays, True)
-
-    def test_requester_pays_setter(self):
-        NAME = 'name'
-        bucket = self._make_one(name=NAME)
-        self.assertFalse(bucket.requester_pays)
-        bucket.requester_pays = True
-        self.assertTrue(bucket.requester_pays)
-
     def test_configure_website_defaults(self):
         NAME = 'name'
         UNSET = {'website': {'mainPageSuffix': None,
@@ -1020,40 +934,6 @@ def test_get_iam_policy(self):
         self.assertEqual(len(kw), 1)
         self.assertEqual(kw[0]['method'], 'GET')
         self.assertEqual(kw[0]['path'], '%s/iam' % (PATH,))
-        self.assertEqual(kw[0]['query_params'], {})
-
-    def test_get_iam_policy_w_user_project(self):
-        from google.cloud.iam import Policy
-
-        NAME = 'name'
-        USER_PROJECT = 'user-project-123'
-        PATH = '/b/%s' % (NAME,)
-        ETAG = 'DEADBEEF'
-        VERSION = 17
-        RETURNED = {
-            'resourceId': PATH,
-            'etag': ETAG,
-            'version': VERSION,
-            'bindings': [],
-        }
-        EXPECTED = {}
-        connection = _Connection(RETURNED)
-        client = _Client(connection, None)
-        bucket = self._make_one(
-            client=client, name=NAME, user_project=USER_PROJECT)
-
-        policy = bucket.get_iam_policy()
-
-        self.assertIsInstance(policy, Policy)
-        self.assertEqual(policy.etag, RETURNED['etag'])
-        self.assertEqual(policy.version, RETURNED['version'])
-        self.assertEqual(dict(policy), EXPECTED)
-
-        kw = connection._requested
-        self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'GET')
-        self.assertEqual(kw[0]['path'], '%s/iam' % (PATH,))
-        self.assertEqual(kw[0]['query_params'], {'userProject': USER_PROJECT})
 
     def test_set_iam_policy(self):
         import operator
@@ -1100,66 +980,6 @@ def test_set_iam_policy(self):
         self.assertEqual(len(kw), 1)
         self.assertEqual(kw[0]['method'], 'PUT')
         self.assertEqual(kw[0]['path'], '%s/iam' % (PATH,))
-        self.assertEqual(kw[0]['query_params'], {})
-        sent = kw[0]['data']
-        self.assertEqual(sent['resourceId'], PATH)
-        self.assertEqual(len(sent['bindings']), len(BINDINGS))
-        key = operator.itemgetter('role')
-        for found, expected in zip(
-            sorted(sent['bindings'], key=key),
-            sorted(BINDINGS, key=key)):
-            self.assertEqual(found['role'], expected['role'])
-            self.assertEqual(
-                sorted(found['members']), sorted(expected['members']))
-
-    def test_set_iam_policy_w_user_project(self):
-        import operator
-        from google.cloud.storage.iam import STORAGE_OWNER_ROLE
-        from google.cloud.storage.iam import STORAGE_EDITOR_ROLE
-        from google.cloud.storage.iam import STORAGE_VIEWER_ROLE
-        from google.cloud.iam import Policy
-
-        NAME = 'name'
-        USER_PROJECT = 'user-project-123'
-        PATH = '/b/%s' % (NAME,)
-        ETAG = 'DEADBEEF'
-        VERSION = 17
-        OWNER1 = 'user:phred@example.com'
-        OWNER2 = 'group:cloud-logs@google.com'
-        EDITOR1 = 'domain:google.com'
-        EDITOR2 = 'user:phred@example.com'
-        VIEWER1 = 'serviceAccount:1234-abcdef@service.example.com'
-        VIEWER2 = 'user:phred@example.com'
-        BINDINGS = [
-            {'role': STORAGE_OWNER_ROLE, 'members': [OWNER1, OWNER2]},
-            {'role': STORAGE_EDITOR_ROLE, 'members': [EDITOR1, EDITOR2]},
-            {'role': STORAGE_VIEWER_ROLE, 'members': [VIEWER1, VIEWER2]},
-        ]
-        RETURNED = {
-            'etag': ETAG,
-            'version': VERSION,
-            'bindings': BINDINGS,
-        }
-        policy = Policy()
-        for binding in BINDINGS:
-            policy[binding['role']] = binding['members']
-
-        connection = _Connection(RETURNED)
-        client = _Client(connection, None)
-        bucket = self._make_one(
-            client=client, name=NAME, user_project=USER_PROJECT)
-
-        returned = bucket.set_iam_policy(policy)
-
-        self.assertEqual(returned.etag, ETAG)
-        self.assertEqual(returned.version, VERSION)
-        self.assertEqual(dict(returned), dict(policy))
-
-        kw = connection._requested
-        self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'PUT')
-        self.assertEqual(kw[0]['path'], '%s/iam' % (PATH,))
-        self.assertEqual(kw[0]['query_params'], {'userProject': USER_PROJECT})
         sent = kw[0]['data']
         self.assertEqual(sent['resourceId'], PATH)
         self.assertEqual(len(sent['bindings']), len(BINDINGS))
@@ -1199,38 +1019,6 @@ def test_test_iam_permissions(self):
         self.assertEqual(kw[0]['path'], '%s/iam/testPermissions' % (PATH,))
         self.assertEqual(kw[0]['query_params'], {'permissions': PERMISSIONS})
 
-    def test_test_iam_permissions_w_user_project(self):
-        from google.cloud.storage.iam import STORAGE_OBJECTS_LIST
-        from google.cloud.storage.iam import STORAGE_BUCKETS_GET
-        from google.cloud.storage.iam import STORAGE_BUCKETS_UPDATE
-
-        NAME = 'name'
-        USER_PROJECT = 'user-project-123'
-        PATH = '/b/%s' % (NAME,)
-        PERMISSIONS = [
-            STORAGE_OBJECTS_LIST,
-            STORAGE_BUCKETS_GET,
-            STORAGE_BUCKETS_UPDATE,
-        ]
-        ALLOWED = PERMISSIONS[1:]
-        RETURNED = {'permissions': ALLOWED}
-        connection = _Connection(RETURNED)
-        client = _Client(connection, None)
-        bucket = self._make_one(
-            client=client, name=NAME, user_project=USER_PROJECT)
-
-        allowed = bucket.test_iam_permissions(PERMISSIONS)
-
-        self.assertEqual(allowed, ALLOWED)
-
-        kw = connection._requested
-        self.assertEqual(len(kw), 1)
-        self.assertEqual(kw[0]['method'], 'GET')
-        self.assertEqual(kw[0]['path'], '%s/iam/testPermissions' % (PATH,))
-        self.assertEqual(
-            kw[0]['query_params'],
-            {'permissions': PERMISSIONS, 'userProject': USER_PROJECT})
-
     def test_make_public_defaults(self):
         from google.cloud.storage.acl import _ACLEntity
 
diff --git a/storage/tests/unit/test_client.py b/storage/tests/unit/test_client.py
index 29545415a2209..9696d4e5fa515 100644
--- a/storage/tests/unit/test_client.py
+++ b/storage/tests/unit/test_client.py
@@ -155,22 +155,22 @@ def test_get_bucket_hit(self):
         CREDENTIALS = _make_credentials()
         client = self._make_one(project=PROJECT, credentials=CREDENTIALS)
 
-        BUCKET_NAME = 'bucket-name'
+        BLOB_NAME = 'blob-name'
         URI = '/'.join([
             client._connection.API_BASE_URL,
             'storage',
             client._connection.API_VERSION,
             'b',
-            '%s?projection=noAcl' % (BUCKET_NAME,),
+            '%s?projection=noAcl' % (BLOB_NAME,),
         ])
         http = client._http_internal = _Http(
             {'status': '200', 'content-type': 'application/json'},
-            '{{"name": "{0}"}}'.format(BUCKET_NAME).encode('utf-8'),
+            '{{"name": "{0}"}}'.format(BLOB_NAME).encode('utf-8'),
         )
 
-        bucket = client.get_bucket(BUCKET_NAME)
+        bucket = client.get_bucket(BLOB_NAME)
         self.assertIsInstance(bucket, Bucket)
-        self.assertEqual(bucket.name, BUCKET_NAME)
+        self.assertEqual(bucket.name, BLOB_NAME)
         self.assertEqual(http._called_with['method'], 'GET')
         self.assertEqual(http._called_with['uri'], URI)
 
@@ -203,34 +203,33 @@ def test_lookup_bucket_hit(self):
         CREDENTIALS = _make_credentials()
         client = self._make_one(project=PROJECT, credentials=CREDENTIALS)
 
-        BUCKET_NAME = 'bucket-name'
+        BLOB_NAME = 'blob-name'
         URI = '/'.join([
             client._connection.API_BASE_URL,
             'storage',
             client._connection.API_VERSION,
             'b',
-            '%s?projection=noAcl' % (BUCKET_NAME,),
+            '%s?projection=noAcl' % (BLOB_NAME,),
         ])
         http = client._http_internal = _Http(
             {'status': '200', 'content-type': 'application/json'},
-            '{{"name": "{0}"}}'.format(BUCKET_NAME).encode('utf-8'),
+            '{{"name": "{0}"}}'.format(BLOB_NAME).encode('utf-8'),
         )
 
-        bucket = client.lookup_bucket(BUCKET_NAME)
+        bucket = client.lookup_bucket(BLOB_NAME)
         self.assertIsInstance(bucket, Bucket)
-        self.assertEqual(bucket.name, BUCKET_NAME)
+        self.assertEqual(bucket.name, BLOB_NAME)
         self.assertEqual(http._called_with['method'], 'GET')
         self.assertEqual(http._called_with['uri'], URI)
 
     def test_create_bucket_conflict(self):
-        import json
         from google.cloud.exceptions import Conflict
 
         PROJECT = 'PROJECT'
         CREDENTIALS = _make_credentials()
         client = self._make_one(project=PROJECT, credentials=CREDENTIALS)
 
-        BUCKET_NAME = 'bucket-name'
+        BLOB_NAME = 'blob-name'
         URI = '/'.join([
             client._connection.API_BASE_URL,
             'storage',
@@ -242,21 +241,18 @@ def test_create_bucket_conflict(self):
             '{"error": {"message": "Conflict"}}',
         )
 
-        self.assertRaises(Conflict, client.create_bucket, BUCKET_NAME)
+        self.assertRaises(Conflict, client.create_bucket, BLOB_NAME)
         self.assertEqual(http._called_with['method'], 'POST')
         self.assertEqual(http._called_with['uri'], URI)
-        body = json.loads(http._called_with['body'])
-        self.assertEqual(body, {'name': BUCKET_NAME})
 
     def test_create_bucket_success(self):
-        import json
         from google.cloud.storage.bucket import Bucket
 
         PROJECT = 'PROJECT'
         CREDENTIALS = _make_credentials()
         client = self._make_one(project=PROJECT, credentials=CREDENTIALS)
 
-        BUCKET_NAME = 'bucket-name'
+        BLOB_NAME = 'blob-name'
         URI = '/'.join([
             client._connection.API_BASE_URL,
             'storage',
@@ -265,17 +261,14 @@ def test_create_bucket_success(self):
         ])
         http = client._http_internal = _Http(
             {'status': '200', 'content-type': 'application/json'},
-            '{{"name": "{0}"}}'.format(BUCKET_NAME).encode('utf-8'),
+            '{{"name": "{0}"}}'.format(BLOB_NAME).encode('utf-8'),
         )
 
-        bucket = client.create_bucket(BUCKET_NAME, requester_pays=True)
+        bucket = client.create_bucket(BLOB_NAME)
         self.assertIsInstance(bucket, Bucket)
-        self.assertEqual(bucket.name, BUCKET_NAME)
+        self.assertEqual(bucket.name, BLOB_NAME)
         self.assertEqual(http._called_with['method'], 'POST')
         self.assertEqual(http._called_with['uri'], URI)
-        body = json.loads(http._called_with['body'])
-        self.assertEqual(
-            body, {'name': BUCKET_NAME, 'billing': {'requesterPays': True}})
 
     def test_list_buckets_empty(self):
         from six.moves.urllib.parse import parse_qs
@@ -407,7 +400,7 @@ def test_page_non_empty_response(self):
         credentials = _make_credentials()
         client = self._make_one(project=project, credentials=credentials)
 
-        blob_name = 'bucket-name'
+        blob_name = 'blob-name'
         response = {'items': [{'name': blob_name}]}
 
         def dummy_response():

From 1d156e3ed6a06468181a0c0bf48fc1a9e1c576ce Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 17:28:58 -0400
Subject: [PATCH 038/211] Prep core-0.25.0 release. (#3526)

---
 core/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/setup.py b/core/setup.py
index 3dfa13ef5284d..5a2f43adf4643 100644
--- a/core/setup.py
+++ b/core/setup.py
@@ -61,7 +61,7 @@
 
 setup(
     name='google-cloud-core',
-    version='0.24.1',
+    version='0.25.0',
     description='API Client library for Google Cloud: Core Helpers',
     long_description=README,
     namespace_packages=[

From 25b987c6f3e264a97a60d51be65abad5bf4eb61d Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 18:31:36 -0400
Subject: [PATCH 039/211] Prep datastore-1.1.0 release. (#3527)

---
 datastore/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/datastore/setup.py b/datastore/setup.py
index cc82802315ae7..6a09fb8595f37 100644
--- a/datastore/setup.py
+++ b/datastore/setup.py
@@ -51,14 +51,14 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.0, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
     'google-gax>=0.15.7, <0.16dev',
     'gapic-google-cloud-datastore-v1 >= 0.15.0, < 0.16dev',
 ]
 
 setup(
     name='google-cloud-datastore',
-    version='1.0.0',
+    version='1.1.0',
     description='Python Client for Google Cloud Datastore',
     long_description=README,
     namespace_packages=[

From 67fad2006faf168a52d10bc938abeeeefd4bd14f Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 18:34:40 -0400
Subject: [PATCH 040/211] Prep logging-1.1.0 release. (#3528)

---
 logging/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/logging/setup.py b/logging/setup.py
index e3f8334cd5bbe..3f613b94cbe73 100644
--- a/logging/setup.py
+++ b/logging/setup.py
@@ -51,14 +51,14 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.0, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
     'grpcio >= 1.2.0, < 2.0dev',
     'gapic-google-cloud-logging-v2 >= 0.91.0, < 0.92dev',
 ]
 
 setup(
     name='google-cloud-logging',
-    version='1.0.0',
+    version='1.1.0',
     description='Python Client for Stackdriver Logging',
     long_description=README,
     namespace_packages=[

From fc08ab08f70ea9c956ab240030e76a0cc35c81d2 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 18:36:07 -0400
Subject: [PATCH 041/211] Prep storage-1.2.0 release. (#3540)

---
 storage/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/storage/setup.py b/storage/setup.py
index e261f6402c02d..b7b341543ee87 100644
--- a/storage/setup.py
+++ b/storage/setup.py
@@ -51,7 +51,7 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.1, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
     'google-auth >= 1.0.0',
     'google-resumable-media >= 0.1.1',
     'requests >= 2.0.0',
@@ -59,7 +59,7 @@
 
 setup(
     name='google-cloud-storage',
-    version='1.1.1',
+    version='1.2.0',
     description='Python Client for Google Cloud Storage',
     long_description=README,
     namespace_packages=[

From d93921dc0d7f67eb91c198997314e28eebf79775 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 18:37:36 -0400
Subject: [PATCH 042/211] Prep bigquery-0.25.0 release. (#3530)

---
 bigquery/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bigquery/setup.py b/bigquery/setup.py
index ffd62619efe3d..4efe79c19e1a8 100644
--- a/bigquery/setup.py
+++ b/bigquery/setup.py
@@ -51,12 +51,12 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.0, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
 ]
 
 setup(
     name='google-cloud-bigquery',
-    version='0.24.0',
+    version='0.25.0',
     description='Python Client for Google BigQuery',
     long_description=README,
     namespace_packages=[

From 89ce0a62d9be7c85131c6aeae07dba20491f5a06 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 18:38:54 -0400
Subject: [PATCH 043/211] Prep pubsub-0.26.0 release. (#3532)

---
 pubsub/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pubsub/setup.py b/pubsub/setup.py
index b1b1375ed870e..94a854b63dee3 100644
--- a/pubsub/setup.py
+++ b/pubsub/setup.py
@@ -51,14 +51,14 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.1, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
     'grpcio >= 1.0.2, < 2.0dev',
     'gapic-google-cloud-pubsub-v1 >= 0.15.0, < 0.16dev',
 ]
 
 setup(
     name='google-cloud-pubsub',
-    version='0.25.0',
+    version='0.26.0',
     description='Python Client for Google Cloud Pub/Sub',
     long_description=README,
     namespace_packages=[

From c4484036ff7ce03a62fafb3ee5cedf19a74dcb6c Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 18:40:30 -0400
Subject: [PATCH 044/211] Prep bigtable-0.25.0 release. (#3534)

---
 bigtable/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bigtable/setup.py b/bigtable/setup.py
index 212feda21758d..6b90c6878ca83 100644
--- a/bigtable/setup.py
+++ b/bigtable/setup.py
@@ -51,13 +51,13 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.0, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
     'google-gax>=0.15.7, <0.16dev',
 ]
 
 setup(
     name='google-cloud-bigtable',
-    version='0.24.0',
+    version='0.25.0',
     description='Python Client for Google Cloud Bigtable',
     long_description=README,
     namespace_packages=[

From cc4e685421788298c632223e056efa1f4b339a39 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 18:42:15 -0400
Subject: [PATCH 045/211] Prep language-0.25.0 release. (#3535)

---
 language/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/language/setup.py b/language/setup.py
index 6e10d9abbd44b..089d78d6bbb27 100644
--- a/language/setup.py
+++ b/language/setup.py
@@ -51,12 +51,12 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.0, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
 ]
 
 setup(
     name='google-cloud-language',
-    version='0.24.1',
+    version='0.25.0',
     description='Python Client for Google Cloud Natural Language',
     long_description=README,
     namespace_packages=[

From 273b24fa6da43a51e500595619baa58ceaef05c1 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 18:43:30 -0400
Subject: [PATCH 046/211] Prep spanner-0.25.0 release. (#3536)

---
 spanner/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spanner/setup.py b/spanner/setup.py
index ea9cea88bd6d2..8b984c4a7f61a 100644
--- a/spanner/setup.py
+++ b/spanner/setup.py
@@ -51,7 +51,7 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.1, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
     'grpcio >= 1.2.0, < 2.0dev',
     'gapic-google-cloud-spanner-v1 >= 0.15.0, < 0.16dev',
     'gapic-google-cloud-spanner-admin-database-v1 >= 0.15.0, < 0.16dev',
@@ -60,7 +60,7 @@
 
 setup(
     name='google-cloud-spanner',
-    version='0.24.2',
+    version='0.25.0',
     description='Python Client for Cloud Spanner',
     long_description=README,
     namespace_packages=[

From a42347aa26b0ebc8a6bede8d4f7b98f24018bb68 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 18:44:59 -0400
Subject: [PATCH 047/211] Prep dns-0.25.0 release. (#3541)

---
 dns/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dns/setup.py b/dns/setup.py
index 72c14abc2db34..5657495ce253a 100644
--- a/dns/setup.py
+++ b/dns/setup.py
@@ -51,12 +51,12 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.0, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
 ]
 
 setup(
     name='google-cloud-dns',
-    version='0.24.0',
+    version='0.25.0',
     description='Python Client for Google Cloud DNS',
     long_description=README,
     namespace_packages=[

From 92c468d75434eaa4d86c2d30ae420a4f223246d7 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 18:48:57 -0400
Subject: [PATCH 048/211] Prep monitoring-0.25.0 release. (#3543)

---
 monitoring/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/monitoring/setup.py b/monitoring/setup.py
index 98555e2a7bf32..318ecf60b9b4f 100644
--- a/monitoring/setup.py
+++ b/monitoring/setup.py
@@ -51,12 +51,12 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.0, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
 ]
 
 setup(
     name='google-cloud-monitoring',
-    version='0.24.0',
+    version='0.25.0',
     description='Python Client for Stackdriver Monitoring',
     long_description=README,
     namespace_packages=[

From 25c98d91e23c9c94fe02bbe43225c0e1f4c6baa5 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 18:49:59 -0400
Subject: [PATCH 049/211] Prep resource-manager-0.25.0 release. (#3544)

---
 resource_manager/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resource_manager/setup.py b/resource_manager/setup.py
index 64abeb02b62e9..1a23e9ad617ed 100644
--- a/resource_manager/setup.py
+++ b/resource_manager/setup.py
@@ -51,12 +51,12 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.0, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
 ]
 
 setup(
     name='google-cloud-resource-manager',
-    version='0.24.0',
+    version='0.25.0',
     description='Python Client for Google Cloud Resource Manager',
     long_description=README,
     namespace_packages=[

From 0ac5a24679a44de293d829b6537818b908d64ef2 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 18:51:27 -0400
Subject: [PATCH 050/211] Prep runtimeconfig-0.25.0 release. (#3545)

---
 runtimeconfig/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtimeconfig/setup.py b/runtimeconfig/setup.py
index ac54e459d8bdb..f1fffdcfe3acc 100644
--- a/runtimeconfig/setup.py
+++ b/runtimeconfig/setup.py
@@ -51,12 +51,12 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.0, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
 ]
 
 setup(
     name='google-cloud-runtimeconfig',
-    version='0.24.0',
+    version='0.25.0',
     description='Python Client for Google Cloud RuntimeConfig',
     long_description=README,
     namespace_packages=[

From e70423bec7b9624e18c59bded9456e232794308f Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 18:52:53 -0400
Subject: [PATCH 051/211] Prep speech-0.26.0 release. (#3546)

---
 speech/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/speech/setup.py b/speech/setup.py
index dda61babdf6a3..661d6035d489b 100644
--- a/speech/setup.py
+++ b/speech/setup.py
@@ -50,14 +50,14 @@
 }
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.0, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
     'grpcio >= 1.0.2, < 2.0dev',
     'gapic-google-cloud-speech-v1 >= 0.15.3, < 0.16dev',
 ]
 
 setup(
     name='google-cloud-speech',
-    version='0.25.1',
+    version='0.26.0',
     description='Python Client for Google Cloud Speech',
     long_description=README,
     namespace_packages=[

From 04ff662354d07d3cdf6d20d1e8bc31ae572c8167 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 18:54:17 -0400
Subject: [PATCH 052/211] Prep translate-0.25.0 release. (#3547)

---
 translate/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/translate/setup.py b/translate/setup.py
index 38bf65477c353..6a3c047531f37 100644
--- a/translate/setup.py
+++ b/translate/setup.py
@@ -51,12 +51,12 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.0, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
 ]
 
 setup(
     name='google-cloud-translate',
-    version='0.24.0',
+    version='0.25.0',
     description='Python Client for Google Cloud Translation API',
     long_description=README,
     namespace_packages=[

From 9238a26dc36b516ba9d5598504ed0fa5655ec94e Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 19:13:45 -0400
Subject: [PATCH 053/211] Prep error-reporting-0.25.0 release. (#3542)

---
 error_reporting/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/error_reporting/setup.py b/error_reporting/setup.py
index 2cf6ef8a9cacb..a4060c9fd33e0 100644
--- a/error_reporting/setup.py
+++ b/error_reporting/setup.py
@@ -51,14 +51,14 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.1, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
     'google-cloud-logging >= 1.0.0, < 2.0dev',
     'gapic-google-cloud-error-reporting-v1beta1 >= 0.15.0, < 0.16dev'
 ]
 
 setup(
     name='google-cloud-error-reporting',
-    version='0.24.2',
+    version='0.25.0',
     description='Python Client for Stackdriver Error Reporting',
     long_description=README,
     namespace_packages=[

From f0bf9df3dc53cb73a8564a11bde146414355ff53 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 19:16:41 -0400
Subject: [PATCH 054/211] Prep vision-0.25.0 release. (#3537)

Note that the version number was bumped prematurely in PR 72e6e522.
---
 vision/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vision/setup.py b/vision/setup.py
index 6860e23fbaec3..7cc30276fe584 100644
--- a/vision/setup.py
+++ b/vision/setup.py
@@ -25,7 +25,7 @@
     readme = readme_file.read()
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.0, < 0.25dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
     'google-gax >= 0.15.7, < 0.16dev',
     'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',
 ]

From 214aba604fbcaa9e4936fa1798efde050389992a Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Jun 2017 19:17:39 -0400
Subject: [PATCH 055/211] Prep umbrella 0.26.0 release. (#3549)

---
 setup.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/setup.py b/setup.py
index 9570fbb5ef4ee..eeedb6d865063 100644
--- a/setup.py
+++ b/setup.py
@@ -50,29 +50,29 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-bigquery >= 0.24.0, < 0.25dev',
-    'google-cloud-bigtable >= 0.24.0, < 0.25dev',
-    'google-cloud-core >= 0.24.1, < 0.25dev',
-    'google-cloud-datastore >= 1.0.0, < 2.0dev',
-    'google-cloud-dns >= 0.24.0, < 0.25dev',
-    'google-cloud-error-reporting >= 0.24.2, < 0.25dev',
-    'google-cloud-language >= 0.24.0, < 0.25dev',
-    'google-cloud-logging >= 1.0.0, < 2.0dev',
-    'google-cloud-monitoring >= 0.24.0, < 0.25dev',
-    'google-cloud-pubsub >= 0.25.0, < 0.26dev',
-    'google-cloud-resource-manager >= 0.24.0, < 0.25dev',
-    'google-cloud-spanner >= 0.24.1, < 0.25dev',
-    'google-cloud-speech >= 0.25.0, < 0.26dev',
-    'google-cloud-storage >= 1.1.0, < 2.0dev',
-    'google-cloud-translate >= 0.24.0, < 0.25dev',
+    'google-cloud-bigquery >= 0.25.0, < 0.26dev',
+    'google-cloud-bigtable >= 0.25.0, < 0.26dev',
+    'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-cloud-datastore >= 1.1.0, < 2.0dev',
+    'google-cloud-dns >= 0.25.0, < 0.26dev',
+    'google-cloud-error-reporting >= 0.25.0, < 0.26dev',
+    'google-cloud-language >= 0.25.0, < 0.26dev',
+    'google-cloud-logging >= 1.1.0, < 2.0dev',
+    'google-cloud-monitoring >= 0.25.0, < 0.26dev',
+    'google-cloud-pubsub >= 0.26.0, < 0.27dev',
+    'google-cloud-resource-manager >= 0.25.0, < 0.26dev',
+    'google-cloud-runtimeconfig >= 0.25.0, < 0.26dev',
+    'google-cloud-spanner >= 0.25.0, < 0.26dev',
+    'google-cloud-speech >= 0.26.0, < 0.27dev',
+    'google-cloud-storage >= 1.2.0, < 2.0dev',
+    'google-cloud-translate >= 0.25.0, < 0.26dev',
     'google-cloud-videointelligence >= 0.25.0, < 0.26dev',
     'google-cloud-vision >= 0.25.0, < 0.26dev',
-    'google-cloud-runtimeconfig >= 0.24.0, < 0.25dev',
 ]
 
 setup(
     name='google-cloud',
-    version='0.25.0',
+    version='0.26.0',
     description='API Client library for Google Cloud',
     long_description=README,
     install_requires=REQUIREMENTS,

From 14251d9ce3e4b62c57cd65a69dbf793301fb274b Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Tue, 27 Jun 2017 10:30:57 -0700
Subject: [PATCH 056/211] BQ: cleanup flake8 errors in tests (#3551)

(google-cloud-python-2)
    $ flake8 tests
    tests/system.py:178:32: F812 list comprehension redefines 'dataset' from line 170
    tests/system.py:233:30: F812 list comprehension redefines 'table' from line 225
    tests/system.py:841:9: F841 local variable 'dataset' is assigned to but never used
    tests/unit/test_table.py:406:23: W291 trailing whitespace
    tests/unit/test_table.py:1052:9: F841 local variable 'ROWS' is assigned to but never used
---
 bigquery/nox.py                   |  1 +
 bigquery/tests/system.py          | 13 ++++++-------
 bigquery/tests/unit/test_table.py |  8 +-------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/bigquery/nox.py b/bigquery/nox.py
index a08e9fb307c28..a0211fba9b3d3 100644
--- a/bigquery/nox.py
+++ b/bigquery/nox.py
@@ -75,6 +75,7 @@ def lint(session):
     session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/bigquery')
+    session.run('flake8', 'tests')
     session.run(
         'gcp-devrel-py-tools', 'run-pylint',
         '--config', 'pylint.config.py',
diff --git a/bigquery/tests/system.py b/bigquery/tests/system.py
index 456953194a530..cfd2c4856c80b 100644
--- a/bigquery/tests/system.py
+++ b/bigquery/tests/system.py
@@ -167,9 +167,9 @@ def test_list_datasets(self):
             'newest' + unique_resource_id(),
         ]
         for dataset_name in datasets_to_create:
-            dataset = Config.CLIENT.dataset(dataset_name)
-            retry_403(dataset.create)()
-            self.to_delete.append(dataset)
+            created_dataset = Config.CLIENT.dataset(dataset_name)
+            retry_403(created_dataset.create)()
+            self.to_delete.append(created_dataset)
 
         # Retrieve the datasets.
         iterator = Config.CLIENT.list_datasets()
@@ -222,9 +222,9 @@ def test_list_tables(self):
                                          mode='REQUIRED')
         age = bigquery.SchemaField('age', 'INTEGER', mode='REQUIRED')
         for table_name in tables_to_create:
-            table = dataset.table(table_name, schema=[full_name, age])
-            table.create()
-            self.to_delete.insert(0, table)
+            created_table = dataset.table(table_name, schema=[full_name, age])
+            created_table.create()
+            self.to_delete.insert(0, created_table)
 
         # Retrieve the tables.
         iterator = dataset.list_tables()
@@ -838,7 +838,6 @@ def test_large_query_w_public_data(self):
         SQL = 'SELECT * from `{}.{}.{}` LIMIT {}'.format(
             PUBLIC, DATASET_NAME, TABLE_NAME, LIMIT)
 
-        dataset = Config.CLIENT.dataset(DATASET_NAME, project=PUBLIC)
         query = Config.CLIENT.run_sync_query(SQL)
         query.use_legacy_sql = False
         query.run()
diff --git a/bigquery/tests/unit/test_table.py b/bigquery/tests/unit/test_table.py
index c940706c6b860..5a3c70112564b 100644
--- a/bigquery/tests/unit/test_table.py
+++ b/bigquery/tests/unit/test_table.py
@@ -403,7 +403,7 @@ def test_create_new_day_partitioned_table(self):
         dataset = _Dataset(client)
         table = self._make_one(self.TABLE_NAME, dataset)
         table.partitioning_type = 'DAY'
-        table.create()            
+        table.create()
 
         self.assertEqual(len(conn._requested), 1)
         req = conn._requested[0]
@@ -1049,12 +1049,6 @@ def test_fetch_data_wo_schema(self):
         client = _Client(project=self.PROJECT)
         dataset = _Dataset(client)
         table = self._make_one(self.TABLE_NAME, dataset=dataset)
-        ROWS = [
-            ('Phred Phlyntstone', 32),
-            ('Bharney Rhubble', 33),
-            ('Wylma Phlyntstone', 29),
-            ('Bhettye Rhubble', 27),
-        ]
 
         with self.assertRaises(ValueError) as exc:
             table.fetch_data()

From 6ab3e0127a1edf8b1f9f1603f3c1342473563ea7 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Tue, 27 Jun 2017 10:32:30 -0700
Subject: [PATCH 057/211] Fix inclusion of tests in manifest.in (#3552)

---
 bigquery/MANIFEST.in          | 2 +-
 bigtable/MANIFEST.in          | 2 +-
 core/MANIFEST.in              | 2 +-
 datastore/MANIFEST.in         | 2 +-
 dns/MANIFEST.in               | 2 +-
 error_reporting/MANIFEST.in   | 2 +-
 language/MANIFEST.in          | 2 +-
 logging/MANIFEST.in           | 2 +-
 monitoring/MANIFEST.in        | 2 +-
 pubsub/MANIFEST.in            | 2 +-
 resource_manager/MANIFEST.in  | 2 +-
 runtimeconfig/MANIFEST.in     | 2 +-
 spanner/MANIFEST.in           | 2 +-
 speech/MANIFEST.in            | 2 +-
 storage/MANIFEST.in           | 2 +-
 translate/MANIFEST.in         | 2 +-
 videointelligence/MANIFEST.in | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/bigquery/MANIFEST.in b/bigquery/MANIFEST.in
index 24aa72fb370b0..1fbc0d0b321e8 100644
--- a/bigquery/MANIFEST.in
+++ b/bigquery/MANIFEST.in
@@ -1,3 +1,3 @@
 include README.rst LICENSE
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/bigtable/MANIFEST.in b/bigtable/MANIFEST.in
index 9f7100c9528a7..fc77f8c82ff0a 100644
--- a/bigtable/MANIFEST.in
+++ b/bigtable/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/core/MANIFEST.in b/core/MANIFEST.in
index 24aa72fb370b0..1fbc0d0b321e8 100644
--- a/core/MANIFEST.in
+++ b/core/MANIFEST.in
@@ -1,3 +1,3 @@
 include README.rst LICENSE
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/datastore/MANIFEST.in b/datastore/MANIFEST.in
index 9f7100c9528a7..fc77f8c82ff0a 100644
--- a/datastore/MANIFEST.in
+++ b/datastore/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/dns/MANIFEST.in b/dns/MANIFEST.in
index 9f7100c9528a7..fc77f8c82ff0a 100644
--- a/dns/MANIFEST.in
+++ b/dns/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/error_reporting/MANIFEST.in b/error_reporting/MANIFEST.in
index 9f7100c9528a7..fc77f8c82ff0a 100644
--- a/error_reporting/MANIFEST.in
+++ b/error_reporting/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/language/MANIFEST.in b/language/MANIFEST.in
index 9f7100c9528a7..fc77f8c82ff0a 100644
--- a/language/MANIFEST.in
+++ b/language/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/logging/MANIFEST.in b/logging/MANIFEST.in
index 9f7100c9528a7..fc77f8c82ff0a 100644
--- a/logging/MANIFEST.in
+++ b/logging/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/monitoring/MANIFEST.in b/monitoring/MANIFEST.in
index 9f7100c9528a7..fc77f8c82ff0a 100644
--- a/monitoring/MANIFEST.in
+++ b/monitoring/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/pubsub/MANIFEST.in b/pubsub/MANIFEST.in
index 9f7100c9528a7..fc77f8c82ff0a 100644
--- a/pubsub/MANIFEST.in
+++ b/pubsub/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/resource_manager/MANIFEST.in b/resource_manager/MANIFEST.in
index 9f7100c9528a7..fc77f8c82ff0a 100644
--- a/resource_manager/MANIFEST.in
+++ b/resource_manager/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/runtimeconfig/MANIFEST.in b/runtimeconfig/MANIFEST.in
index 9f7100c9528a7..fc77f8c82ff0a 100644
--- a/runtimeconfig/MANIFEST.in
+++ b/runtimeconfig/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/spanner/MANIFEST.in b/spanner/MANIFEST.in
index 9f7100c9528a7..fc77f8c82ff0a 100644
--- a/spanner/MANIFEST.in
+++ b/spanner/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/speech/MANIFEST.in b/speech/MANIFEST.in
index 9f7100c9528a7..fc77f8c82ff0a 100644
--- a/speech/MANIFEST.in
+++ b/speech/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/storage/MANIFEST.in b/storage/MANIFEST.in
index 9f7100c9528a7..fc77f8c82ff0a 100644
--- a/storage/MANIFEST.in
+++ b/storage/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/translate/MANIFEST.in b/translate/MANIFEST.in
index 9f7100c9528a7..fc77f8c82ff0a 100644
--- a/translate/MANIFEST.in
+++ b/translate/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__
diff --git a/videointelligence/MANIFEST.in b/videointelligence/MANIFEST.in
index 8f5e2b1a8b1be..4e71ce57bacf7 100644
--- a/videointelligence/MANIFEST.in
+++ b/videointelligence/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst LICENSE requirements.txt
 recursive-include google *.json *.proto
-recursive-include unit_tests *
+recursive-include tests *
 global-exclude *.pyc __pycache__

From 8ab1afec399b51a1114b7dc223cd2b4e386a3314 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Tue, 27 Jun 2017 12:19:53 -0700
Subject: [PATCH 058/211] Add the ability to specify AnnotateImageRequest items
 in single-feature methods. (#3554)

---
 vision/google/cloud/vision/decorators.py | 13 ++++++++-----
 vision/tests/unit/test_decorators.py     |  8 +++++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/vision/google/cloud/vision/decorators.py b/vision/google/cloud/vision/decorators.py
index a29e8162afbb9..3f44664de231f 100644
--- a/vision/google/cloud/vision/decorators.py
+++ b/vision/google/cloud/vision/decorators.py
@@ -85,6 +85,8 @@ def _create_single_feature_method(feature, enum):
         image (:class:`~.{module}.types.Image`): The image to analyze.
         options (:class:`google.gax.CallOptions`): Overrides the
             default settings for this call, e.g, timeout, retries, etc.
+        kwargs (dict): Additional properties to be set on the
+            :class:`~.{module}.types.AnnotateImageRequest`.
 
     Returns:
         :class:`~.{module}.types.AnnotateImageResponse`: The API response.
@@ -94,16 +96,17 @@ def _create_single_feature_method(feature, enum):
     feature_value = {'type': enum.__dict__[feature]}
 
     # Define the function to be returned.
-    def inner(self, image, options=None):
+    def inner(self, image, options=None, **kwargs):
         """Return a single feature annotation for the given image.
 
         Intended for use with functools.partial, to create the particular
         single-feature methods.
         """
-        request = {
-            'image': image,
-            'features': [feature_value],
-        }
+        request = dict(
+            image=image,
+            features=[feature_value],
+            **kwargs
+        )
         return self.annotate_image(request, options=options)
 
     # Set the appropriate function metadata.
diff --git a/vision/tests/unit/test_decorators.py b/vision/tests/unit/test_decorators.py
index 8ef86b71ec612..f0841e8ecd210 100644
--- a/vision/tests/unit/test_decorators.py
+++ b/vision/tests/unit/test_decorators.py
@@ -55,15 +55,21 @@ class SingleFeatureMethodTests(unittest.TestCase):
     def test_runs_generic_single_image(self, ai):
         ai.return_value = vision.types.AnnotateImageResponse()
 
+        # Prove that other aspects of the AnnotateImageRequest, such as the
+        # image context, will be preserved.
+        SENTINEL = object()
+
         # Make a face detection request.
         client = vision.ImageAnnotatorClient(
             credentials=mock.Mock(spec=Credentials),
         )
         image = {'source': {'image_uri': 'gs://my-test-bucket/image.jpg'}}
-        response = client.face_detection(image)
+        response = client.face_detection(image, image_context=SENTINEL)
+        assert isinstance(response, vision.types.AnnotateImageResponse)
 
         # Assert that the single-image method was called as expected.
         ai.assert_called_once_with({
             'features': [{'type': vision.enums.Feature.Type.FACE_DETECTION}],
             'image': image,
+            'image_context': SENTINEL,
         }, options=None)

From eb033665252c3e0d6e2010cdf2b65c15babdfb88 Mon Sep 17 00:00:00 2001
From: Michael Englo <michaelenglo10@yahoo.co.id>
Date: Wed, 28 Jun 2017 10:49:14 -0700
Subject: [PATCH 059/211] Strip base64 padding characters from urlsafe in
 Datastore's (to|from)_legacy_urlsafe (#3560)

Also

* add padding characters in `from_legacy_urlsafe` if needed
* add an extra example in the unit tests that actually requires base64 padding
---
 datastore/google/cloud/datastore/key.py |  7 ++--
 datastore/tests/unit/test_key.py        | 47 ++++++++++++++++++-------
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/datastore/google/cloud/datastore/key.py b/datastore/google/cloud/datastore/key.py
index 166a5afde46b9..f1733f8f5d8e3 100644
--- a/datastore/google/cloud/datastore/key.py
+++ b/datastore/google/cloud/datastore/key.py
@@ -304,7 +304,8 @@ def to_legacy_urlsafe(self):
         This is intended to work with the "legacy" representation of a
         datastore "Key" used within Google App Engine (a so-called
         "Reference"). The returned string can be used as the ``urlsafe``
-        argument to ``ndb.Key(urlsafe=...)``.
+        argument to ``ndb.Key(urlsafe=...)``. The base64 encoded values
+        will have padding removed.
 
         :rtype: bytes
         :returns: A bytestring containing the key encoded as URL-safe base64.
@@ -315,7 +316,7 @@ def to_legacy_urlsafe(self):
             name_space=self.namespace,
         )
         raw_bytes = reference.SerializeToString()
-        return base64.urlsafe_b64encode(raw_bytes)
+        return base64.urlsafe_b64encode(raw_bytes).strip(b'=')
 
     @classmethod
     def from_legacy_urlsafe(cls, urlsafe):
@@ -334,6 +335,8 @@ def from_legacy_urlsafe(cls, urlsafe):
         :returns: The key corresponding to ``urlsafe``.
         """
         urlsafe = _to_bytes(urlsafe, encoding='ascii')
+        padding = b'=' * (-len(urlsafe) % 4)
+        urlsafe += padding
         raw_bytes = base64.urlsafe_b64decode(urlsafe)
 
         reference = _app_engine_key_pb2.Reference()
diff --git a/datastore/tests/unit/test_key.py b/datastore/tests/unit/test_key.py
index 5b89e146254d8..4fb7b89911b29 100644
--- a/datastore/tests/unit/test_key.py
+++ b/datastore/tests/unit/test_key.py
@@ -26,12 +26,15 @@ class TestKey(unittest.TestCase):
     #               'Parent', 59, 'Child', 'Feather',
     #               namespace='space', app='s~sample-app')
     #           urlsafe = key.urlsafe()
-    _URLSAFE_EXAMPLE = (
+    _URLSAFE_EXAMPLE1 = (
         b'agxzfnNhbXBsZS1hcHByHgsSBlBhcmVudBg7DAsSBUNoaWxkIgdGZ'
         b'WF0aGVyDKIBBXNwYWNl')
-    _URLSAFE_APP = 's~sample-app'
-    _URLSAFE_NAMESPACE = 'space'
-    _URLSAFE_FLAT_PATH = ('Parent', 59, 'Child', 'Feather')
+    _URLSAFE_APP1 = 's~sample-app'
+    _URLSAFE_NAMESPACE1 = 'space'
+    _URLSAFE_FLAT_PATH1 = ('Parent', 59, 'Child', 'Feather')
+    _URLSAFE_EXAMPLE2 = b'agZzfmZpcmVyDwsSBEtpbmQiBVRoaW5nDA'
+    _URLSAFE_APP2 = 's~fire'
+    _URLSAFE_FLAT_PATH2 = ('Kind', 'Thing')
 
     @staticmethod
     def _get_target_class():
@@ -388,25 +391,45 @@ def test_to_protobuf_w_no_kind(self):
 
     def test_to_legacy_urlsafe(self):
         key = self._make_one(
-            *self._URLSAFE_FLAT_PATH,
-            project=self._URLSAFE_APP,
-            namespace=self._URLSAFE_NAMESPACE)
+            *self._URLSAFE_FLAT_PATH1,
+            project=self._URLSAFE_APP1,
+            namespace=self._URLSAFE_NAMESPACE1)
         # NOTE: ``key.project`` is somewhat "invalid" but that is OK.
         urlsafe = key.to_legacy_urlsafe()
-        self.assertEqual(urlsafe, self._URLSAFE_EXAMPLE)
+        self.assertEqual(urlsafe, self._URLSAFE_EXAMPLE1)
+
+    def test_to_legacy_urlsafe_strip_padding(self):
+        key = self._make_one(
+            *self._URLSAFE_FLAT_PATH2,
+            project=self._URLSAFE_APP2)
+        # NOTE: ``key.project`` is somewhat "invalid" but that is OK.
+        urlsafe = key.to_legacy_urlsafe()
+        self.assertEqual(urlsafe, self._URLSAFE_EXAMPLE2)
+        # Make sure it started with base64 padding.
+        self.assertNotEqual(len(self._URLSAFE_EXAMPLE2) % 4, 0)
 
     def test_from_legacy_urlsafe(self):
         klass = self._get_target_class()
-        key = klass.from_legacy_urlsafe(self._URLSAFE_EXAMPLE)
+        key = klass.from_legacy_urlsafe(self._URLSAFE_EXAMPLE1)
 
-        self.assertEqual('s~' + key.project, self._URLSAFE_APP)
-        self.assertEqual(key.namespace, self._URLSAFE_NAMESPACE)
-        self.assertEqual(key.flat_path, self._URLSAFE_FLAT_PATH)
+        self.assertEqual('s~' + key.project, self._URLSAFE_APP1)
+        self.assertEqual(key.namespace, self._URLSAFE_NAMESPACE1)
+        self.assertEqual(key.flat_path, self._URLSAFE_FLAT_PATH1)
         # Also make sure we didn't accidentally set the parent.
         self.assertIsNone(key._parent)
         self.assertIsNotNone(key.parent)
         self.assertIs(key._parent, key.parent)
 
+    def test_from_legacy_urlsafe_needs_padding(self):
+        klass = self._get_target_class()
+        # Make sure it will have base64 padding added.
+        self.assertNotEqual(len(self._URLSAFE_EXAMPLE2) % 4, 0)
+        key = klass.from_legacy_urlsafe(self._URLSAFE_EXAMPLE2)
+
+        self.assertEqual('s~' + key.project, self._URLSAFE_APP2)
+        self.assertIsNone(key.namespace)
+        self.assertEqual(key.flat_path, self._URLSAFE_FLAT_PATH2)
+
     def test_is_partial_no_name_or_id(self):
         key = self._make_one('KIND', project=self._DEFAULT_PROJECT)
         self.assertTrue(key.is_partial)

From 39feb3e23d451963ca31b383d8b395afcf7ab817 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Wed, 28 Jun 2017 14:07:25 -0700
Subject: [PATCH 060/211] Making all LICENSE headers "uniform". (#3563)

---
 bigquery/pylint.config.py                                       | 2 +-
 bigtable/pylint.config.py                                       | 2 +-
 core/pylint.config.py                                           | 2 +-
 datastore/pylint.config.py                                      | 2 +-
 dns/pylint.config.py                                            | 2 +-
 error_reporting/pylint.config.py                                | 2 +-
 language/pylint.config.py                                       | 2 +-
 logging/pylint.config.py                                        | 2 +-
 monitoring/pylint.config.py                                     | 2 +-
 pubsub/pylint.config.py                                         | 2 +-
 resource_manager/pylint.config.py                               | 2 +-
 runtimeconfig/pylint.config.py                                  | 2 +-
 spanner/pylint.config.py                                        | 2 +-
 speech/pylint.config.py                                         | 2 +-
 storage/pylint.config.py                                        | 2 +-
 translate/pylint.config.py                                      | 2 +-
 .../google/cloud/gapic/videointelligence/v1beta1/enums.py       | 2 +-
 videointelligence/pylint.config.py                              | 2 +-
 vision/google/cloud/gapic/vision/v1/enums.py                    | 2 +-
 vision/pylint.config.py                                         | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/bigquery/pylint.config.py b/bigquery/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/bigquery/pylint.config.py
+++ b/bigquery/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigtable/pylint.config.py b/bigtable/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/bigtable/pylint.config.py
+++ b/bigtable/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/core/pylint.config.py b/core/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/core/pylint.config.py
+++ b/core/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/datastore/pylint.config.py b/datastore/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/datastore/pylint.config.py
+++ b/datastore/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/dns/pylint.config.py b/dns/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/dns/pylint.config.py
+++ b/dns/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/error_reporting/pylint.config.py b/error_reporting/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/error_reporting/pylint.config.py
+++ b/error_reporting/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/pylint.config.py b/language/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/language/pylint.config.py
+++ b/language/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/pylint.config.py b/logging/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/logging/pylint.config.py
+++ b/logging/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/monitoring/pylint.config.py b/monitoring/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/monitoring/pylint.config.py
+++ b/monitoring/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/pylint.config.py b/pubsub/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/pubsub/pylint.config.py
+++ b/pubsub/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/resource_manager/pylint.config.py b/resource_manager/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/resource_manager/pylint.config.py
+++ b/resource_manager/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/runtimeconfig/pylint.config.py b/runtimeconfig/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/runtimeconfig/pylint.config.py
+++ b/runtimeconfig/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/spanner/pylint.config.py b/spanner/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/spanner/pylint.config.py
+++ b/spanner/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/speech/pylint.config.py b/speech/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/speech/pylint.config.py
+++ b/speech/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/pylint.config.py b/storage/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/storage/pylint.config.py
+++ b/storage/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/translate/pylint.config.py b/translate/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/translate/pylint.config.py
+++ b/translate/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/videointelligence/google/cloud/gapic/videointelligence/v1beta1/enums.py b/videointelligence/google/cloud/gapic/videointelligence/v1beta1/enums.py
index 13b9bd25f0b26..b0781914a3ded 100644
--- a/videointelligence/google/cloud/gapic/videointelligence/v1beta1/enums.py
+++ b/videointelligence/google/cloud/gapic/videointelligence/v1beta1/enums.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/videointelligence/pylint.config.py b/videointelligence/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/videointelligence/pylint.config.py
+++ b/videointelligence/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/vision/google/cloud/gapic/vision/v1/enums.py b/vision/google/cloud/gapic/vision/v1/enums.py
index 80eea7a1729ed..1951f8c57df14 100644
--- a/vision/google/cloud/gapic/vision/v1/enums.py
+++ b/vision/google/cloud/gapic/vision/v1/enums.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/vision/pylint.config.py b/vision/pylint.config.py
index d8ca7b92e85ee..b618319b8b61e 100644
--- a/vision/pylint.config.py
+++ b/vision/pylint.config.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

From 9068466cc41a94a6edfe299efe626df8c14508c6 Mon Sep 17 00:00:00 2001
From: "Ryszard T. Kaleta" <ryszardkaleta@gmail.com>
Date: Thu, 29 Jun 2017 15:13:15 +0100
Subject: [PATCH 061/211] Fixes spelling typos (#3566)

---
 docs/vision/index.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/vision/index.rst b/docs/vision/index.rst
index 49f90d502d46c..b6d6f17aa2d6e 100644
--- a/docs/vision/index.rst
+++ b/docs/vision/index.rst
@@ -91,7 +91,7 @@ for it using our direct methods:
     ... })
     >>> len(response.annotations)
     1
-    >>> for face in resposne.annotations[0].faces:
+    >>> for face in response.annotations[0].faces:
     ...     print(face.joy)
     Likelihood.VERY_LIKELY
     Likelihood.VERY_LIKELY
@@ -103,7 +103,7 @@ No results found
 ****************
 
 If no results for the detection performed can be extracted from the image, then
-an empty list is returned. This behavior is similiar with all detection types.
+an empty list is returned. This behavior is similar with all detection types.
 
 
 Example with :meth:`~google.cloud.vision.ImageAnnotatorClient.logo_detection`:

From 3588f51503d142ecdad7ae2d895832da7d24de42 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Thu, 29 Jun 2017 10:27:27 -0700
Subject: [PATCH 062/211] Removing google-cloud-core dependency in test_utils
 package. (#3550)

---
 test_utils/setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test_utils/setup.py b/test_utils/setup.py
index b913d6e0f1dd7..56e3473e7d6c5 100644
--- a/test_utils/setup.py
+++ b/test_utils/setup.py
@@ -49,7 +49,6 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.24.0, < 0.25dev',
     'google-auth >= 0.4.0',
     'six',
 ]

From b9cb6d17236528ddce982c3e802af3221de80880 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Thu, 29 Jun 2017 10:56:09 -0700
Subject: [PATCH 063/211] Skipping system tests when credentials env. var is
 unset. (#3475)

---
 .circleci/config.yml      | 2 +-
 appveyor/requirements.txt | 2 +-
 bigquery/nox.py           | 2 +-
 bigtable/nox.py           | 2 +-
 datastore/nox.py          | 4 ++--
 error_reporting/nox.py    | 2 +-
 language/nox.py           | 2 +-
 logging/nox.py            | 2 +-
 monitoring/nox.py         | 2 +-
 pubsub/nox.py             | 2 +-
 spanner/nox.py            | 2 +-
 speech/nox.py             | 2 +-
 storage/nox.py            | 2 +-
 translate/nox.py          | 2 +-
 vision/nox.py             | 4 ++--
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 01242a41d15b8..7e481f97d1dcc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: googleapis/nox:0.11.2
+      - image: googleapis/nox:0.17.0
     steps:
       - checkout
       - run:
diff --git a/appveyor/requirements.txt b/appveyor/requirements.txt
index 24cc58840e728..45a4e4c256274 100644
--- a/appveyor/requirements.txt
+++ b/appveyor/requirements.txt
@@ -3,4 +3,4 @@
 # pip will build them from source using the MSVC compiler matching the
 # target Python version and architecture
 wheel
-nox-automation==0.11.2
+nox-automation>=0.17.0
diff --git a/bigquery/nox.py b/bigquery/nox.py
index a0211fba9b3d3..9851f53d188df 100644
--- a/bigquery/nox.py
+++ b/bigquery/nox.py
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
 
     # Sanity check: Only run system tests if the environment variable is set.
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
-        return
+        session.skip('Credentials must be set via environment variable.')
 
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
diff --git a/bigtable/nox.py b/bigtable/nox.py
index 611de0bc93386..40d997acc88b1 100644
--- a/bigtable/nox.py
+++ b/bigtable/nox.py
@@ -48,7 +48,7 @@ def system_tests(session, python_version):
 
     # Sanity check: Only run system tests if the environment variable is set.
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
-        return
+        session.skip('Credentials must be set via environment variable.')
 
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
diff --git a/datastore/nox.py b/datastore/nox.py
index 5171bf0bb0120..983152e7db922 100644
--- a/datastore/nox.py
+++ b/datastore/nox.py
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
 
     # Sanity check: Only run system tests if the environment variable is set.
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
-        return
+        session.skip('Credentials must be set via environment variable.')
 
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
@@ -70,7 +70,7 @@ def doctests(session):
 
     # Sanity check: Only run system tests if the environment variable is set.
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
-        return
+        session.skip('Credentials must be set via environment variable.')
 
     # Doctests run against Python 3.6 only.
     # It is difficult to make doctests run against both Python 2 and Python 3
diff --git a/error_reporting/nox.py b/error_reporting/nox.py
index db245cfd74e85..08edc6987ab92 100644
--- a/error_reporting/nox.py
+++ b/error_reporting/nox.py
@@ -78,7 +78,7 @@ def system_tests(session, python_version):
 
     # Sanity check: Only run system tests if the environment variable is set.
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
-        return
+        session.skip('Credentials must be set via environment variable.')
 
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
diff --git a/language/nox.py b/language/nox.py
index 569bcb925fac2..485ee930d7fb2 100644
--- a/language/nox.py
+++ b/language/nox.py
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
 
     # Sanity check: Only run system tests if the environment variable is set.
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
-        return
+        session.skip('Credentials must be set via environment variable.')
 
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
diff --git a/logging/nox.py b/logging/nox.py
index 9a9eb10ef3d3a..1d9d5f184e435 100644
--- a/logging/nox.py
+++ b/logging/nox.py
@@ -52,7 +52,7 @@ def system_tests(session, python_version):
 
     # Sanity check: Only run system tests if the environment variable is set.
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
-        return
+        session.skip('Credentials must be set via environment variable.')
 
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
diff --git a/monitoring/nox.py b/monitoring/nox.py
index b4271686aa5af..dcde9c484b0ab 100644
--- a/monitoring/nox.py
+++ b/monitoring/nox.py
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
 
     # Sanity check: Only run system tests if the environment variable is set.
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
-        return
+        session.skip('Credentials must be set via environment variable.')
 
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
diff --git a/pubsub/nox.py b/pubsub/nox.py
index acd70b44ce0bc..dd7b093305242 100644
--- a/pubsub/nox.py
+++ b/pubsub/nox.py
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
 
     # Sanity check: Only run system tests if the environment variable is set.
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
-        return
+        session.skip('Credentials must be set via environment variable.')
 
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
diff --git a/spanner/nox.py b/spanner/nox.py
index 5c81a7d4c6717..7332af05f0e9c 100644
--- a/spanner/nox.py
+++ b/spanner/nox.py
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
 
     # Sanity check: Only run system tests if the environment variable is set.
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
-        return
+        session.skip('Credentials must be set via environment variable.')
 
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
diff --git a/speech/nox.py b/speech/nox.py
index 57c0cc4f7e069..bcacf2d59cd63 100644
--- a/speech/nox.py
+++ b/speech/nox.py
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
 
     # Sanity check: Only run system tests if the environment variable is set.
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
-        return
+        session.skip('Credentials must be set via environment variable.')
 
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
diff --git a/storage/nox.py b/storage/nox.py
index 171050be8be1d..f50de86bfdfaa 100644
--- a/storage/nox.py
+++ b/storage/nox.py
@@ -50,7 +50,7 @@ def system_tests(session, python_version):
 
     # Sanity check: Only run system tests if the environment variable is set.
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
-        return
+        session.skip('Credentials must be set via environment variable.')
 
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
diff --git a/translate/nox.py b/translate/nox.py
index f59a2825ed9b0..3d006f1f0e27f 100644
--- a/translate/nox.py
+++ b/translate/nox.py
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
 
     # Sanity check: Only run system tests if the environment variable is set.
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
-        return
+        session.skip('Credentials must be set via environment variable.')
 
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
diff --git a/vision/nox.py b/vision/nox.py
index d5d3f3412ef75..8761fa6fccd6f 100644
--- a/vision/nox.py
+++ b/vision/nox.py
@@ -46,7 +46,7 @@ def system_tests(session, python_version):
 
     # Sanity check: Only run system tests if the environment variable is set.
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
-        return
+        session.skip('Credentials must be set via environment variable.')
 
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
@@ -67,7 +67,7 @@ def system_tests_manual_layer(session, python_version):
 
     # Sanity check: Only run system tests if the environment variable is set.
     if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
-        return
+        session.skip('Credentials must be set via environment variable.')
 
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)

From b22b02c3a4f639927bd5dbc14c4f7b91ee995f6a Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Thu, 29 Jun 2017 10:56:18 -0700
Subject: [PATCH 064/211] Remove `apt-get install openssl` from CircleCI
 config. (#3567)

Now `openssl` is included in the Docker image.
---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7e481f97d1dcc..2352d187edc1f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,6 @@ jobs:
           name: Decrypt credentials
           command: |
             if [ -n "$GOOGLE_APPLICATION_CREDENTIALS" ]; then
-              apt-get update && apt-get install -y openssl
               openssl aes-256-cbc -d -a -k "$GOOGLE_CREDENTIALS_PASSPHRASE" \
                   -in /var/code/gcp/test_utils/credentials.json.enc \
                   -out "$GOOGLE_APPLICATION_CREDENTIALS"

From 2d81f88454724f0a672b453c994413c3cf1110c7 Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Thu, 29 Jun 2017 14:07:19 -0700
Subject: [PATCH 065/211] DOC: developers.google.com -> cloud.google.com
 (#3569)

---
 docs/index.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 3402e3e629fef..623af475c5688 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -37,7 +37,7 @@ Cloud Datastore
 
 `Google Cloud Datastore`_ is a fully managed, schemaless database for storing non-relational data.
 
-.. _Google Cloud Datastore: https://developers.google.com/datastore/
+.. _Google Cloud Datastore: https://cloud.google.com/datastore/
 
 .. code-block:: python
 
@@ -56,7 +56,7 @@ Cloud Storage
 
 `Google Cloud Storage`_ allows you to store data on Google infrastructure.
 
-.. _Google Cloud Storage: https://developers.google.com/storage/
+.. _Google Cloud Storage: https://cloud.google.com/storage/
 
 .. code-block:: python
 

From 2a4511ca8a9a4b0569c583a7c4ca6ba0aaf06545 Mon Sep 17 00:00:00 2001
From: Pascal <pascal@fsiegel.de>
Date: Fri, 30 Jun 2017 21:21:42 +0200
Subject: [PATCH 066/211] Correct API spelling: 'speechContext' ->
 'speechContexts'. (#3570)

---
 speech/google/cloud/speech/_http.py | 2 +-
 speech/tests/unit/test_client.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/speech/google/cloud/speech/_http.py b/speech/google/cloud/speech/_http.py
index 61990a5a9ff66..1e0cc3b298ede 100644
--- a/speech/google/cloud/speech/_http.py
+++ b/speech/google/cloud/speech/_http.py
@@ -224,7 +224,7 @@ def _build_request_data(sample, language_code, max_alternatives=None,
     if profanity_filter is not None:
         config['profanityFilter'] = profanity_filter
     if speech_contexts:
-        config['speechContext'] = {'phrases': speech_contexts}
+        config['speechContexts'] = {'phrases': speech_contexts}
 
     data = {
         'audio': audio,
diff --git a/speech/tests/unit/test_client.py b/speech/tests/unit/test_client.py
index f971bb4865d10..ef3ea2dc84e64 100644
--- a/speech/tests/unit/test_client.py
+++ b/speech/tests/unit/test_client.py
@@ -135,7 +135,7 @@ def test_sync_recognize_content_with_optional_params_no_gax(self):
                 'encoding': 'FLAC',
                 'maxAlternatives': 2,
                 'sampleRateHertz': 16000,
-                'speechContext': {
+                'speechContexts': {
                     'phrases': [
                         'hi',
                     ]

From 14ff1f5d8126b9fa38e73977b4aa2a4fdad9dc36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sean=20L=C3=B6fgren?= <SeanBE@users.noreply.github.com>
Date: Wed, 5 Jul 2017 18:00:40 +0100
Subject: [PATCH 067/211] Update doc reference for setting up a service account
 (#3578)

---
 core/google/cloud/credentials.py       | 3 ++-
 storage/google/cloud/storage/bucket.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/google/cloud/credentials.py b/core/google/cloud/credentials.py
index 52cba9b22fcce..6a1bf512f7a99 100644
--- a/core/google/cloud/credentials.py
+++ b/core/google/cloud/credentials.py
@@ -61,7 +61,8 @@ def _get_signed_query_params(credentials, expiration, string_to_sign):
     """
     if not isinstance(credentials, google.auth.credentials.Signing):
         auth_uri = ('http://google-cloud-python.readthedocs.io/en/latest/'
-                    'google-cloud-auth.html#setting-up-a-service-account')
+                    'core/auth.html?highlight=authentication#setting-up-'
+                    'a-service-account')
         raise AttributeError('you need a private key to sign credentials.'
                              'the credentials you are currently using %s '
                              'just contains a token. see %s for more '
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index 865a23840af4a..895a6e38473fe 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -1016,7 +1016,8 @@ def generate_upload_policy(
 
         if not isinstance(credentials, google.auth.credentials.Signing):
             auth_uri = ('http://google-cloud-python.readthedocs.io/en/latest/'
-                        'google-cloud-auth.html#setting-up-a-service-account')
+                        'core/auth.html?highlight=authentication#setting-up-'
+                        'a-service-account')
             raise AttributeError(
                 'you need a private key to sign credentials.'
                 'the credentials you are currently using %s '

From f621d17ed5cb982d388011be3deff604f589121c Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Wed, 5 Jul 2017 14:02:42 -0400
Subject: [PATCH 068/211] Update 'QueryResponse.fetch_data' docstring to match
 changes from #3484. (#3580)

Closes #3576.
---
 bigquery/google/cloud/bigquery/query.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/query.py b/bigquery/google/cloud/bigquery/query.py
index 6db2742bbe013..d596deadfb405 100644
--- a/bigquery/google/cloud/bigquery/query.py
+++ b/bigquery/google/cloud/bigquery/query.py
@@ -414,13 +414,12 @@ def fetch_data(self, max_results=None, page_token=None, start_index=None,
         :param client: the client to use.  If not passed, falls back to the
                        ``client`` stored on the current dataset.
 
-        :rtype: tuple
-        :returns: ``(row_data, total_rows, page_token)``, where ``row_data``
-                  is a list of tuples, one per result row, containing only
-                  the values;  ``total_rows`` is a count of the total number
-                  of rows in the table;  and ``page_token`` is an opaque
-                  string which can be used to fetch the next batch of rows
-                  (``None`` if no further batches can be fetched).
+        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :returns: Iterator of row data :class:`tuple`s. During each page, the
+                  iterator will have the ``total_rows`` attribute set,
+                  which counts the total number of rows **in the result
+                  set** (this is distinct from the total number of rows in
+                  the current page: ``iterator.page.num_items``).
         :raises: ValueError if the query has not yet been executed.
         """
         if self.name is None:

From bc7b0fdb9fd99b2c86de9830a25cfaaa295b1c45 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Thu, 6 Jul 2017 16:41:31 -0400
Subject: [PATCH 069/211] Shorten nox virtualenv names to avoid hashing.
 (#3585)

---
 bigquery/nox.py          | 12 ++++++++++++
 bigtable/nox.py          | 10 ++++++++++
 core/nox.py              |  7 +++++++
 datastore/nox.py         | 10 ++++++++++
 dns/nox.py               |  7 +++++++
 error_reporting/nox.py   | 10 ++++++++++
 language/nox.py          | 10 ++++++++++
 logging/nox.py           | 10 ++++++++++
 monitoring/nox.py        | 10 ++++++++++
 nox.py                   |  7 +++++++
 pubsub/nox.py            | 10 ++++++++++
 resource_manager/nox.py  |  7 +++++++
 runtimeconfig/nox.py     |  7 +++++++
 spanner/nox.py           | 10 ++++++++++
 speech/nox.py            | 10 ++++++++++
 storage/nox.py           | 10 ++++++++++
 translate/nox.py         | 10 ++++++++++
 videointelligence/nox.py |  7 +++++++
 vision/nox.py            | 10 ++++++++++
 19 files changed, 174 insertions(+)

diff --git a/bigquery/nox.py b/bigquery/nox.py
index 9851f53d188df..19a8f5761701f 100644
--- a/bigquery/nox.py
+++ b/bigquery/nox.py
@@ -30,6 +30,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
     session.install('-e', '.')
@@ -54,6 +57,9 @@ def system_tests(session, python_version):
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'sys-' + python_version
+
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
     session.install('mock', 'pytest', *LOCAL_DEPS)
@@ -72,6 +78,7 @@ def lint(session):
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
+
     session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/bigquery')
@@ -89,6 +96,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
@@ -102,6 +113,7 @@ def cover(session):
     test runs (not system test runs), and then erases coverage data.
     """
     session.interpreter = 'python3.6'
+
     session.install('coverage', 'pytest-cov')
     session.run('coverage', 'report', '--show-missing', '--fail-under=100')
     session.run('coverage', 'erase')
diff --git a/bigtable/nox.py b/bigtable/nox.py
index 40d997acc88b1..b43e196a95ffc 100644
--- a/bigtable/nox.py
+++ b/bigtable/nox.py
@@ -29,6 +29,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
     session.install('-e', '.')
@@ -53,6 +56,9 @@ def system_tests(session, python_version):
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'sys-' + python_version
+
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
     session.install('mock', 'pytest', *LOCAL_DEPS)
@@ -87,6 +93,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/core/nox.py b/core/nox.py
index 38268bcd2f904..c8f4a942e7a24 100644
--- a/core/nox.py
+++ b/core/nox.py
@@ -25,6 +25,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov',
                     'grpcio >= 1.0.2')
@@ -63,6 +66,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/datastore/nox.py b/datastore/nox.py
index 983152e7db922..2cf2186aa45a0 100644
--- a/datastore/nox.py
+++ b/datastore/nox.py
@@ -30,6 +30,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
     session.install('-e', '.')
@@ -54,6 +57,9 @@ def system_tests(session, python_version):
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'sys-' + python_version
+
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
     session.install('mock', 'pytest', *LOCAL_DEPS)
@@ -112,6 +118,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/dns/nox.py b/dns/nox.py
index f4e81c1ab9e42..0fd18ca931e9f 100644
--- a/dns/nox.py
+++ b/dns/nox.py
@@ -30,6 +30,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
     session.install('-e', '.')
@@ -66,6 +69,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/error_reporting/nox.py b/error_reporting/nox.py
index 08edc6987ab92..d2e2a7cb9609b 100644
--- a/error_reporting/nox.py
+++ b/error_reporting/nox.py
@@ -30,6 +30,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
     session.install('-e', '.')
@@ -66,6 +69,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
@@ -83,6 +90,9 @@ def system_tests(session, python_version):
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'sys-' + python_version
+
     # Install all test dependencies, then install this package into the
     # virtualenv's dist-packages.
     session.install('mock', 'pytest', *LOCAL_DEPS)
diff --git a/language/nox.py b/language/nox.py
index 485ee930d7fb2..43212b1e8f389 100644
--- a/language/nox.py
+++ b/language/nox.py
@@ -30,6 +30,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
     session.install('-e', '.')
@@ -54,6 +57,9 @@ def system_tests(session, python_version):
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'sys-' + python_version
+
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
     session.install('mock', 'pytest', *LOCAL_DEPS)
@@ -88,6 +94,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/logging/nox.py b/logging/nox.py
index 1d9d5f184e435..068d5ae8d198b 100644
--- a/logging/nox.py
+++ b/logging/nox.py
@@ -30,6 +30,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install(
         'mock', 'pytest', 'pytest-cov',
@@ -57,6 +60,9 @@ def system_tests(session, python_version):
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'sys-' + python_version
+
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
     session.install('mock', 'pytest', *LOCAL_DEPS)
@@ -92,6 +98,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/monitoring/nox.py b/monitoring/nox.py
index dcde9c484b0ab..b11a0cd5b6934 100644
--- a/monitoring/nox.py
+++ b/monitoring/nox.py
@@ -30,6 +30,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
     session.install('-e', '.')
@@ -54,6 +57,9 @@ def system_tests(session, python_version):
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'sys-' + python_version
+
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
     session.install('mock', 'pytest', *LOCAL_DEPS)
@@ -88,6 +94,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/nox.py b/nox.py
index dd38837e6a018..3d283c821bdc1 100644
--- a/nox.py
+++ b/nox.py
@@ -24,6 +24,9 @@ def docs(session):
     # Build docs against the latest version of Python, because we can.
     session.interpreter = 'python3.6'
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'docs'
+
     # Install Sphinx and also all of the google-cloud-* packages.
     session.chdir(os.path.realpath(os.path.dirname(__file__)))
     session.install('Sphinx >= 1.6.2', 'sphinx_rtd_theme')
@@ -43,6 +46,10 @@ def docs(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/pubsub/nox.py b/pubsub/nox.py
index dd7b093305242..4bcecafe66b40 100644
--- a/pubsub/nox.py
+++ b/pubsub/nox.py
@@ -30,6 +30,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
     session.install('-e', '.')
@@ -54,6 +57,9 @@ def system_tests(session, python_version):
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'sys-' + python_version
+
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
     session.install('mock', 'pytest', *LOCAL_DEPS)
@@ -88,6 +94,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/resource_manager/nox.py b/resource_manager/nox.py
index f3c0b5aa8f210..448ff93fc292f 100644
--- a/resource_manager/nox.py
+++ b/resource_manager/nox.py
@@ -30,6 +30,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
     session.install('-e', '.')
@@ -66,6 +69,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/runtimeconfig/nox.py b/runtimeconfig/nox.py
index f1f3177e521fe..2b48a111e2a1c 100644
--- a/runtimeconfig/nox.py
+++ b/runtimeconfig/nox.py
@@ -30,6 +30,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
     session.install('-e', '.')
@@ -66,6 +69,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/spanner/nox.py b/spanner/nox.py
index 7332af05f0e9c..980bff46c85d2 100644
--- a/spanner/nox.py
+++ b/spanner/nox.py
@@ -30,6 +30,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
     session.install('-e', '.')
@@ -54,6 +57,9 @@ def system_tests(session, python_version):
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'sys-' + python_version
+
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
     session.install('mock', 'pytest', *LOCAL_DEPS)
@@ -88,6 +94,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/speech/nox.py b/speech/nox.py
index bcacf2d59cd63..fdda2298bc435 100644
--- a/speech/nox.py
+++ b/speech/nox.py
@@ -30,6 +30,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
     session.install('-e', '.')
@@ -54,6 +57,9 @@ def system_tests(session, python_version):
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'sys-' + python_version
+
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
     session.install('mock', 'pytest', *LOCAL_DEPS)
@@ -88,6 +94,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/storage/nox.py b/storage/nox.py
index f50de86bfdfaa..3de8efed3fd9e 100644
--- a/storage/nox.py
+++ b/storage/nox.py
@@ -30,6 +30,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
     session.install('-e', '.')
@@ -55,6 +58,9 @@ def system_tests(session, python_version):
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'sys-' + python_version
+
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
     session.install('mock', 'pytest', *LOCAL_DEPS)
@@ -89,6 +95,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/translate/nox.py b/translate/nox.py
index 3d006f1f0e27f..a7baf305f3eca 100644
--- a/translate/nox.py
+++ b/translate/nox.py
@@ -30,6 +30,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
     session.install('-e', '.')
@@ -54,6 +57,9 @@ def system_tests(session, python_version):
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'sys-' + python_version
+
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
     session.install('mock', 'pytest', *LOCAL_DEPS)
@@ -88,6 +94,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'Pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/videointelligence/nox.py b/videointelligence/nox.py
index 0f6bd713afbe2..ceba6ff514e59 100644
--- a/videointelligence/nox.py
+++ b/videointelligence/nox.py
@@ -25,6 +25,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov')
     session.install('-e', '.')
@@ -36,6 +39,10 @@ def unit_tests(session, python_version):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')
diff --git a/vision/nox.py b/vision/nox.py
index 8761fa6fccd6f..a030b7a9e5bbe 100644
--- a/vision/nox.py
+++ b/vision/nox.py
@@ -27,6 +27,9 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
     session.install('-e', '.')
@@ -51,6 +54,9 @@ def system_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'sys-' + python_version
+
     # Install all test dependencies, then install this package in-place.
     session.install('pytest', '../core/', '../storage/')
     session.install('../test_utils/')
@@ -105,6 +111,10 @@ def lint(session):
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.interpreter = 'python3.6'
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'setup'
+
     session.install('docutils', 'pygments')
     session.run(
         'python', 'setup.py', 'check', '--restructuredtext', '--strict')

From 7fa089cb2b3a67de9fc454fb25c9c1e99760141e Mon Sep 17 00:00:00 2001
From: Rich Kadel <richkadel@google.com>
Date: Thu, 6 Jul 2017 14:22:59 -0700
Subject: [PATCH 070/211] Add support for creating a view with 'useLegacySql =
 False' (#3514)

---
 bigquery/google/cloud/bigquery/table.py | 44 +++++++++++++++++++++++--
 bigquery/tests/unit/test_table.py       | 24 ++++++++++++--
 2 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/table.py b/bigquery/google/cloud/bigquery/table.py
index 662cc670d5415..37dc1159cc8e0 100644
--- a/bigquery/google/cloud/bigquery/table.py
+++ b/bigquery/google/cloud/bigquery/table.py
@@ -193,7 +193,7 @@ def table_id(self):
     def table_type(self):
         """The type of the table.
 
-        Possible values are "TABLE" or "VIEW".
+        Possible values are "TABLE", "VIEW", or "EXTERNAL".
 
         :rtype: str, or ``NoneType``
         :returns: the URL (None until set from the server).
@@ -364,13 +364,49 @@ def view_query(self, value):
         """
         if not isinstance(value, six.string_types):
             raise ValueError("Pass a string")
-        self._properties['view'] = {'query': value}
+        if self._properties.get('view') is None:
+            self._properties['view'] = {}
+        self._properties['view']['query'] = value
 
     @view_query.deleter
     def view_query(self):
         """Delete SQL query defining the table as a view."""
         self._properties.pop('view', None)
 
+    @property
+    def view_use_legacy_sql(self):
+        """Specifies whether to execute the view with legacy or standard SQL.
+
+        If not set, None is returned. BigQuery's default mode is equivalent to
+        useLegacySql = True.
+
+        :rtype: bool, or ``NoneType``
+        :returns: The boolean for view.useLegacySql as set by the user, or
+                  None (the default).
+        """
+        view = self._properties.get('view')
+        if view is not None:
+            return view.get('useLegacySql')
+
+    @view_use_legacy_sql.setter
+    def view_use_legacy_sql(self, value):
+        """Update the view sub-property 'useLegacySql'.
+
+        This boolean specifies whether to execute the view with legacy SQL
+        (True) or standard SQL (False). The default, if not specified, is
+        'True'.
+
+        :type value: bool
+        :param value: The boolean for view.useLegacySql
+
+        :raises: ValueError for invalid value types.
+        """
+        if not isinstance(value, bool):
+            raise ValueError("Pass a boolean")
+        if self._properties.get('view') is None:
+            self._properties['view'] = {}
+        self._properties['view']['useLegacySql'] = value
+
     def list_partitions(self, client=None):
         """List the partitions in a table.
 
@@ -470,6 +506,8 @@ def _build_resource(self):
         if self.view_query is not None:
             view = resource['view'] = {}
             view['query'] = self.view_query
+            if self.view_use_legacy_sql is not None:
+                view['useLegacySql'] = self.view_use_legacy_sql
 
         if self._schema:
             resource['schema'] = {
@@ -479,7 +517,7 @@ def _build_resource(self):
         return resource
 
     def create(self, client=None):
-        """API call:  create the dataset via a PUT request
+        """API call:  create the table via a PUT request
 
         See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tables/insert
diff --git a/bigquery/tests/unit/test_table.py b/bigquery/tests/unit/test_table.py
index 5a3c70112564b..0e987462da222 100644
--- a/bigquery/tests/unit/test_table.py
+++ b/bigquery/tests/unit/test_table.py
@@ -124,8 +124,10 @@ def _verifyResourceProperties(self, table, resource):
 
         if 'view' in resource:
             self.assertEqual(table.view_query, resource['view']['query'])
+            self.assertEqual(table.view_use_legacy_sql, resource['view'].get('useLegacySql'))
         else:
             self.assertIsNone(table.view_query)
+            self.assertIsNone(table.view_use_legacy_sql)
 
         if 'schema' in resource:
             self._verifySchema(table.schema, resource)
@@ -160,6 +162,7 @@ def test_ctor(self):
         self.assertIsNone(table.friendly_name)
         self.assertIsNone(table.location)
         self.assertIsNone(table.view_query)
+        self.assertIsNone(table.view_use_legacy_sql)
 
     def test_ctor_w_schema(self):
         from google.cloud.bigquery.table import SchemaField
@@ -358,6 +361,22 @@ def test_view_query_deleter(self):
         del table.view_query
         self.assertIsNone(table.view_query)
 
+    def test_view_use_legacy_sql_setter_bad_value(self):
+        client = _Client(self.PROJECT)
+        dataset = _Dataset(client)
+        table = self._make_one(self.TABLE_NAME, dataset)
+        with self.assertRaises(ValueError):
+            table.view_use_legacy_sql = 12345
+
+    def test_view_use_legacy_sql_setter(self):
+        client = _Client(self.PROJECT)
+        dataset = _Dataset(client)
+        table = self._make_one(self.TABLE_NAME, dataset)
+        table.view_use_legacy_sql = False
+        table.view_query = 'select * from foo'
+        self.assertEqual(table.view_use_legacy_sql, False)
+        self.assertEqual(table.view_query, 'select * from foo')
+
     def test_from_api_repr_missing_identity(self):
         self._setUpConstants()
         client = _Client(self.PROJECT)
@@ -978,7 +997,7 @@ def test_update_w_alternate_client(self):
         self.EXP_TIME = datetime.datetime(2015, 8, 1, 23, 59, 59,
                                           tzinfo=UTC)
         RESOURCE['expirationTime'] = _millis(self.EXP_TIME)
-        RESOURCE['view'] = {'query': QUERY}
+        RESOURCE['view'] = {'query': QUERY, 'useLegacySql': True}
         RESOURCE['type'] = 'VIEW'
         conn1 = _Connection()
         client1 = _Client(project=self.PROJECT, connection=conn1)
@@ -990,6 +1009,7 @@ def test_update_w_alternate_client(self):
         table.location = LOCATION
         table.expires = self.EXP_TIME
         table.view_query = QUERY
+        table.view_use_legacy_sql = True
 
         table.update(client=client2)
 
@@ -1005,7 +1025,7 @@ def test_update_w_alternate_client(self):
                  'tableId': self.TABLE_NAME},
             'expirationTime': _millis(self.EXP_TIME),
             'location': 'EU',
-            'view': {'query': QUERY},
+            'view': {'query': QUERY, 'useLegacySql': True},
         }
         self.assertEqual(req['data'], SENT)
         self._verifyResourceProperties(table, RESOURCE)

From 358a448d234937c9000974a0fa322a031d2bc42d Mon Sep 17 00:00:00 2001
From: Craig Silverstein <csilvers@gmail.com>
Date: Mon, 10 Jul 2017 09:12:24 -0700
Subject: [PATCH 071/211] Add support for logging the trace-id in webapp2 apps.
 (#3593)

---
 .../google/cloud/logging/handlers/_helpers.py | 49 ++++++++++++--
 logging/nox.py                                |  2 +-
 logging/tests/unit/handlers/test__helpers.py  | 66 +++++++++++++++++--
 3 files changed, 106 insertions(+), 11 deletions(-)

diff --git a/logging/google/cloud/logging/handlers/_helpers.py b/logging/google/cloud/logging/handlers/_helpers.py
index 1ebb064ed228a..864f0e53617e6 100644
--- a/logging/google/cloud/logging/handlers/_helpers.py
+++ b/logging/google/cloud/logging/handlers/_helpers.py
@@ -22,11 +22,21 @@
 except ImportError:  # pragma: NO COVER
     flask = None
 
+try:
+    import webapp2
+except (ImportError, SyntaxError):  # pragma: NO COVER
+    # If you try to import webapp2 under python3, you'll get a syntax
+    # error (since it hasn't been ported yet).  We just pretend it
+    # doesn't exist.  This is unlikely to hit in real life but does
+    # in the tests.
+    webapp2 = None
+
 from google.cloud.logging.handlers.middleware.request import (
     _get_django_request)
 
-_FLASK_TRACE_HEADER = 'X_CLOUD_TRACE_CONTEXT'
 _DJANGO_TRACE_HEADER = 'HTTP_X_CLOUD_TRACE_CONTEXT'
+_FLASK_TRACE_HEADER = 'X_CLOUD_TRACE_CONTEXT'
+_WEBAPP2_TRACE_HEADER = 'X-CLOUD-TRACE-CONTEXT'
 
 
 def format_stackdriver_json(record, message):
@@ -54,7 +64,7 @@ def get_trace_id_from_flask():
     """Get trace_id from flask request headers.
 
     :rtype: str
-    :return: Trace_id in HTTP request headers.
+    :returns: TraceID in HTTP request headers.
     """
     if flask is None or not flask.request:
         return None
@@ -69,11 +79,38 @@ def get_trace_id_from_flask():
     return trace_id
 
 
+def get_trace_id_from_webapp2():
+    """Get trace_id from webapp2 request headers.
+
+    :rtype: str
+    :returns: TraceID in HTTP request headers.
+    """
+    if webapp2 is None:
+        return None
+
+    try:
+        # get_request() succeeds if we're in the middle of a webapp2
+        # request, or raises an assertion error otherwise:
+        # "Request global variable is not set".
+        req = webapp2.get_request()
+    except AssertionError:
+        return None
+
+    header = req.headers.get(_WEBAPP2_TRACE_HEADER)
+
+    if header is None:
+        return None
+
+    trace_id = header.split('/', 1)[0]
+
+    return trace_id
+
+
 def get_trace_id_from_django():
     """Get trace_id from django request headers.
 
     :rtype: str
-    :return: Trace_id in HTTP request headers.
+    :returns: TraceID in HTTP request headers.
     """
     request = _get_django_request()
 
@@ -93,9 +130,11 @@ def get_trace_id():
     """Helper to get trace_id from web application request header.
 
     :rtype: str
-    :returns: Trace_id in HTTP request headers.
+    :returns: TraceID in HTTP request headers.
     """
-    checkers = (get_trace_id_from_django, get_trace_id_from_flask)
+    checkers = (get_trace_id_from_django,
+                get_trace_id_from_flask,
+                get_trace_id_from_webapp2)
 
     for checker in checkers:
         trace_id = checker()
diff --git a/logging/nox.py b/logging/nox.py
index 068d5ae8d198b..ce8d1c0afbce8 100644
--- a/logging/nox.py
+++ b/logging/nox.py
@@ -36,7 +36,7 @@ def unit_tests(session, python_version):
     # Install all test dependencies, then install this package in-place.
     session.install(
         'mock', 'pytest', 'pytest-cov',
-        'flask', 'django', *LOCAL_DEPS)
+        'flask', 'webapp2', 'webob', 'django', *LOCAL_DEPS)
     session.install('-e', '.')
 
     # Run py.test against the unit tests.
diff --git a/logging/tests/unit/handlers/test__helpers.py b/logging/tests/unit/handlers/test__helpers.py
index 0731c825d32cc..516cd93fc2d53 100644
--- a/logging/tests/unit/handlers/test__helpers.py
+++ b/logging/tests/unit/handlers/test__helpers.py
@@ -12,9 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import json
 import unittest
 
 import mock
+import six
+
+try:
+    from webapp2 import RequestHandler
+except SyntaxError:
+    # webapp2 has not been ported to python3, so it will give a syntax
+    # error if we try.  We'll just skip the webapp2 tests in that case.
+    RequestHandler = object
 
 
 class Test_get_trace_id_from_flask(unittest.TestCase):
@@ -37,11 +46,9 @@ def index():
 
         return app
 
-    def setUp(self):
-        self.app = self.create_app()
-
     def test_no_context_header(self):
-        with self.app.test_request_context(
+        app = self.create_app()
+        with app.test_request_context(
                 path='/',
                 headers={}):
             trace_id = self._call_fut()
@@ -53,7 +60,8 @@ def test_valid_context_header(self):
         expected_trace_id = 'testtraceidflask'
         flask_trace_id = expected_trace_id + '/testspanid'
 
-        context = self.app.test_request_context(
+        app = self.create_app()
+        context = app.test_request_context(
             path='/',
             headers={flask_trace_header: flask_trace_id})
 
@@ -63,6 +71,54 @@ def test_valid_context_header(self):
         self.assertEqual(trace_id, expected_trace_id)
 
 
+class _GetTraceId(RequestHandler):
+    def get(self):
+        from google.cloud.logging.handlers import _helpers
+
+        trace_id = _helpers.get_trace_id_from_webapp2()
+        self.response.content_type = 'application/json'
+        self.response.out.write(json.dumps(trace_id))
+
+
+
+@unittest.skipIf(six.PY3, 'webapp2 is Python 2 only')
+class Test_get_trace_id_from_webapp2(unittest.TestCase):
+
+    @staticmethod
+    def create_app():
+        import webapp2
+
+        app = webapp2.WSGIApplication([
+            ('/', _GetTraceId),
+        ])
+
+        return app
+
+    def test_no_context_header(self):
+        import webob
+
+        req = webob.BaseRequest.blank('/')
+        response = req.get_response(self.create_app())
+        trace_id = json.loads(response.body)
+
+        self.assertEquals(None, trace_id)
+
+    def test_valid_context_header(self):
+        import webob
+
+        webapp2_trace_header = 'X-Cloud-Trace-Context'
+        expected_trace_id = 'testtraceidwebapp2'
+        webapp2_trace_id = expected_trace_id + '/testspanid'
+
+        req = webob.BaseRequest.blank(
+            '/',
+            headers={webapp2_trace_header: webapp2_trace_id})
+        response = req.get_response(self.create_app())
+        trace_id = json.loads(response.body)
+
+        self.assertEqual(trace_id, expected_trace_id)
+
+
 class Test_get_trace_id_from_django(unittest.TestCase):
 
     @staticmethod

From f69d704841bd30c08af4a522397b3fe95107bdfd Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Mon, 10 Jul 2017 10:31:26 -0700
Subject: [PATCH 072/211] Fixing "long line" lint violation in BigQuery unit
 tests. (#3596)

---
 bigquery/tests/unit/test_table.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bigquery/tests/unit/test_table.py b/bigquery/tests/unit/test_table.py
index 0e987462da222..b27736fb896e3 100644
--- a/bigquery/tests/unit/test_table.py
+++ b/bigquery/tests/unit/test_table.py
@@ -124,7 +124,9 @@ def _verifyResourceProperties(self, table, resource):
 
         if 'view' in resource:
             self.assertEqual(table.view_query, resource['view']['query'])
-            self.assertEqual(table.view_use_legacy_sql, resource['view'].get('useLegacySql'))
+            self.assertEqual(
+                table.view_use_legacy_sql,
+                resource['view'].get('useLegacySql'))
         else:
             self.assertIsNone(table.view_query)
             self.assertIsNone(table.view_use_legacy_sql)

From da3a7bbe8c7770540c2149fabfc6f74db89f7ce4 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Tue, 11 Jul 2017 10:51:40 -0700
Subject: [PATCH 073/211] Updating author_email in all setup.py. (#3598)

Done via:

$ git grep -l author_email | \
> xargs sed -i s/jjg+google-cloud-python@google.com/googleapis-publisher@google.com/g

and manually editing `videointelligence/setup.py` and `vision/setup.py`.
---
 bigquery/setup.py          | 2 +-
 bigtable/setup.py          | 2 +-
 core/setup.py              | 2 +-
 datastore/setup.py         | 2 +-
 dns/setup.py               | 2 +-
 error_reporting/setup.py   | 2 +-
 language/setup.py          | 2 +-
 logging/setup.py           | 2 +-
 monitoring/setup.py        | 2 +-
 pubsub/setup.py            | 2 +-
 resource_manager/setup.py  | 2 +-
 runtimeconfig/setup.py     | 2 +-
 setup.py                   | 2 +-
 spanner/setup.py           | 2 +-
 speech/setup.py            | 2 +-
 storage/setup.py           | 2 +-
 test_utils/setup.py        | 2 +-
 translate/setup.py         | 2 +-
 videointelligence/setup.py | 2 +-
 vision/setup.py            | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/bigquery/setup.py b/bigquery/setup.py
index 4efe79c19e1a8..6d61064c88bad 100644
--- a/bigquery/setup.py
+++ b/bigquery/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/bigtable/setup.py b/bigtable/setup.py
index 6b90c6878ca83..8d5bad6a1ffdd 100644
--- a/bigtable/setup.py
+++ b/bigtable/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/core/setup.py b/core/setup.py
index 5a2f43adf4643..cd461c5f2526d 100644
--- a/core/setup.py
+++ b/core/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/datastore/setup.py b/datastore/setup.py
index 6a09fb8595f37..692dd109a4810 100644
--- a/datastore/setup.py
+++ b/datastore/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/dns/setup.py b/dns/setup.py
index 5657495ce253a..62af1fe9ddc53 100644
--- a/dns/setup.py
+++ b/dns/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/error_reporting/setup.py b/error_reporting/setup.py
index a4060c9fd33e0..039daa6885a05 100644
--- a/error_reporting/setup.py
+++ b/error_reporting/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/language/setup.py b/language/setup.py
index 089d78d6bbb27..d573938a7665b 100644
--- a/language/setup.py
+++ b/language/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/logging/setup.py b/logging/setup.py
index 3f613b94cbe73..82dc4f1fcf8a9 100644
--- a/logging/setup.py
+++ b/logging/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/monitoring/setup.py b/monitoring/setup.py
index 318ecf60b9b4f..bfb8ca155d825 100644
--- a/monitoring/setup.py
+++ b/monitoring/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/pubsub/setup.py b/pubsub/setup.py
index 94a854b63dee3..856a59824a605 100644
--- a/pubsub/setup.py
+++ b/pubsub/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/resource_manager/setup.py b/resource_manager/setup.py
index 1a23e9ad617ed..dd295b2973a54 100644
--- a/resource_manager/setup.py
+++ b/resource_manager/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/runtimeconfig/setup.py b/runtimeconfig/setup.py
index f1fffdcfe3acc..f874d07f29bcf 100644
--- a/runtimeconfig/setup.py
+++ b/runtimeconfig/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/setup.py b/setup.py
index eeedb6d865063..9a83bb9e250ff 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/spanner/setup.py b/spanner/setup.py
index 8b984c4a7f61a..0808c1309b6ad 100644
--- a/spanner/setup.py
+++ b/spanner/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/speech/setup.py b/speech/setup.py
index 661d6035d489b..7c208dffdd885 100644
--- a/speech/setup.py
+++ b/speech/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/storage/setup.py b/storage/setup.py
index b7b341543ee87..d18624f3c13d2 100644
--- a/storage/setup.py
+++ b/storage/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/test_utils/setup.py b/test_utils/setup.py
index 56e3473e7d6c5..179a25898982e 100644
--- a/test_utils/setup.py
+++ b/test_utils/setup.py
@@ -25,7 +25,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/translate/setup.py b/translate/setup.py
index 6a3c047531f37..edfaf5cbdc963 100644
--- a/translate/setup.py
+++ b/translate/setup.py
@@ -27,7 +27,7 @@
 #       consolidate.
 SETUP_BASE = {
     'author': 'Google Cloud Platform',
-    'author_email': 'jjg+google-cloud-python@google.com',
+    'author_email': 'googleapis-publisher@google.com',
     'scripts': [],
     'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
     'license': 'Apache 2.0',
diff --git a/videointelligence/setup.py b/videointelligence/setup.py
index 9325a8ffb09ac..a47f897e38554 100644
--- a/videointelligence/setup.py
+++ b/videointelligence/setup.py
@@ -27,7 +27,7 @@
 
 setup(
     author='Google Cloud Platform',
-    author_email='googleapis-packages@google.com',
+    author_email='googleapis-publisher@google.com',
     name='google-cloud-videointelligence',
     version='0.25.0',
     description='Python Client for Google Cloud Video Intelligence',
diff --git a/vision/setup.py b/vision/setup.py
index 7cc30276fe584..aeabefeb86c19 100644
--- a/vision/setup.py
+++ b/vision/setup.py
@@ -35,7 +35,7 @@
 
 setup(
     author='Google Cloud Platform',
-    author_email='googleapis-packages@google.com',
+    author_email='googleapis-publisher@google.com',
     name='google-cloud-vision',
     version='0.25.0',
     description='Python Client for Google Cloud Vision',

From 569e739c17234c52407b6bb5169bc9c4546474ea Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Tue, 11 Jul 2017 13:28:24 -0700
Subject: [PATCH 074/211] Patch in the version updates made when fixing #3579.
 (#3591)

---
 error_reporting/setup.py |  4 ++--
 setup.py                 | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/error_reporting/setup.py b/error_reporting/setup.py
index 039daa6885a05..807af3b97907e 100644
--- a/error_reporting/setup.py
+++ b/error_reporting/setup.py
@@ -52,13 +52,13 @@
 
 REQUIREMENTS = [
     'google-cloud-core >= 0.25.0, < 0.26dev',
-    'google-cloud-logging >= 1.0.0, < 2.0dev',
+    'google-cloud-logging >= 1.1.0, < 1.2dev',
     'gapic-google-cloud-error-reporting-v1beta1 >= 0.15.0, < 0.16dev'
 ]
 
 setup(
     name='google-cloud-error-reporting',
-    version='0.25.0',
+    version='0.25.1',
     description='Python Client for Stackdriver Error Reporting',
     long_description=README,
     namespace_packages=[
diff --git a/setup.py b/setup.py
index 9a83bb9e250ff..6977c6151ddc7 100644
--- a/setup.py
+++ b/setup.py
@@ -53,18 +53,18 @@
     'google-cloud-bigquery >= 0.25.0, < 0.26dev',
     'google-cloud-bigtable >= 0.25.0, < 0.26dev',
     'google-cloud-core >= 0.25.0, < 0.26dev',
-    'google-cloud-datastore >= 1.1.0, < 2.0dev',
+    'google-cloud-datastore >= 1.1.0, < 1.2dev',
     'google-cloud-dns >= 0.25.0, < 0.26dev',
-    'google-cloud-error-reporting >= 0.25.0, < 0.26dev',
+    'google-cloud-error-reporting >= 0.25.1, < 0.26dev',
     'google-cloud-language >= 0.25.0, < 0.26dev',
-    'google-cloud-logging >= 1.1.0, < 2.0dev',
+    'google-cloud-logging >= 1.1.0, < 1.2dev',
     'google-cloud-monitoring >= 0.25.0, < 0.26dev',
     'google-cloud-pubsub >= 0.26.0, < 0.27dev',
     'google-cloud-resource-manager >= 0.25.0, < 0.26dev',
     'google-cloud-runtimeconfig >= 0.25.0, < 0.26dev',
     'google-cloud-spanner >= 0.25.0, < 0.26dev',
     'google-cloud-speech >= 0.26.0, < 0.27dev',
-    'google-cloud-storage >= 1.2.0, < 2.0dev',
+    'google-cloud-storage >= 1.2.0, < 1.3dev',
     'google-cloud-translate >= 0.25.0, < 0.26dev',
     'google-cloud-videointelligence >= 0.25.0, < 0.26dev',
     'google-cloud-vision >= 0.25.0, < 0.26dev',
@@ -72,7 +72,7 @@
 
 setup(
     name='google-cloud',
-    version='0.26.0',
+    version='0.26.1',
     description='API Client library for Google Cloud',
     long_description=README,
     install_requires=REQUIREMENTS,

From 68720f67e2271ccf3ff60fe81bc61b497c8feecb Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Wed, 12 Jul 2017 10:04:48 -0700
Subject: [PATCH 075/211] Implementation of DB-API for BigQuery. (#2921)

The `google.cloud.bigquery.dbapi` package covers all of the required implementation
details in the PEP-249 DB-API specification.
---
 .../google/cloud/bigquery/dbapi/__init__.py   |  70 ++++
 .../google/cloud/bigquery/dbapi/_helpers.py   | 129 +++++++
 .../google/cloud/bigquery/dbapi/connection.py |  58 ++++
 .../google/cloud/bigquery/dbapi/cursor.py     | 327 ++++++++++++++++++
 .../google/cloud/bigquery/dbapi/exceptions.py |  58 ++++
 bigquery/google/cloud/bigquery/dbapi/types.py |  84 +++++
 bigquery/tests/system.py                      | 209 ++++++++++-
 bigquery/tests/unit/test_dbapi__helpers.py    | 134 +++++++
 bigquery/tests/unit/test_dbapi_connection.py  |  73 ++++
 bigquery/tests/unit/test_dbapi_cursor.py      | 269 ++++++++++++++
 bigquery/tests/unit/test_dbapi_types.py       |  40 +++
 11 files changed, 1432 insertions(+), 19 deletions(-)
 create mode 100644 bigquery/google/cloud/bigquery/dbapi/__init__.py
 create mode 100644 bigquery/google/cloud/bigquery/dbapi/_helpers.py
 create mode 100644 bigquery/google/cloud/bigquery/dbapi/connection.py
 create mode 100644 bigquery/google/cloud/bigquery/dbapi/cursor.py
 create mode 100644 bigquery/google/cloud/bigquery/dbapi/exceptions.py
 create mode 100644 bigquery/google/cloud/bigquery/dbapi/types.py
 create mode 100644 bigquery/tests/unit/test_dbapi__helpers.py
 create mode 100644 bigquery/tests/unit/test_dbapi_connection.py
 create mode 100644 bigquery/tests/unit/test_dbapi_cursor.py
 create mode 100644 bigquery/tests/unit/test_dbapi_types.py

diff --git a/bigquery/google/cloud/bigquery/dbapi/__init__.py b/bigquery/google/cloud/bigquery/dbapi/__init__.py
new file mode 100644
index 0000000000000..4e9c9a810da48
--- /dev/null
+++ b/bigquery/google/cloud/bigquery/dbapi/__init__.py
@@ -0,0 +1,70 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+"""Google BigQuery implementation of the Database API Specification v2.0.
+
+This module implements the `Python Database API Specification v2.0 (DB-API)`_
+for Google BigQuery.
+
+.. _Python Database API Specification v2.0 (DB-API):
+   https://www.python.org/dev/peps/pep-0249/
+
+.. warning::
+   The ``dbapi`` module is **alpha**. The implementation is not complete. It
+   might be changed in backward-incompatible ways and is not subject to any SLA
+   or deprecation policy.
+"""
+
+from google.cloud.bigquery.dbapi.connection import connect
+from google.cloud.bigquery.dbapi.connection import Connection
+from google.cloud.bigquery.dbapi.cursor import Cursor
+from google.cloud.bigquery.dbapi.exceptions import Warning
+from google.cloud.bigquery.dbapi.exceptions import Error
+from google.cloud.bigquery.dbapi.exceptions import InterfaceError
+from google.cloud.bigquery.dbapi.exceptions import DatabaseError
+from google.cloud.bigquery.dbapi.exceptions import DataError
+from google.cloud.bigquery.dbapi.exceptions import OperationalError
+from google.cloud.bigquery.dbapi.exceptions import IntegrityError
+from google.cloud.bigquery.dbapi.exceptions import InternalError
+from google.cloud.bigquery.dbapi.exceptions import ProgrammingError
+from google.cloud.bigquery.dbapi.exceptions import NotSupportedError
+from google.cloud.bigquery.dbapi.types import Binary
+from google.cloud.bigquery.dbapi.types import Date
+from google.cloud.bigquery.dbapi.types import DateFromTicks
+from google.cloud.bigquery.dbapi.types import Time
+from google.cloud.bigquery.dbapi.types import TimeFromTicks
+from google.cloud.bigquery.dbapi.types import Timestamp
+from google.cloud.bigquery.dbapi.types import TimestampFromTicks
+from google.cloud.bigquery.dbapi.types import BINARY
+from google.cloud.bigquery.dbapi.types import DATETIME
+from google.cloud.bigquery.dbapi.types import NUMBER
+from google.cloud.bigquery.dbapi.types import ROWID
+from google.cloud.bigquery.dbapi.types import STRING
+
+
+apilevel = '2.0'
+
+# Threads may share the module, but not connections.
+threadsafety = 1
+
+paramstyle = 'pyformat'
+
+__all__ = [
+    'apilevel', 'threadsafety', 'paramstyle', 'connect', 'Connection',
+    'Cursor', 'Warning', 'Error', 'InterfaceError', 'DatabaseError',
+    'DataError', 'OperationalError', 'IntegrityError', 'InternalError',
+    'ProgrammingError', 'NotSupportedError', 'Binary', 'Date', 'DateFromTicks',
+    'Time', 'TimeFromTicks', 'Timestamp', 'TimestampFromTicks', 'BINARY',
+    'DATETIME', 'NUMBER', 'ROWID', 'STRING',
+]
diff --git a/bigquery/google/cloud/bigquery/dbapi/_helpers.py b/bigquery/google/cloud/bigquery/dbapi/_helpers.py
new file mode 100644
index 0000000000000..1a9a02fd7cc7d
--- /dev/null
+++ b/bigquery/google/cloud/bigquery/dbapi/_helpers.py
@@ -0,0 +1,129 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+import collections
+import datetime
+import numbers
+import time
+
+import six
+
+from google.cloud import bigquery
+from google.cloud.bigquery.dbapi import exceptions
+
+
+def wait_for_job(job):
+    """Waits for a job to complete by polling until the state is `DONE`.
+
+    Sleeps 1 second between calls to the BigQuery API.
+
+    :type job: :class:`~google.cloud.bigquery.job._AsyncJob`
+    :param job: Wait for this job to finish.
+
+    :raises: :class:`~google.cloud.bigquery.dbapi.exceptions.DatabaseError`
+        if the job fails.
+    """
+    while True:
+        job.reload()
+        if job.state == 'DONE':
+            if job.error_result:
+                raise exceptions.DatabaseError(job.errors)
+            return
+        time.sleep(1)
+
+
+def scalar_to_query_parameter(value, name=None):
+    """Convert a scalar value into a query parameter.
+
+    :type value: any
+    :param value: A scalar value to convert into a query parameter.
+
+    :type name: str
+    :param name: (Optional) Name of the query parameter.
+
+    :rtype: :class:`~google.cloud.bigquery.ScalarQueryParameter`
+    :returns:
+        A query parameter corresponding with the type and value of the plain
+        Python object.
+    :raises: :class:`~google.cloud.bigquery.dbapi.exceptions.ProgrammingError`
+        if the type cannot be determined.
+    """
+    parameter_type = None
+
+    if isinstance(value, bool):
+        parameter_type = 'BOOL'
+    elif isinstance(value, numbers.Integral):
+        parameter_type = 'INT64'
+    elif isinstance(value, numbers.Real):
+        parameter_type = 'FLOAT64'
+    elif isinstance(value, six.text_type):
+        parameter_type = 'STRING'
+    elif isinstance(value, six.binary_type):
+        parameter_type = 'BYTES'
+    elif isinstance(value, datetime.datetime):
+        parameter_type = 'DATETIME' if value.tzinfo is None else 'TIMESTAMP'
+    elif isinstance(value, datetime.date):
+        parameter_type = 'DATE'
+    elif isinstance(value, datetime.time):
+        parameter_type = 'TIME'
+    else:
+        raise exceptions.ProgrammingError(
+            'encountered parameter {} with value {} of unexpected type'.format(
+                name, value))
+    return bigquery.ScalarQueryParameter(name, parameter_type, value)
+
+
+def to_query_parameters_list(parameters):
+    """Converts a sequence of parameter values into query parameters.
+
+    :type parameters: Sequence[Any]
+    :param parameters: Sequence of query parameter values.
+
+    :rtype: List[google.cloud.bigquery._helpers.AbstractQueryParameter]
+    :returns: A list of query parameters.
+    """
+    return [scalar_to_query_parameter(value) for value in parameters]
+
+
+def to_query_parameters_dict(parameters):
+    """Converts a dictionary of parameter values into query parameters.
+
+    :type parameters: Mapping[str, Any]
+    :param parameters: Dictionary of query parameter values.
+
+    :rtype: List[google.cloud.bigquery._helpers.AbstractQueryParameter]
+    :returns: A list of named query parameters.
+    """
+    return [
+        scalar_to_query_parameter(value, name=name)
+        for name, value
+        in six.iteritems(parameters)]
+
+
+def to_query_parameters(parameters):
+    """Converts DB-API parameter values into query parameters.
+
+    :type parameters: Mapping[str, Any] or Sequence[Any]
+    :param parameters: A dictionary or sequence of query parameter values.
+
+    :rtype: List[google.cloud.bigquery._helpers.AbstractQueryParameter]
+    :returns: A list of query parameters.
+    """
+    if parameters is None:
+        return []
+
+    if isinstance(parameters, collections.Mapping):
+        return to_query_parameters_dict(parameters)
+
+    return to_query_parameters_list(parameters)
diff --git a/bigquery/google/cloud/bigquery/dbapi/connection.py b/bigquery/google/cloud/bigquery/dbapi/connection.py
new file mode 100644
index 0000000000000..66aa0929b97e8
--- /dev/null
+++ b/bigquery/google/cloud/bigquery/dbapi/connection.py
@@ -0,0 +1,58 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+"""Connection for the Google BigQuery DB-API."""
+
+from google.cloud import bigquery
+from google.cloud.bigquery.dbapi import cursor
+
+
+class Connection(object):
+    """DB-API Connection to Google BigQuery.
+
+    :type client: :class:`~google.cloud.bigquery.Client`
+    :param client: A client used to connect to BigQuery.
+    """
+    def __init__(self, client):
+        self._client = client
+
+    def close(self):
+        """No-op."""
+
+    def commit(self):
+        """No-op."""
+
+    def cursor(self):
+        """Return a new cursor object.
+
+        :rtype: :class:`~google.cloud.bigquery.dbapi.Cursor`
+        :returns: A DB-API cursor that uses this connection.
+        """
+        return cursor.Cursor(self)
+
+
+def connect(client=None):
+    """Construct a DB-API connection to Google BigQuery.
+
+    :type client: :class:`~google.cloud.bigquery.Client`
+    :param client:
+        (Optional) A client used to connect to BigQuery. If not passed, a
+        client is created using default options inferred from the environment.
+
+    :rtype: :class:`~google.cloud.bigquery.dbapi.Connection`
+    :returns: A new DB-API connection to BigQuery.
+    """
+    if client is None:
+        client = bigquery.Client()
+    return Connection(client)
diff --git a/bigquery/google/cloud/bigquery/dbapi/cursor.py b/bigquery/google/cloud/bigquery/dbapi/cursor.py
new file mode 100644
index 0000000000000..4398eec20b88c
--- /dev/null
+++ b/bigquery/google/cloud/bigquery/dbapi/cursor.py
@@ -0,0 +1,327 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+"""Cursor for the Google BigQuery DB-API."""
+
+import collections
+import uuid
+
+import six
+
+from google.cloud.bigquery.dbapi import _helpers
+from google.cloud.bigquery.dbapi import exceptions
+
+
+# Per PEP 249: A 7-item sequence containing information describing one result
+# column. The first two items (name and type_code) are mandatory, the other
+# five are optional and are set to None if no meaningful values can be
+# provided.
+Column = collections.namedtuple(
+    'Column',
+    [
+        'name', 'type_code', 'display_size', 'internal_size', 'precision',
+        'scale', 'null_ok',
+    ])
+
+
+class Cursor(object):
+    """DB-API Cursor to Google BigQuery.
+
+    :type connection: :class:`~google.cloud.bigquery.dbapi.Connection`
+    :param connection: A DB-API connection to Google BigQuery.
+    """
+    def __init__(self, connection):
+        self.connection = connection
+        self.description = None
+        # Per PEP 249: The attribute is -1 in case no .execute*() has been
+        # performed on the cursor or the rowcount of the last operation
+        # cannot be determined by the interface.
+        self.rowcount = -1
+        # Per PEP 249: The arraysize attribute defaults to 1, meaning to fetch
+        # a single row at a time.
+        self.arraysize = 1
+        self._query_data = None
+        self._page_token = None
+        self._has_fetched_all_rows = True
+
+    def close(self):
+        """No-op."""
+
+    def _set_description(self, schema):
+        """Set description from schema.
+
+        :type schema: Sequence[google.cloud.bigquery.schema.SchemaField]
+        :param schema: A description of fields in the schema.
+        """
+        if schema is None:
+            self.description = None
+            return
+
+        self.description = tuple([
+            Column(
+                name=field.name,
+                type_code=field.field_type,
+                display_size=None,
+                internal_size=None,
+                precision=None,
+                scale=None,
+                null_ok=field.mode == 'NULLABLE')
+            for field in schema])
+
+    def _set_rowcount(self, query_results):
+        """Set the rowcount from query results.
+
+        Normally, this sets rowcount to the number of rows returned by the
+        query, but if it was a DML statement, it sets rowcount to the number
+        of modified rows.
+
+        :type query_results:
+            :class:`~google.cloud.bigquery.query.QueryResults`
+        :param query_results: results of a query
+        """
+        total_rows = 0
+        num_dml_affected_rows = query_results.num_dml_affected_rows
+
+        if (query_results.total_rows is not None
+                and query_results.total_rows > 0):
+            total_rows = query_results.total_rows
+        if num_dml_affected_rows is not None and num_dml_affected_rows > 0:
+            total_rows = num_dml_affected_rows
+        self.rowcount = total_rows
+
+    def execute(self, operation, parameters=None):
+        """Prepare and execute a database operation.
+
+        .. note::
+            When setting query parameters, values which are "text"
+            (``unicode`` in Python2, ``str`` in Python3) will use
+            the 'STRING' BigQuery type. Values which are "bytes" (``str`` in
+            Python2, ``bytes`` in Python3), will use using the 'BYTES' type.
+
+            A `~datetime.datetime` parameter without timezone information uses
+            the 'DATETIME' BigQuery type (example: Global Pi Day Celebration
+            March 14, 2017 at 1:59pm). A `~datetime.datetime` parameter with
+            timezone information uses the 'TIMESTAMP' BigQuery type (example:
+            a wedding on April 29, 2011 at 11am, British Summer Time).
+
+            For more information about BigQuery data types, see:
+            https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types
+
+            ``STRUCT``/``RECORD`` and ``REPEATED`` query parameters are not
+            yet supported. See:
+            https://github.com/GoogleCloudPlatform/google-cloud-python/issues/3524
+
+        :type operation: str
+        :param operation: A Google BigQuery query string.
+
+        :type parameters: Mapping[str, Any] or Sequence[Any]
+        :param parameters:
+            (Optional) dictionary or sequence of parameter values.
+        """
+        self._query_results = None
+        self._page_token = None
+        self._has_fetched_all_rows = False
+        client = self.connection._client
+        job_id = str(uuid.uuid4())
+
+        # The DB-API uses the pyformat formatting, since the way BigQuery does
+        # query parameters was not one of the standard options. Convert both
+        # the query and the parameters to the format expected by the client
+        # libraries.
+        formatted_operation = _format_operation(
+            operation, parameters=parameters)
+        query_parameters = _helpers.to_query_parameters(parameters)
+
+        query_job = client.run_async_query(
+            job_id,
+            formatted_operation,
+            query_parameters=query_parameters)
+        query_job.use_legacy_sql = False
+        query_job.begin()
+        _helpers.wait_for_job(query_job)
+        query_results = query_job.results()
+
+        # Force the iterator to run because the query_results doesn't
+        # have the total_rows populated. See:
+        # https://github.com/GoogleCloudPlatform/google-cloud-python/issues/3506
+        query_iterator = query_results.fetch_data()
+        try:
+            six.next(iter(query_iterator))
+        except StopIteration:
+            pass
+
+        self._query_data = iter(
+            query_results.fetch_data(max_results=self.arraysize))
+        self._set_rowcount(query_results)
+        self._set_description(query_results.schema)
+
+    def executemany(self, operation, seq_of_parameters):
+        """Prepare and execute a database operation multiple times.
+
+        :type operation: str
+        :param operation: A Google BigQuery query string.
+
+        :type seq_of_parameters: Sequence[Mapping[str, Any] or Sequence[Any]]
+        :param parameters: Sequence of many sets of parameter values.
+        """
+        for parameters in seq_of_parameters:
+            self.execute(operation, parameters)
+
+    def fetchone(self):
+        """Fetch a single row from the results of the last ``execute*()`` call.
+
+        :rtype: tuple
+        :returns:
+            A tuple representing a row or ``None`` if no more data is
+            available.
+        :raises: :class:`~google.cloud.bigquery.dbapi.InterfaceError`
+            if called before ``execute()``.
+        """
+        if self._query_data is None:
+            raise exceptions.InterfaceError(
+                'No query results: execute() must be called before fetch.')
+
+        try:
+            return six.next(self._query_data)
+        except StopIteration:
+            return None
+
+    def fetchmany(self, size=None):
+        """Fetch multiple results from the last ``execute*()`` call.
+
+        .. note::
+            The size parameter is not used for the request/response size.
+            Set the ``arraysize`` attribute before calling ``execute()`` to
+            set the batch size.
+
+        :type size: int
+        :param size:
+            (Optional) Maximum number of rows to return. Defaults to the
+            ``arraysize`` property value.
+
+        :rtype: List[tuple]
+        :returns: A list of rows.
+        :raises: :class:`~google.cloud.bigquery.dbapi.InterfaceError`
+            if called before ``execute()``.
+        """
+        if self._query_data is None:
+            raise exceptions.InterfaceError(
+                'No query results: execute() must be called before fetch.')
+        if size is None:
+            size = self.arraysize
+
+        rows = []
+        for row in self._query_data:
+            rows.append(row)
+            if len(rows) >= size:
+                break
+        return rows
+
+    def fetchall(self):
+        """Fetch all remaining results from the last ``execute*()`` call.
+
+        :rtype: List[tuple]
+        :returns: A list of all the rows in the results.
+        :raises: :class:`~google.cloud.bigquery.dbapi.InterfaceError`
+            if called before ``execute()``.
+        """
+        if self._query_data is None:
+            raise exceptions.InterfaceError(
+                'No query results: execute() must be called before fetch.')
+        return [row for row in self._query_data]
+
+    def setinputsizes(self, sizes):
+        """No-op."""
+
+    def setoutputsize(self, size, column=None):
+        """No-op."""
+
+
+def _format_operation_list(operation, parameters):
+    """Formats parameters in operation in the way BigQuery expects.
+
+    The input operation will be a query like ``SELECT %s`` and the output
+    will be a query like ``SELECT ?``.
+
+    :type operation: str
+    :param operation: A Google BigQuery query string.
+
+    :type parameters: Sequence[Any]
+    :param parameters: Sequence of parameter values.
+
+    :rtype: str
+    :returns: A formatted query string.
+    :raises: :class:`~google.cloud.bigquery.dbapi.ProgrammingError`
+        if a parameter used in the operation is not found in the
+        ``parameters`` argument.
+    """
+    formatted_params = ['?' for _ in parameters]
+
+    try:
+        return operation % tuple(formatted_params)
+    except TypeError as exc:
+        raise exceptions.ProgrammingError(exc)
+
+
+def _format_operation_dict(operation, parameters):
+    """Formats parameters in operation in the way BigQuery expects.
+
+    The input operation will be a query like ``SELECT %(namedparam)s`` and
+    the output will be a query like ``SELECT @namedparam``.
+
+    :type operation: str
+    :param operation: A Google BigQuery query string.
+
+    :type parameters: Mapping[str, Any]
+    :param parameters: Dictionary of parameter values.
+
+    :rtype: str
+    :returns: A formatted query string.
+    :raises: :class:`~google.cloud.bigquery.dbapi.ProgrammingError`
+        if a parameter used in the operation is not found in the
+        ``parameters`` argument.
+    """
+    formatted_params = {}
+    for name in parameters:
+        escaped_name = name.replace('`', r'\`')
+        formatted_params[name] = '@`{}`'.format(escaped_name)
+
+    try:
+        return operation % formatted_params
+    except KeyError as exc:
+        raise exceptions.ProgrammingError(exc)
+
+
+def _format_operation(operation, parameters=None):
+    """Formats parameters in operation in way BigQuery expects.
+
+    :type: str
+    :param operation: A Google BigQuery query string.
+
+    :type: Mapping[str, Any] or Sequence[Any]
+    :param parameters: Optional parameter values.
+
+    :rtype: str
+    :returns: A formatted query string.
+    :raises: :class:`~google.cloud.bigquery.dbapi.ProgrammingError`
+        if a parameter used in the operation is not found in the
+        ``parameters`` argument.
+    """
+    if parameters is None:
+        return operation
+
+    if isinstance(parameters, collections.Mapping):
+        return _format_operation_dict(operation, parameters)
+
+    return _format_operation_list(operation, parameters)
diff --git a/bigquery/google/cloud/bigquery/dbapi/exceptions.py b/bigquery/google/cloud/bigquery/dbapi/exceptions.py
new file mode 100644
index 0000000000000..77494e5ff1e13
--- /dev/null
+++ b/bigquery/google/cloud/bigquery/dbapi/exceptions.py
@@ -0,0 +1,58 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+"""Exceptions used in the Google BigQuery DB-API."""
+
+
+class Warning(Exception):
+    """Exception raised for important DB-API warnings."""
+
+
+class Error(Exception):
+    """Exception representing all non-warning DB-API errors."""
+
+
+class InterfaceError(Error):
+    """DB-API error related to the database interface."""
+
+
+class DatabaseError(Error):
+    """DB-API error related to the database."""
+
+
+class DataError(DatabaseError):
+    """DB-API error due to problems with the processed data."""
+
+
+class OperationalError(DatabaseError):
+    """DB-API error related to the database operation.
+
+    These errors are not necessarily under the control of the programmer.
+    """
+
+
+class IntegrityError(DatabaseError):
+    """DB-API error when integrity of the database is affected."""
+
+
+class InternalError(DatabaseError):
+    """DB-API error when the database encounters an internal error."""
+
+
+class ProgrammingError(DatabaseError):
+    """DB-API exception raised for programming errors."""
+
+
+class NotSupportedError(DatabaseError):
+    """DB-API error for operations not supported by the database or API."""
diff --git a/bigquery/google/cloud/bigquery/dbapi/types.py b/bigquery/google/cloud/bigquery/dbapi/types.py
new file mode 100644
index 0000000000000..2d06f260e360c
--- /dev/null
+++ b/bigquery/google/cloud/bigquery/dbapi/types.py
@@ -0,0 +1,84 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+"""Types used in the Google BigQuery DB-API.
+
+See `PEP-249`_ for details.
+
+.. _PEP-249:
+    https://www.python.org/dev/peps/pep-0249/#type-objects-and-constructors
+"""
+
+import datetime
+
+
+Date = datetime.date
+Time = datetime.time
+Timestamp = datetime.datetime
+DateFromTicks = datetime.date.fromtimestamp
+TimestampFromTicks = datetime.datetime.fromtimestamp
+
+
+def Binary(string):
+    """Contruct a DB-API binary value.
+
+    :type string: str
+    :param string: A string to encode as a binary value.
+
+    :rtype: bytes
+    :returns: The UTF-8 encoded bytes representing the string.
+    """
+    return string.encode('utf-8')
+
+
+def TimeFromTicks(ticks, tz=None):
+    """Construct a DB-API time value from the given ticks value.
+
+    :type ticks: float
+    :param ticks:
+        a number of seconds since the epoch; see the documentation of the
+        standard Python time module for details.
+
+    :type tz: :class:`datetime.tzinfo`
+    :param tz: (Optional) time zone to use for conversion
+
+    :rtype: :class:`datetime.time`
+    :returns: time represented by ticks.
+    """
+    dt = datetime.datetime.fromtimestamp(ticks, tz=tz)
+    return dt.timetz()
+
+
+class _DBAPITypeObject(object):
+    """DB-API type object which compares equal to many different strings.
+
+    See `PEP-249`_ for details.
+
+    .. _PEP-249:
+        https://www.python.org/dev/peps/pep-0249/#implementation-hints-for-module-authors
+    """
+
+    def __init__(self, *values):
+        self.values = values
+
+    def __eq__(self, other):
+        return other in self.values
+
+
+STRING = 'STRING'
+BINARY = _DBAPITypeObject('BYTES', 'RECORD', 'STRUCT')
+NUMBER = _DBAPITypeObject(
+    'INTEGER', 'INT64', 'FLOAT', 'FLOAT64', 'BOOLEAN', 'BOOL')
+DATETIME = _DBAPITypeObject('TIMESTAMP', 'DATE', 'TIME', 'DATETIME')
+ROWID = 'ROWID'
diff --git a/bigquery/tests/system.py b/bigquery/tests/system.py
index cfd2c4856c80b..3391ec2bd2d86 100644
--- a/bigquery/tests/system.py
+++ b/bigquery/tests/system.py
@@ -22,6 +22,7 @@
 
 from google.cloud import bigquery
 from google.cloud._helpers import UTC
+from google.cloud.bigquery import dbapi
 from google.cloud.exceptions import Forbidden
 
 from test_utils.retry import RetryErrors
@@ -70,10 +71,12 @@ class Config(object):
     global state.
     """
     CLIENT = None
+    CURSOR = None
 
 
 def setUpModule():
     Config.CLIENT = bigquery.Client()
+    Config.CURSOR = dbapi.connect(Config.CLIENT).cursor()
 
 
 class TestBigQuery(unittest.TestCase):
@@ -376,9 +379,6 @@ def test_load_table_from_local_file_then_dump_table(self):
                     write_disposition='WRITE_EMPTY',
                 )
 
-        def _job_done(instance):
-            return instance.state.lower() == 'done'
-
         # Retry until done.
         retry = RetryInstanceState(_job_done, max_tries=8)
         retry(job.reload)()
@@ -417,9 +417,6 @@ def test_load_table_from_local_avro_file_then_dump_table(self):
                 write_disposition='WRITE_TRUNCATE'
             )
 
-        def _job_done(instance):
-            return instance.state.lower() == 'done'
-
         # Retry until done.
         retry = RetryInstanceState(_job_done, max_tries=8)
         retry(job.reload)()
@@ -492,9 +489,6 @@ def test_load_table_from_storage_then_dump_table(self):
 
         job.begin()
 
-        def _job_done(instance):
-            return instance.state in ('DONE', 'done')
-
         # Allow for 90 seconds of "warm up" before rows visible.  See
         # https://cloud.google.com/bigquery/streaming-data-into-bigquery#dataavailability
         # 8 tries -> 1 + 2 + 4 + 8 + 16 + 32 + 64 = 127 seconds
@@ -528,9 +522,6 @@ def test_job_cancel(self):
         job.begin()
         job.cancel()
 
-        def _job_done(instance):
-            return instance.state in ('DONE', 'done')
-
         retry = RetryInstanceState(_job_done, max_tries=8)
         retry(job.reload)()
 
@@ -544,7 +535,7 @@ def test_sync_query_w_legacy_sql_types(self):
         naive = datetime.datetime(2016, 12, 5, 12, 41, 9)
         stamp = '%s %s' % (naive.date().isoformat(), naive.time().isoformat())
         zoned = naive.replace(tzinfo=UTC)
-        EXAMPLES = [
+        examples = [
             {
                 'sql': 'SELECT 1',
                 'expected': 1,
@@ -570,7 +561,7 @@ def test_sync_query_w_legacy_sql_types(self):
                 'expected': zoned,
             },
         ]
-        for example in EXAMPLES:
+        for example in examples:
             query = Config.CLIENT.run_sync_query(example['sql'])
             query.use_legacy_sql = True
             query.run()
@@ -578,11 +569,11 @@ def test_sync_query_w_legacy_sql_types(self):
             self.assertEqual(len(query.rows[0]), 1)
             self.assertEqual(query.rows[0][0], example['expected'])
 
-    def test_sync_query_w_standard_sql_types(self):
+    def _generate_standard_sql_types_examples(self):
         naive = datetime.datetime(2016, 12, 5, 12, 41, 9)
         stamp = '%s %s' % (naive.date().isoformat(), naive.time().isoformat())
         zoned = naive.replace(tzinfo=UTC)
-        EXAMPLES = [
+        return [
             {
                 'sql': 'SELECT 1',
                 'expected': 1,
@@ -659,7 +650,10 @@ def test_sync_query_w_standard_sql_types(self):
                 'expected': [{u'_field_1': [1, 2]}],
             },
         ]
-        for example in EXAMPLES:
+
+    def test_sync_query_w_standard_sql_types(self):
+        examples = self._generate_standard_sql_types_examples()
+        for example in examples:
             query = Config.CLIENT.run_sync_query(example['sql'])
             query.use_legacy_sql = False
             query.run()
@@ -667,6 +661,80 @@ def test_sync_query_w_standard_sql_types(self):
             self.assertEqual(len(query.rows[0]), 1)
             self.assertEqual(query.rows[0][0], example['expected'])
 
+    def test_dbapi_w_standard_sql_types(self):
+        examples = self._generate_standard_sql_types_examples()
+        for example in examples:
+            Config.CURSOR.execute(example['sql'])
+            self.assertEqual(Config.CURSOR.rowcount, 1)
+            row = Config.CURSOR.fetchone()
+            self.assertEqual(len(row), 1)
+            self.assertEqual(row[0], example['expected'])
+            row = Config.CURSOR.fetchone()
+            self.assertIsNone(row)
+
+    def _load_table_for_dml(self, rows, dataset_name, table_name):
+        import csv
+        from google.cloud._testing import _NamedTemporaryFile
+
+        dataset = Config.CLIENT.dataset(dataset_name)
+        retry_403(dataset.create)()
+        self.to_delete.append(dataset)
+
+        greeting = bigquery.SchemaField(
+            'greeting', 'STRING', mode='NULLABLE')
+        table = dataset.table(table_name, schema=[greeting])
+        table.create()
+        self.to_delete.insert(0, table)
+
+        with _NamedTemporaryFile() as temp:
+            with open(temp.name, 'w') as csv_write:
+                writer = csv.writer(csv_write)
+                writer.writerow(('Greeting',))
+                writer.writerows(rows)
+
+            with open(temp.name, 'rb') as csv_read:
+                job = table.upload_from_file(
+                    csv_read,
+                    source_format='CSV',
+                    skip_leading_rows=1,
+                    create_disposition='CREATE_NEVER',
+                    write_disposition='WRITE_EMPTY',
+                )
+
+        # Retry until done.
+        retry = RetryInstanceState(_job_done, max_tries=8)
+        retry(job.reload)()
+        self._fetch_single_page(table)
+
+    def test_sync_query_w_dml(self):
+        dataset_name = _make_dataset_name('dml_tests')
+        table_name = 'test_table'
+        self._load_table_for_dml([('Hello World',)], dataset_name, table_name)
+        query_template = """UPDATE {}.{}
+            SET greeting = 'Guten Tag'
+            WHERE greeting = 'Hello World'
+            """
+
+        query = Config.CLIENT.run_sync_query(
+            query_template.format(dataset_name, table_name))
+        query.use_legacy_sql = False
+        query.run()
+
+        self.assertEqual(query.num_dml_affected_rows, 1)
+
+    def test_dbapi_w_dml(self):
+        dataset_name = _make_dataset_name('dml_tests')
+        table_name = 'test_table'
+        self._load_table_for_dml([('Hello World',)], dataset_name, table_name)
+        query_template = """UPDATE {}.{}
+            SET greeting = 'Guten Tag'
+            WHERE greeting = 'Hello World'
+            """
+
+        Config.CURSOR.execute(query_template.format(dataset_name, table_name))
+        self.assertEqual(Config.CURSOR.rowcount, 1)
+        self.assertIsNone(Config.CURSOR.fetchone())
+
     def test_sync_query_w_query_params(self):
         from google.cloud.bigquery._helpers import ArrayQueryParameter
         from google.cloud.bigquery._helpers import ScalarQueryParameter
@@ -729,7 +797,7 @@ def test_sync_query_w_query_params(self):
             name='friends', array_type='STRING',
             values=[phred_name, bharney_name])
         with_friends_param = StructQueryParameter(None, friends_param)
-        EXAMPLES = [
+        examples = [
             {
                 'sql': 'SELECT @question',
                 'expected': question,
@@ -809,7 +877,7 @@ def test_sync_query_w_query_params(self):
                 'query_parameters': [with_friends_param],
             },
         ]
-        for example in EXAMPLES:
+        for example in examples:
             query = Config.CLIENT.run_sync_query(
                 example['sql'],
                 query_parameters=example['query_parameters'])
@@ -819,6 +887,105 @@ def test_sync_query_w_query_params(self):
             self.assertEqual(len(query.rows[0]), 1)
             self.assertEqual(query.rows[0][0], example['expected'])
 
+    def test_dbapi_w_query_parameters(self):
+        examples = [
+            {
+                'sql': 'SELECT %(boolval)s',
+                'expected': True,
+                'query_parameters': {
+                    'boolval': True,
+                },
+            },
+            {
+                'sql': 'SELECT %(a "very" weird `name`)s',
+                'expected': True,
+                'query_parameters': {
+                    'a "very" weird `name`': True,
+                },
+            },
+            {
+                'sql': 'SELECT %(select)s',
+                'expected': True,
+                'query_parameters': {
+                    'select': True,  # this name is a keyword
+                },
+            },
+            {
+                'sql': 'SELECT %s',
+                'expected': False,
+                'query_parameters': [False],
+            },
+            {
+                'sql': 'SELECT %(intval)s',
+                'expected': 123,
+                'query_parameters': {
+                    'intval': 123,
+                },
+            },
+            {
+                'sql': 'SELECT %s',
+                'expected': -123456789,
+                'query_parameters': [-123456789],
+            },
+            {
+                'sql': 'SELECT %(floatval)s',
+                'expected': 1.25,
+                'query_parameters': {
+                    'floatval': 1.25,
+                },
+            },
+            {
+                'sql': 'SELECT LOWER(%(strval)s)',
+                'query_parameters': {
+                    'strval': 'I Am A String',
+                },
+                'expected': 'i am a string',
+            },
+            {
+                'sql': 'SELECT DATE_SUB(%(dateval)s, INTERVAL 1 DAY)',
+                'query_parameters': {
+                    'dateval': datetime.date(2017, 4, 2),
+                },
+                'expected': datetime.date(2017, 4, 1),
+            },
+            {
+                'sql': 'SELECT TIME_ADD(%(timeval)s, INTERVAL 4 SECOND)',
+                'query_parameters': {
+                    'timeval': datetime.time(12, 34, 56),
+                },
+                'expected': datetime.time(12, 35, 0),
+            },
+            {
+                'sql': (
+                    'SELECT DATETIME_ADD(%(datetimeval)s, INTERVAL 53 SECOND)'
+                ),
+                'query_parameters': {
+                    'datetimeval': datetime.datetime(2012, 3, 4, 5, 6, 7),
+                },
+                'expected': datetime.datetime(2012, 3, 4, 5, 7, 0),
+            },
+            {
+                'sql': 'SELECT TIMESTAMP_TRUNC(%(zoned)s, MINUTE)',
+                'query_parameters': {
+                    'zoned': datetime.datetime(
+                        2012, 3, 4, 5, 6, 7, tzinfo=UTC),
+                },
+                'expected': datetime.datetime(2012, 3, 4, 5, 6, 0, tzinfo=UTC),
+            },
+        ]
+        for example in examples:
+            msg = 'sql: {} query_parameters: {}'.format(
+                example['sql'], example['query_parameters'])
+
+            Config.CURSOR.execute(example['sql'], example['query_parameters'])
+
+            self.assertEqual(Config.CURSOR.rowcount, 1, msg=msg)
+            row = Config.CURSOR.fetchone()
+            self.assertEqual(len(row), 1, msg=msg)
+            self.assertEqual(row[0], example['expected'], msg=msg)
+            row = Config.CURSOR.fetchone()
+            self.assertIsNone(row, msg=msg)
+
     def test_dump_table_w_public_data(self):
         PUBLIC = 'bigquery-public-data'
         DATASET_NAME = 'samples'
@@ -950,3 +1117,7 @@ def test_create_table_insert_fetch_nested_schema(self):
             parts = time.strptime(expected[7], '%Y-%m-%dT%H:%M:%S')
             e_favtime = datetime.datetime(*parts[0:6])
             self.assertEqual(found[7], e_favtime)              # FavoriteTime
+
+
+def _job_done(instance):
+    return instance.state.lower() == 'done'
diff --git a/bigquery/tests/unit/test_dbapi__helpers.py b/bigquery/tests/unit/test_dbapi__helpers.py
new file mode 100644
index 0000000000000..e030ed49df0c4
--- /dev/null
+++ b/bigquery/tests/unit/test_dbapi__helpers.py
@@ -0,0 +1,134 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+import datetime
+import math
+import unittest
+
+import mock
+
+import google.cloud._helpers
+from google.cloud.bigquery.dbapi import _helpers
+from google.cloud.bigquery.dbapi import exceptions
+
+
+class Test_wait_for_job(unittest.TestCase):
+
+    def _mock_job(self):
+        from google.cloud.bigquery import job
+        mock_job = mock.create_autospec(job.QueryJob)
+        mock_job.state = 'RUNNING'
+        mock_job._mocked_iterations = 0
+
+        def mock_reload():
+            mock_job._mocked_iterations += 1
+            if mock_job._mocked_iterations >= 2:
+                mock_job.state = 'DONE'
+
+        mock_job.reload.side_effect = mock_reload
+        return mock_job
+
+    def _call_fut(self, job):
+        from google.cloud.bigquery.dbapi._helpers import wait_for_job
+        with mock.patch('time.sleep'):
+            wait_for_job(job)
+
+    def test_wo_error(self):
+        mock_job = self._mock_job()
+        mock_job.error_result = None
+        self._call_fut(mock_job)
+        self.assertEqual('DONE', mock_job.state)
+
+    def test_w_error(self):
+        from google.cloud.bigquery.dbapi import exceptions
+        mock_job = self._mock_job()
+        mock_job.error_result = {'reason': 'invalidQuery'}
+        self.assertRaises(exceptions.DatabaseError, self._call_fut, mock_job)
+        self.assertEqual('DONE', mock_job.state)
+
+
+class TestQueryParameters(unittest.TestCase):
+
+    def test_scalar_to_query_parameter(self):
+        expected_types = [
+            (True, 'BOOL'),
+            (False, 'BOOL'),
+            (123, 'INT64'),
+            (-123456789, 'INT64'),
+            (1.25, 'FLOAT64'),
+            (b'I am some bytes', 'BYTES'),
+            (u'I am a string', 'STRING'),
+            (datetime.date(2017, 4, 1), 'DATE'),
+            (datetime.time(12, 34, 56), 'TIME'),
+            (datetime.datetime(2012, 3, 4, 5, 6, 7), 'DATETIME'),
+            (
+                datetime.datetime(
+                    2012, 3, 4, 5, 6, 7, tzinfo=google.cloud._helpers.UTC),
+                'TIMESTAMP',
+            ),
+        ]
+        for value, expected_type in expected_types:
+            msg = 'value: {} expected_type: {}'.format(value, expected_type)
+            parameter = _helpers.scalar_to_query_parameter(value)
+            self.assertIsNone(parameter.name, msg=msg)
+            self.assertEqual(parameter.type_, expected_type, msg=msg)
+            self.assertEqual(parameter.value, value, msg=msg)
+            named_parameter = _helpers.scalar_to_query_parameter(
+                value, name='myvar')
+            self.assertEqual(named_parameter.name, 'myvar', msg=msg)
+            self.assertEqual(named_parameter.type_, expected_type, msg=msg)
+            self.assertEqual(named_parameter.value, value, msg=msg)
+
+    def test_scalar_to_query_parameter_w_unexpected_type(self):
+        with self.assertRaises(exceptions.ProgrammingError):
+            _helpers.scalar_to_query_parameter(value={'a': 'dictionary'})
+
+    def test_scalar_to_query_parameter_w_special_floats(self):
+        nan_parameter = _helpers.scalar_to_query_parameter(float('nan'))
+        self.assertTrue(math.isnan(nan_parameter.value))
+        self.assertEqual(nan_parameter.type_, 'FLOAT64')
+        inf_parameter = _helpers.scalar_to_query_parameter(float('inf'))
+        self.assertTrue(math.isinf(inf_parameter.value))
+        self.assertEqual(inf_parameter.type_, 'FLOAT64')
+
+    def test_to_query_parameters_w_dict(self):
+        parameters = {
+            'somebool': True,
+            'somestring': u'a-string-value',
+        }
+        query_parameters = _helpers.to_query_parameters(parameters)
+        query_parameter_tuples = []
+        for param in query_parameters:
+            query_parameter_tuples.append(
+                (param.name, param.type_, param.value))
+        self.assertSequenceEqual(
+            sorted(query_parameter_tuples),
+            sorted([
+                ('somebool', 'BOOL', True),
+                ('somestring', 'STRING', u'a-string-value'),
+            ]))
+
+    def test_to_query_parameters_w_list(self):
+        parameters = [True, u'a-string-value']
+        query_parameters = _helpers.to_query_parameters(parameters)
+        query_parameter_tuples = []
+        for param in query_parameters:
+            query_parameter_tuples.append(
+                (param.name, param.type_, param.value))
+        self.assertSequenceEqual(
+            sorted(query_parameter_tuples),
+            sorted([
+                (None, 'BOOL', True),
+                (None, 'STRING', u'a-string-value'),
+            ]))
diff --git a/bigquery/tests/unit/test_dbapi_connection.py b/bigquery/tests/unit/test_dbapi_connection.py
new file mode 100644
index 0000000000000..d30852377852a
--- /dev/null
+++ b/bigquery/tests/unit/test_dbapi_connection.py
@@ -0,0 +1,73 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+import unittest
+
+import mock
+
+
+class TestConnection(unittest.TestCase):
+
+    @staticmethod
+    def _get_target_class():
+        from google.cloud.bigquery.dbapi import Connection
+        return Connection
+
+    def _make_one(self, *args, **kw):
+        return self._get_target_class()(*args, **kw)
+
+    def _mock_client(self, rows=None, schema=None):
+        from google.cloud.bigquery import client
+        mock_client = mock.create_autospec(client.Client)
+        return mock_client
+
+    def test_ctor(self):
+        from google.cloud.bigquery.dbapi import Connection
+        mock_client = self._mock_client()
+        connection = self._make_one(client=mock_client)
+        self.assertIsInstance(connection, Connection)
+        self.assertIs(connection._client, mock_client)
+
+    @mock.patch('google.cloud.bigquery.Client', autospec=True)
+    def test_connect_wo_client(self, mock_client):
+        from google.cloud.bigquery.dbapi import connect
+        from google.cloud.bigquery.dbapi import Connection
+        connection = connect()
+        self.assertIsInstance(connection, Connection)
+        self.assertIsNotNone(connection._client)
+
+    def test_connect_w_client(self):
+        from google.cloud.bigquery.dbapi import connect
+        from google.cloud.bigquery.dbapi import Connection
+        mock_client = self._mock_client()
+        connection = connect(client=mock_client)
+        self.assertIsInstance(connection, Connection)
+        self.assertIs(connection._client, mock_client)
+
+    def test_close(self):
+        connection = self._make_one(client=self._mock_client())
+        # close() is a no-op, there is nothing to test.
+        connection.close()
+
+    def test_commit(self):
+        connection = self._make_one(client=self._mock_client())
+        # commit() is a no-op, there is nothing to test.
+        connection.commit()
+
+    def test_cursor(self):
+        from google.cloud.bigquery.dbapi import Cursor
+        connection = self._make_one(client=self._mock_client())
+        cursor = connection.cursor()
+        self.assertIsInstance(cursor, Cursor)
+        self.assertIs(cursor.connection, connection)
diff --git a/bigquery/tests/unit/test_dbapi_cursor.py b/bigquery/tests/unit/test_dbapi_cursor.py
new file mode 100644
index 0000000000000..901d2f176785f
--- /dev/null
+++ b/bigquery/tests/unit/test_dbapi_cursor.py
@@ -0,0 +1,269 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+import unittest
+
+import mock
+
+
+class TestCursor(unittest.TestCase):
+
+    @staticmethod
+    def _get_target_class():
+        from google.cloud.bigquery.dbapi import Cursor
+        return Cursor
+
+    def _make_one(self, *args, **kw):
+        return self._get_target_class()(*args, **kw)
+
+    def _mock_client(
+            self, rows=None, schema=None, num_dml_affected_rows=None):
+        from google.cloud.bigquery import client
+        mock_client = mock.create_autospec(client.Client)
+        mock_client.run_async_query.return_value = self._mock_job(
+            rows=rows, schema=schema,
+            num_dml_affected_rows=num_dml_affected_rows)
+        return mock_client
+
+    def _mock_job(
+            self, rows=None, schema=None, num_dml_affected_rows=None):
+        from google.cloud.bigquery import job
+        mock_job = mock.create_autospec(job.QueryJob)
+        mock_job.error_result = None
+        mock_job.state = 'DONE'
+        mock_job.results.return_value = self._mock_results(
+            rows=rows, schema=schema,
+            num_dml_affected_rows=num_dml_affected_rows)
+        return mock_job
+
+    def _mock_results(
+            self, rows=None, schema=None, num_dml_affected_rows=None):
+        from google.cloud.bigquery import query
+        mock_results = mock.create_autospec(query.QueryResults)
+        mock_results.schema = schema
+        mock_results.num_dml_affected_rows = num_dml_affected_rows
+
+        if rows is None:
+            mock_results.total_rows = 0
+        else:
+            mock_results.total_rows = len(rows)
+
+        mock_results.fetch_data.return_value = rows
+        return mock_results
+
+    def test_ctor(self):
+        from google.cloud.bigquery.dbapi import connect
+        from google.cloud.bigquery.dbapi import Cursor
+        connection = connect(self._mock_client())
+        cursor = self._make_one(connection)
+        self.assertIsInstance(cursor, Cursor)
+        self.assertIs(cursor.connection, connection)
+
+    def test_close(self):
+        from google.cloud.bigquery.dbapi import connect
+        connection = connect(self._mock_client())
+        cursor = connection.cursor()
+        # close() is a no-op, there is nothing to test.
+        cursor.close()
+
+    def test_fetchone_wo_execute_raises_error(self):
+        from google.cloud.bigquery import dbapi
+        connection = dbapi.connect(self._mock_client())
+        cursor = connection.cursor()
+        self.assertRaises(dbapi.Error, cursor.fetchone)
+
+    def test_fetchone_w_row(self):
+        from google.cloud.bigquery import dbapi
+        connection = dbapi.connect(
+            self._mock_client(rows=[(1,)]))
+        cursor = connection.cursor()
+        cursor.execute('SELECT 1;')
+        row = cursor.fetchone()
+        self.assertEquals(row, (1,))
+        self.assertIsNone(cursor.fetchone())
+
+    def test_fetchmany_wo_execute_raises_error(self):
+        from google.cloud.bigquery import dbapi
+        connection = dbapi.connect(self._mock_client())
+        cursor = connection.cursor()
+        self.assertRaises(dbapi.Error, cursor.fetchmany)
+
+    def test_fetchmany_w_row(self):
+        from google.cloud.bigquery import dbapi
+        connection = dbapi.connect(
+            self._mock_client(rows=[(1,)]))
+        cursor = connection.cursor()
+        cursor.execute('SELECT 1;')
+        rows = cursor.fetchmany()
+        self.assertEquals(len(rows), 1)
+        self.assertEquals(rows[0], (1,))
+
+    def test_fetchmany_w_size(self):
+        from google.cloud.bigquery import dbapi
+        connection = dbapi.connect(
+            self._mock_client(
+                rows=[
+                    (1, 2, 3),
+                    (4, 5, 6),
+                    (7, 8, 9),
+                ]))
+        cursor = connection.cursor()
+        cursor.execute('SELECT a, b, c;')
+        rows = cursor.fetchmany(size=2)
+        self.assertEquals(len(rows), 2)
+        self.assertEquals(rows[0], (1, 2, 3))
+        self.assertEquals(rows[1], (4, 5, 6))
+        second_page = cursor.fetchmany(size=2)
+        self.assertEquals(len(second_page), 1)
+        self.assertEquals(second_page[0], (7, 8, 9))
+        third_page = cursor.fetchmany(size=2)
+        self.assertEquals(third_page, [])
+
+    def test_fetchmany_w_arraysize(self):
+        from google.cloud.bigquery import dbapi
+        connection = dbapi.connect(
+            self._mock_client(
+                rows=[
+                    (1, 2, 3),
+                    (4, 5, 6),
+                    (7, 8, 9),
+                ]))
+        cursor = connection.cursor()
+        cursor.arraysize = 2
+        cursor.execute('SELECT a, b, c;')
+        rows = cursor.fetchmany()
+        self.assertEquals(len(rows), 2)
+        self.assertEquals(rows[0], (1, 2, 3))
+        self.assertEquals(rows[1], (4, 5, 6))
+        second_page = cursor.fetchmany()
+        self.assertEquals(len(second_page), 1)
+        self.assertEquals(second_page[0], (7, 8, 9))
+        third_page = cursor.fetchmany()
+        self.assertEquals(third_page, [])
+
+    def test_fetchall_wo_execute_raises_error(self):
+        from google.cloud.bigquery import dbapi
+        connection = dbapi.connect(self._mock_client())
+        cursor = connection.cursor()
+        self.assertRaises(dbapi.Error, cursor.fetchall)
+
+    def test_fetchall_w_row(self):
+        from google.cloud.bigquery import dbapi
+        connection = dbapi.connect(
+            self._mock_client(rows=[(1,)]))
+        cursor = connection.cursor()
+        cursor.execute('SELECT 1;')
+        self.assertIsNone(cursor.description)
+        self.assertEquals(cursor.rowcount, 1)
+        rows = cursor.fetchall()
+        self.assertEquals(len(rows), 1)
+        self.assertEquals(rows[0], (1,))
+
+    def test_execute_w_dml(self):
+        from google.cloud.bigquery.dbapi import connect
+        connection = connect(
+            self._mock_client(rows=[], num_dml_affected_rows=12))
+        cursor = connection.cursor()
+        cursor.execute('DELETE FROM UserSessions WHERE user_id = \'test\';')
+        self.assertIsNone(cursor.description)
+        self.assertEquals(cursor.rowcount, 12)
+
+    def test_execute_w_query(self):
+        from google.cloud.bigquery.schema import SchemaField
+        from google.cloud.bigquery import dbapi
+
+        connection = dbapi.connect(self._mock_client(
+            rows=[('hello', 'world', 1), ('howdy', 'y\'all', 2)],
+            schema=[
+                SchemaField('a', 'STRING', mode='NULLABLE'),
+                SchemaField('b', 'STRING', mode='REQUIRED'),
+                SchemaField('c', 'INTEGER', mode='NULLABLE')]))
+        cursor = connection.cursor()
+        cursor.execute('SELECT a, b, c FROM hello_world WHERE d > 3;')
+
+        # Verify the description.
+        self.assertEquals(len(cursor.description), 3)
+        a_name, a_type, _, _, _, _, a_null_ok = cursor.description[0]
+        self.assertEquals(a_name, 'a')
+        self.assertEquals(a_type, 'STRING')
+        self.assertEquals(a_type, dbapi.STRING)
+        self.assertTrue(a_null_ok)
+        b_name, b_type, _, _, _, _, b_null_ok = cursor.description[1]
+        self.assertEquals(b_name, 'b')
+        self.assertEquals(b_type, 'STRING')
+        self.assertEquals(b_type, dbapi.STRING)
+        self.assertFalse(b_null_ok)
+        c_name, c_type, _, _, _, _, c_null_ok = cursor.description[2]
+        self.assertEquals(c_name, 'c')
+        self.assertEquals(c_type, 'INTEGER')
+        self.assertEquals(c_type, dbapi.NUMBER)
+        self.assertTrue(c_null_ok)
+
+        # Verify the results.
+        self.assertEquals(cursor.rowcount, 2)
+        row = cursor.fetchone()
+        self.assertEquals(row, ('hello', 'world', 1))
+        row = cursor.fetchone()
+        self.assertEquals(row, ('howdy', 'y\'all', 2))
+        row = cursor.fetchone()
+        self.assertIsNone(row)
+
+    def test_executemany_w_dml(self):
+        from google.cloud.bigquery.dbapi import connect
+        connection = connect(
+            self._mock_client(rows=[], num_dml_affected_rows=12))
+        cursor = connection.cursor()
+        cursor.executemany(
+            'DELETE FROM UserSessions WHERE user_id = %s;',
+            (('test',), ('anothertest',)))
+        self.assertIsNone(cursor.description)
+        self.assertEquals(cursor.rowcount, 12)
+
+    def test__format_operation_w_dict(self):
+        from google.cloud.bigquery.dbapi import cursor
+        formatted_operation = cursor._format_operation(
+            'SELECT %(somevalue)s, %(a `weird` one)s;',
+            {
+                'somevalue': 'hi',
+                'a `weird` one': 'world',
+            })
+        self.assertEquals(
+            formatted_operation, 'SELECT @`somevalue`, @`a \\`weird\\` one`;')
+
+    def test__format_operation_w_wrong_dict(self):
+        from google.cloud.bigquery import dbapi
+        from google.cloud.bigquery.dbapi import cursor
+        self.assertRaises(
+            dbapi.ProgrammingError,
+            cursor._format_operation,
+            'SELECT %(somevalue)s, %(othervalue)s;',
+            {
+                'somevalue-not-here': 'hi',
+                'othervalue': 'world',
+            })
+
+    def test__format_operation_w_sequence(self):
+        from google.cloud.bigquery.dbapi import cursor
+        formatted_operation = cursor._format_operation(
+            'SELECT %s, %s;', ('hello', 'world'))
+        self.assertEquals(formatted_operation, 'SELECT ?, ?;')
+
+    def test__format_operation_w_too_short_sequence(self):
+        from google.cloud.bigquery import dbapi
+        from google.cloud.bigquery.dbapi import cursor
+        self.assertRaises(
+            dbapi.ProgrammingError,
+            cursor._format_operation,
+            'SELECT %s, %s;',
+            ('hello',))
diff --git a/bigquery/tests/unit/test_dbapi_types.py b/bigquery/tests/unit/test_dbapi_types.py
new file mode 100644
index 0000000000000..afd45b259263e
--- /dev/null
+++ b/bigquery/tests/unit/test_dbapi_types.py
@@ -0,0 +1,40 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+import datetime
+import unittest
+
+import google.cloud._helpers
+from google.cloud.bigquery.dbapi import types
+
+
+class TestTypes(unittest.TestCase):
+    def test_binary_type(self):
+        self.assertEqual('BYTES', types.BINARY)
+        self.assertEqual('RECORD', types.BINARY)
+        self.assertEqual('STRUCT', types.BINARY)
+        self.assertNotEqual('STRING', types.BINARY)
+
+    def test_binary_constructor(self):
+        self.assertEqual(types.Binary(u'hello'), b'hello')
+        self.assertEqual(types.Binary(u'\u1f60'), u'\u1f60'.encode('utf-8'))
+
+    def test_timefromticks(self):
+        somedatetime = datetime.datetime(
+            2017, 2, 18, 12, 47, 26, tzinfo=google.cloud._helpers.UTC)
+        epoch = datetime.datetime(1970, 1, 1, tzinfo=google.cloud._helpers.UTC)
+        ticks = (somedatetime - epoch).total_seconds()
+        self.assertEqual(
+            types.TimeFromTicks(ticks, google.cloud._helpers.UTC),
+            datetime.time(12, 47, 26, tzinfo=google.cloud._helpers.UTC))

From 66a9258e9e9aeb4c3a34c7a211d520bf00108a44 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Wed, 12 Jul 2017 17:17:19 -0400
Subject: [PATCH 076/211] Spanner p0 system tests (batch #2) (#3604)

* Defend against back-end returning instance configs for disallowed regions.

* Additional system tests for 'Snapshot.read':

- Read single key.
- Read multiple keys.
- Read open-closed ranges.
- Read open-open ranges.
- Read closed-open ranges.
- Read closed-closed ranges.
- Read timestamp.
- Min read timestamp.
- Max staleness.
- Exact staleness.
- Strong.

* Additional system tests for 'Snapshot.execute_sql':

- Query returning 'ARRAY<STRUCT>'.
- Bind INT64 parameter to null.
---
 spanner/tests/system/test_system.py | 132 ++++++++++++++++++++++++++--
 1 file changed, 123 insertions(+), 9 deletions(-)

diff --git a/spanner/tests/system/test_system.py b/spanner/tests/system/test_system.py
index b1ce6c892e3e5..b4ac62194bb1b 100644
--- a/spanner/tests/system/test_system.py
+++ b/spanner/tests/system/test_system.py
@@ -33,6 +33,7 @@
 from google.cloud.exceptions import GrpcRendezvous
 from google.cloud.spanner._helpers import TimestampWithNanoseconds
 from google.cloud.spanner.client import Client
+from google.cloud.spanner.keyset import KeyRange
 from google.cloud.spanner.keyset import KeySet
 from google.cloud.spanner.pool import BurstyPool
 
@@ -87,6 +88,10 @@ def setUpModule():
 
     configs = list(retry(Config.CLIENT.list_instance_configs)())
 
+    # Defend against back-end returning configs for regions we aren't
+    # actually allowed to use.
+    configs = [config for config in configs if '-us-' in config.name]
+
     if len(configs) < 1:
         raise ValueError('List instance configs failed in module set up.')
 
@@ -533,6 +538,42 @@ def _unit_of_work(transaction, test):
 
         return session, committed
 
+    def test_snapshot_read_w_various_staleness(self):
+        from datetime import datetime
+        from google.cloud._helpers import UTC
+        ROW_COUNT = 400
+        session, committed = self._set_up_table(ROW_COUNT)
+        all_data_rows = list(self._row_data(ROW_COUNT))
+
+        before_reads = datetime.utcnow().replace(tzinfo=UTC)
+
+        # Test w/ read timestamp
+        read_tx = session.snapshot(read_timestamp=committed)
+        rows = list(read_tx.read(self.TABLE, self.COLUMNS, self.ALL))
+        self._check_row_data(rows, all_data_rows)
+
+        # Test w/ min read timestamp
+        min_read_ts = session.snapshot(min_read_timestamp=committed)
+        rows = list(min_read_ts.read(self.TABLE, self.COLUMNS, self.ALL))
+        self._check_row_data(rows, all_data_rows)
+
+        staleness = datetime.utcnow().replace(tzinfo=UTC) - before_reads
+
+        # Test w/ max staleness
+        max_staleness = session.snapshot(max_staleness=staleness)
+        rows = list(max_staleness.read(self.TABLE, self.COLUMNS, self.ALL))
+        self._check_row_data(rows, all_data_rows)
+
+        # Test w/ exact staleness
+        exact_staleness = session.snapshot(exact_staleness=staleness)
+        rows = list(exact_staleness.read(self.TABLE, self.COLUMNS, self.ALL))
+        self._check_row_data(rows, all_data_rows)
+
+        # Test w/ strong
+        strong = session.snapshot()
+        rows = list(strong.read(self.TABLE, self.COLUMNS, self.ALL))
+        self._check_row_data(rows, all_data_rows)
+
     def test_read_w_manual_consume(self):
         ROW_COUNT = 4000
         session, committed = self._set_up_table(ROW_COUNT)
@@ -580,6 +621,32 @@ def test_read_w_index(self):
             [(row[0], row[2]) for row in self._row_data(ROW_COUNT)]))
         self._check_row_data(rows, expected)
 
+    def test_read_w_single_key(self):
+        ROW_COUNT = 40
+        session, committed = self._set_up_table(ROW_COUNT)
+
+        snapshot = session.snapshot(read_timestamp=committed)
+        rows = list(snapshot.read(
+            self.TABLE, self.COLUMNS, KeySet(keys=[(0,)])))
+
+        all_data_rows = list(self._row_data(ROW_COUNT))
+        expected = [all_data_rows[0]]
+        self._check_row_data(rows, expected)
+
+    def test_read_w_multiple_keys(self):
+        ROW_COUNT = 40
+        indices = [0, 5, 17]
+        session, committed = self._set_up_table(ROW_COUNT)
+
+        snapshot = session.snapshot(read_timestamp=committed)
+        rows = list(snapshot.read(
+            self.TABLE, self.COLUMNS,
+            KeySet(keys=[(index,) for index in indices])))
+
+        all_data_rows = list(self._row_data(ROW_COUNT))
+        expected = [row for row in all_data_rows if row[0] in indices]
+        self._check_row_data(rows, expected)
+
     def test_read_w_limit(self):
         ROW_COUNT = 4000
         LIMIT = 100
@@ -593,21 +660,40 @@ def test_read_w_limit(self):
         expected = all_data_rows[:LIMIT]
         self._check_row_data(rows, expected)
 
-    def test_read_w_range(self):
-        from google.cloud.spanner.keyset import KeyRange
+    def test_read_w_ranges(self):
         ROW_COUNT = 4000
-        START_CLOSED = 1000
-        END_OPEN = 2000
+        START = 1000
+        END = 2000
         session, committed = self._set_up_table(ROW_COUNT)
-        key_range = KeyRange(start_closed=[START_CLOSED], end_open=[END_OPEN])
-        keyset = KeySet(ranges=(key_range,))
-
         snapshot = session.snapshot(read_timestamp=committed)
+        all_data_rows = list(self._row_data(ROW_COUNT))
+
+        closed_closed = KeyRange(start_closed=[START], end_closed=[END])
+        keyset = KeySet(ranges=(closed_closed,))
         rows = list(snapshot.read(
             self.TABLE, self.COLUMNS, keyset))
+        expected = all_data_rows[START:END+1]
+        self._check_row_data(rows, expected)
 
-        all_data_rows = list(self._row_data(ROW_COUNT))
-        expected = all_data_rows[START_CLOSED:END_OPEN]
+        closed_open = KeyRange(start_closed=[START], end_open=[END])
+        keyset = KeySet(ranges=(closed_open,))
+        rows = list(snapshot.read(
+            self.TABLE, self.COLUMNS, keyset))
+        expected = all_data_rows[START:END]
+        self._check_row_data(rows, expected)
+
+        open_open = KeyRange(start_open=[START], end_open=[END])
+        keyset = KeySet(ranges=(open_open,))
+        rows = list(snapshot.read(
+            self.TABLE, self.COLUMNS, keyset))
+        expected = all_data_rows[START+1:END]
+        self._check_row_data(rows, expected)
+
+        open_closed = KeyRange(start_open=[START], end_closed=[END])
+        keyset = KeySet(ranges=(open_closed,))
+        rows = list(snapshot.read(
+            self.TABLE, self.COLUMNS, keyset))
+        expected = all_data_rows[START+1:END+1]
         self._check_row_data(rows, expected)
 
     def test_execute_sql_w_manual_consume(self):
@@ -637,6 +723,26 @@ def _check_sql_results(self, snapshot, sql, params, param_types, expected):
             sql, params=params, param_types=param_types))
         self._check_row_data(rows, expected=expected)
 
+    def test_execute_sql_returning_array_of_struct(self):
+        SQL = (
+            "SELECT ARRAY(SELECT AS STRUCT C1, C2 "
+            "FROM (SELECT 'a' AS C1, 1 AS C2 "
+            "UNION ALL SELECT 'b' AS C1, 2 AS C2) "
+            "ORDER BY C1 ASC)"
+        )
+        session = self._db.session()
+        session.create()
+        self.to_delete.append(session)
+        snapshot = session.snapshot()
+        self._check_sql_results(
+            snapshot,
+            sql=SQL,
+            params=None,
+            param_types=None,
+            expected=[
+                [[['a', 1], ['b', 2]]],
+            ])
+
     def test_execute_sql_w_query_param(self):
         session = self._db.session()
         session.create()
@@ -714,6 +820,14 @@ def test_execute_sql_w_query_param(self):
             expected=[(u'dog',)],
         )
 
+        self._check_sql_results(
+            snapshot,
+            sql='SELECT description FROM all_types WHERE eye_d = @my_id',
+            params={'my_id': None},
+            param_types={'my_id': Type(code=INT64)},
+            expected=[],
+        )
+
         self._check_sql_results(
             snapshot,
             sql='SELECT eye_d FROM all_types WHERE description = @description',

From 401bf4018ae8eaf4fabc77e4aac30564e9289aab Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 14 Jul 2017 14:22:49 -0700
Subject: [PATCH 077/211] Speech GAPIC to master (#3607)

* Vendor the GAPIC for Speech.

* Speech Partial Veneer (#3483)

* Update to docs based on @dhermes catch.

* Fix incorrect variable.

* Fix the docs.

* Style fixes to unit tests.

* More PR review from me.
---
 docs/index.rst                                |    2 +-
 docs/speech/alternative.rst                   |    7 -
 docs/speech/client.rst                        |    7 -
 docs/speech/encoding.rst                      |    7 -
 docs/speech/gapic/api.rst                     |    6 +
 docs/speech/gapic/types.rst                   |    5 +
 docs/speech/{usage.rst => index.rst}          |  228 +--
 docs/speech/operation.rst                     |    7 -
 docs/speech/result.rst                        |    7 -
 docs/speech/sample.rst                        |    7 -
 setup.py                                      |    4 +-
 speech/google/cloud/gapic/__init__.py         |    1 +
 speech/google/cloud/gapic/speech/__init__.py  |    1 +
 .../google/cloud/gapic/speech/v1/__init__.py  |    0
 speech/google/cloud/gapic/speech/v1/enums.py  |   86 ++
 .../cloud/gapic/speech/v1/speech_client.py    |  285 ++++
 .../gapic/speech/v1/speech_client_config.json |   43 +
 speech/google/cloud/proto/__init__.py         |    1 +
 speech/google/cloud/proto/speech/__init__.py  |    1 +
 .../google/cloud/proto/speech/v1/__init__.py  |    1 +
 .../cloud/proto/speech/v1/cloud_speech_pb2.py | 1331 +++++++++++++++++
 .../proto/speech/v1/cloud_speech_pb2_grpc.py  |   86 ++
 speech/google/cloud/speech/__init__.py        |   20 +-
 speech/google/cloud/speech/_gax.py            |    7 +-
 speech/google/cloud/speech/client.py          |   11 +
 speech/google/cloud/speech_v1/__init__.py     |   34 +
 speech/google/cloud/speech_v1/helpers.py      |   88 ++
 speech/google/cloud/speech_v1/types.py        |   30 +
 speech/nox.py                                 |   14 +-
 speech/setup.py                               |   34 +-
 speech/tests/gapic/test_speech_client_v1.py   |  212 +++
 speech/tests/system.py                        |   33 +-
 speech/tests/unit/test__gax.py                |   23 +-
 speech/tests/unit/test_client.py              |  182 +--
 speech/tests/unit/test_helpers.py             |   66 +
 35 files changed, 2589 insertions(+), 288 deletions(-)
 delete mode 100644 docs/speech/alternative.rst
 delete mode 100644 docs/speech/client.rst
 delete mode 100644 docs/speech/encoding.rst
 create mode 100644 docs/speech/gapic/api.rst
 create mode 100644 docs/speech/gapic/types.rst
 rename docs/speech/{usage.rst => index.rst} (50%)
 delete mode 100644 docs/speech/operation.rst
 delete mode 100644 docs/speech/result.rst
 delete mode 100644 docs/speech/sample.rst
 create mode 100644 speech/google/cloud/gapic/__init__.py
 create mode 100644 speech/google/cloud/gapic/speech/__init__.py
 create mode 100644 speech/google/cloud/gapic/speech/v1/__init__.py
 create mode 100644 speech/google/cloud/gapic/speech/v1/enums.py
 create mode 100644 speech/google/cloud/gapic/speech/v1/speech_client.py
 create mode 100644 speech/google/cloud/gapic/speech/v1/speech_client_config.json
 create mode 100644 speech/google/cloud/proto/__init__.py
 create mode 100644 speech/google/cloud/proto/speech/__init__.py
 create mode 100644 speech/google/cloud/proto/speech/v1/__init__.py
 create mode 100644 speech/google/cloud/proto/speech/v1/cloud_speech_pb2.py
 create mode 100644 speech/google/cloud/proto/speech/v1/cloud_speech_pb2_grpc.py
 create mode 100644 speech/google/cloud/speech_v1/__init__.py
 create mode 100644 speech/google/cloud/speech_v1/helpers.py
 create mode 100644 speech/google/cloud/speech_v1/types.py
 create mode 100644 speech/tests/gapic/test_speech_client_v1.py
 create mode 100644 speech/tests/unit/test_helpers.py

diff --git a/docs/index.rst b/docs/index.rst
index 623af475c5688..8c81cefdda2e3 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -12,7 +12,7 @@
   resource-manager/api
   runtimeconfig/usage
   spanner/usage
-  speech/usage
+  speech/index
   error-reporting/usage
   monitoring/usage
   logging/usage
diff --git a/docs/speech/alternative.rst b/docs/speech/alternative.rst
deleted file mode 100644
index 7c287b8dfa441..0000000000000
--- a/docs/speech/alternative.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Speech Alternative
-==================
-
-.. automodule:: google.cloud.speech.alternative
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/speech/client.rst b/docs/speech/client.rst
deleted file mode 100644
index 4e6caad90ff37..0000000000000
--- a/docs/speech/client.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Speech Client
-=============
-
-.. automodule:: google.cloud.speech.client
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/speech/encoding.rst b/docs/speech/encoding.rst
deleted file mode 100644
index affe80a4ebd27..0000000000000
--- a/docs/speech/encoding.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Speech Encoding
-===============
-
-.. automodule:: google.cloud.speech.encoding
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/speech/gapic/api.rst b/docs/speech/gapic/api.rst
new file mode 100644
index 0000000000000..ded919fcbdcdf
--- /dev/null
+++ b/docs/speech/gapic/api.rst
@@ -0,0 +1,6 @@
+Speech Client API
+=================
+
+.. automodule:: google.cloud.speech_v1
+  :members:
+  :inherited-members:
diff --git a/docs/speech/gapic/types.rst b/docs/speech/gapic/types.rst
new file mode 100644
index 0000000000000..0ddf83d3bb607
--- /dev/null
+++ b/docs/speech/gapic/types.rst
@@ -0,0 +1,5 @@
+Speech Client Types
+===================
+
+.. automodule:: google.cloud.speech_v1.types
+  :members:
diff --git a/docs/speech/usage.rst b/docs/speech/index.rst
similarity index 50%
rename from docs/speech/usage.rst
rename to docs/speech/index.rst
index a651965e9e189..9373e830cff37 100644
--- a/docs/speech/usage.rst
+++ b/docs/speech/index.rst
@@ -1,16 +1,6 @@
+######
 Speech
-======
-
-.. toctree::
-  :maxdepth: 2
-  :hidden:
-
-  client
-  encoding
-  operation
-  result
-  sample
-  alternative
+######
 
 The `Google Speech`_ API enables developers to convert audio to text.
 The API recognizes over 80 languages and variants, to support your global user
@@ -18,10 +8,11 @@ base.
 
 .. _Google Speech: https://cloud.google.com/speech/docs/getting-started
 
-Client
-------
 
-:class:`~google.cloud.speech.client.Client` objects provide a
+Authentication and Configuration
+--------------------------------
+
+:class:`~google.cloud.speech_v1.SpeechClient` objects provide a
 means to configure your application. Each instance holds
 an authenticated connection to the Cloud Speech Service.
 
@@ -29,21 +20,22 @@ For an overview of authentication in ``google-cloud-python``, see
 :doc:`/core/auth`.
 
 Assuming your environment is set up as described in that document,
-create an instance of :class:`~google.cloud.speech.client.Client`.
+create an instance of :class:`~.speech_v1.SpeechClient`.
 
 .. code-block:: python
 
     >>> from google.cloud import speech
-    >>> client = speech.Client()
+    >>> client = speech.SpeechClient()
 
 
 Asynchronous Recognition
 ------------------------
 
-The :meth:`~google.cloud.speech.Client.long_running_recognize` sends audio
-data to the Speech API and initiates a Long Running Operation. Using this
-operation, you can periodically poll for recognition results. Use asynchronous
-requests for audio data of any duration up to 80 minutes.
+The :meth:`~.speech_v1.SpeechClient.long_running_recognize` method
+sends audio data to the Speech API and initiates a Long Running Operation.
+
+Using this operation, you can periodically poll for recognition results.
+Use asynchronous requests for audio data of any duration up to 80 minutes.
 
 See: `Speech Asynchronous Recognize`_
 
@@ -52,13 +44,16 @@ See: `Speech Asynchronous Recognize`_
 
     >>> import time
     >>> from google.cloud import speech
-    >>> client = speech.Client()
-    >>> sample = client.sample(source_uri='gs://my-bucket/recording.flac',
-    ...                        encoding=speech.Encoding.LINEAR16,
-    ...                        sample_rate_hertz=44100)
-    >>> operation = sample.long_running_recognize(
-    ...     language_code='en-US',
-    ...     max_alternatives=2,
+    >>> client = speech.SpeechClient()
+    >>> operation = client.long_running_recognize(
+    ...     audio=speech.types.RecognitionAudio(
+    ...         uri='gs://my-bucket/recording.flac',
+    ...     ),
+    ...     config=speech.types.RecognitionConfig(
+    ...         encoding='LINEAR16',
+    ...         language_code='en-US',
+    ...         sample_rate_hertz=44100,
+    ...     ),
     ... )
     >>> retry_count = 100
     >>> while retry_count > 0 and not operation.complete:
@@ -80,7 +75,7 @@ See: `Speech Asynchronous Recognize`_
 Synchronous Recognition
 -----------------------
 
-The :meth:`~google.cloud.speech.Client.recognize` method converts speech
+The :meth:`~.speech_v1.SpeechClient.recognize` method converts speech
 data to text and returns alternative text transcriptions.
 
 This example uses ``language_code='en-GB'`` to better recognize a dialect from
@@ -89,12 +84,17 @@ Great Britain.
 .. code-block:: python
 
     >>> from google.cloud import speech
-    >>> client = speech.Client()
-    >>> sample = client.sample(source_uri='gs://my-bucket/recording.flac',
-    ...                        encoding=speech.Encoding.FLAC,
-    ...                        sample_rate_hertz=44100)
-    >>> results = sample.recognize(
-    ...     language_code='en-GB', max_alternatives=2)
+    >>> client = speech.SpeechClient()
+    >>> results = client.recognize(
+    ...     audio=speech.types.RecognitionAudio(
+    ...         uri='gs://my-bucket/recording.flac',
+    ...     ),
+    ...     config=speech.types.RecognitionConfig(
+    ...         encoding='LINEAR16',
+    ...         language_code='en-US',
+    ...         sample_rate_hertz=44100,
+    ...     ),
+    ... )
     >>> for result in results:
     ...     for alternative in result.alternatives:
     ...         print('=' * 20)
@@ -112,14 +112,17 @@ Example of using the profanity filter.
 .. code-block:: python
 
     >>> from google.cloud import speech
-    >>> client = speech.Client()
-    >>> sample = client.sample(source_uri='gs://my-bucket/recording.flac',
-    ...                        encoding=speech.Encoding.FLAC,
-    ...                        sample_rate_hertz=44100)
-    >>> results = sample.recognize(
-    ...     language_code='en-US',
-    ...     max_alternatives=1,
-    ...     profanity_filter=True,
+    >>> client = speech.SpeechClient()
+    >>> results = client.recognize(
+    ...     audio=speech.types.RecognitionAudio(
+    ...         uri='gs://my-bucket/recording.flac',
+    ...     ),
+    ...     config=speech.types.RecognitionConfig(
+    ...         encoding='LINEAR16',
+    ...         language_code='en-US',
+    ...         profanity_filter=True,
+    ...         sample_rate_hertz=44100,
+    ...     ),
     ... )
     >>> for result in results:
     ...     for alternative in result.alternatives:
@@ -137,15 +140,20 @@ words to the vocabulary of the recognizer.
 .. code-block:: python
 
     >>> from google.cloud import speech
-    >>> client = speech.Client()
-    >>> sample = client.sample(source_uri='gs://my-bucket/recording.flac',
-    ...                        encoding=speech.Encoding.FLAC,
-    ...                        sample_rate_hertz=44100)
-    >>> hints = ['hi', 'good afternoon']
-    >>> results = sample.recognize(
-    ...     language_code='en-US',
-    ...     max_alternatives=2,
-    ...     speech_contexts=hints,
+    >>> from google.cloud import speech
+    >>> client = speech.SpeechClient()
+    >>> results = client.recognize(
+    ...     audio=speech.types.RecognitionAudio(
+    ...         uri='gs://my-bucket/recording.flac',
+    ...     ),
+    ...     config=speech.types.RecognitionConfig(
+    ...         encoding='LINEAR16',
+    ...         language_code='en-US',
+    ...         sample_rate_hertz=44100,
+    ...         speech_contexts=[speech.types.SpeechContext(
+    ...             phrases=['hi', 'good afternoon'],
+    ...         )],
+    ...     ),
     ... )
     >>> for result in results:
     ...     for alternative in result.alternatives:
@@ -160,7 +168,7 @@ words to the vocabulary of the recognizer.
 Streaming Recognition
 ---------------------
 
-The :meth:`~google.cloud.speech.Client.streaming_recognize` method converts
+The :meth:`~speech_v1.SpeechClient.streaming_recognize` method converts
 speech data to possible text alternatives on the fly.
 
 .. note::
@@ -170,18 +178,27 @@ speech data to possible text alternatives on the fly.
 
 .. code-block:: python
 
+    >>> import io
     >>> from google.cloud import speech
-    >>> client = speech.Client()
-    >>> with open('./hello.wav', 'rb') as stream:
-    ...     sample = client.sample(stream=stream,
-    ...                            encoding=speech.Encoding.LINEAR16,
-    ...                            sample_rate_hertz=16000)
-    ...     results = sample.streaming_recognize(language_code='en-US')
-    ...     for result in results:
-    ...         for alternative in result.alternatives:
-    ...             print('=' * 20)
-    ...             print('transcript: ' + alternative.transcript)
-    ...             print('confidence: ' + str(alternative.confidence))
+    >>> client = speech.SpeechClient()
+    >>> config = speech.types.RecognitionConfig(
+    ...     encoding='LINEAR16',
+    ...     language_code='en-US',
+    ...     sample_rate_hertz=44100,
+    ... )
+    >>> with io.open('./hello.wav', 'rb') as stream:
+    ...     requests = [speech.types.StreamingRecognizeRequest(
+    ...         audio_content=stream.read(),
+    ...     )]
+    >>> results = sample.streaming_recognize(
+    ...     config=speech.types.StreamingRecognitionConfig(config=config),
+    ...     requests,
+    ... )
+    >>> for result in results:
+    ...     for alternative in result.alternatives:
+    ...         print('=' * 20)
+    ...         print('transcript: ' + alternative.transcript)
+    ...         print('confidence: ' + str(alternative.confidence))
     ====================
     transcript: hello thank you for using Google Cloud platform
     confidence: 0.927983105183
@@ -193,20 +210,36 @@ until the client closes the output stream or until the maximum time limit has
 been reached.
 
 If you only want to recognize a single utterance you can set
- ``single_utterance`` to :data:`True` and only one result will be returned.
+``single_utterance`` to :data:`True` and only one result will be returned.
 
 See: `Single Utterance`_
 
 .. code-block:: python
 
-    >>> with open('./hello_pause_goodbye.wav', 'rb') as stream:
-    ...     sample = client.sample(stream=stream,
-    ...                            encoding=speech.Encoding.LINEAR16,
-    ...                            sample_rate_hertz=16000)
-    ...     results = sample.streaming_recognize(
-    ...         language_code='en-US',
-    ...         single_utterance=True,
-    ...     )
+    >>> import io
+    >>> from google.cloud import speech
+    >>> client = speech.SpeechClient()
+    >>> config = speech.types.RecognitionConfig(
+    ...     encoding='LINEAR16',
+    ...     language_code='en-US',
+    ...     sample_rate_hertz=44100,
+    ... )
+    >>> with io.open('./hello-pause-goodbye.wav', 'rb') as stream:
+    ...     requests = [speech.types.StreamingRecognizeRequest(
+    ...         audio_content=stream.read(),
+    ...     )]
+    >>> results = sample.streaming_recognize(
+    ...     config=speech.types.StreamingRecognitionConfig(
+    ...         config=config,
+    ...         single_utterance=False,
+    ...     ),
+    ...     requests,
+    ... )
+    >>> for result in results:
+    ...     for alternative in result.alternatives:
+    ...         print('=' * 20)
+    ...         print('transcript: ' + alternative.transcript)
+    ...         print('confidence: ' + str(alternative.confidence))
     ...     for result in results:
     ...         for alternative in result.alternatives:
     ...             print('=' * 20)
@@ -221,22 +254,31 @@ If ``interim_results`` is set to :data:`True`, interim results
 
 .. code-block:: python
 
+    >>> import io
     >>> from google.cloud import speech
-    >>> client = speech.Client()
-    >>> with open('./hello.wav', 'rb') as stream:
-    ...     sample = client.sample(stream=stream,
-    ...                            encoding=speech.Encoding.LINEAR16,
-    ...                            sample_rate=16000)
-    ...     results = sample.streaming_recognize(
-    ...         interim_results=True,
-    ...         language_code='en-US',
-    ...     )
-    ...     for result in results:
-    ...         for alternative in result.alternatives:
-    ...             print('=' * 20)
-    ...             print('transcript: ' + alternative.transcript)
-    ...             print('confidence: ' + str(alternative.confidence))
-    ...             print('is_final:' + str(result.is_final))
+    >>> client = speech.SpeechClient()
+    >>> config = speech.types.RecognitionConfig(
+    ...     encoding='LINEAR16',
+    ...     language_code='en-US',
+    ...     sample_rate_hertz=44100,
+    ... )
+    >>> with io.open('./hello.wav', 'rb') as stream:
+    ...     requests = [speech.types.StreamingRecognizeRequest(
+    ...         audio_content=stream.read(),
+    ...     )]
+    >>> results = sample.streaming_recognize(
+    ...     config=speech.types.StreamingRecognitionConfig(
+    ...         config=config,
+    ...         iterim_results=True,
+    ...     ),
+    ...     requests,
+    ... )
+    >>> for result in results:
+    ...     for alternative in result.alternatives:
+    ...         print('=' * 20)
+    ...         print('transcript: ' + alternative.transcript)
+    ...         print('confidence: ' + str(alternative.confidence))
+    ...         print('is_final:' + str(result.is_final))
     ====================
     'he'
     None
@@ -254,3 +296,13 @@ If ``interim_results`` is set to :data:`True`, interim results
 .. _Single Utterance: https://cloud.google.com/speech/reference/rpc/google.cloud.speech.v1beta1#streamingrecognitionconfig
 .. _sync_recognize: https://cloud.google.com/speech/reference/rest/v1beta1/speech/syncrecognize
 .. _Speech Asynchronous Recognize: https://cloud.google.com/speech/reference/rest/v1beta1/speech/asyncrecognize
+
+
+API Reference
+-------------
+
+.. toctree::
+  :maxdepth: 2
+
+  gapic/api
+  gapic/types
diff --git a/docs/speech/operation.rst b/docs/speech/operation.rst
deleted file mode 100644
index 5c0ec3b92b123..0000000000000
--- a/docs/speech/operation.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Speech Operation
-================
-
-.. automodule:: google.cloud.speech.operation
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/speech/result.rst b/docs/speech/result.rst
deleted file mode 100644
index d4759b7041999..0000000000000
--- a/docs/speech/result.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Speech Result
-=============
-
-.. automodule:: google.cloud.speech.result
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/docs/speech/sample.rst b/docs/speech/sample.rst
deleted file mode 100644
index f0b4098ba4cab..0000000000000
--- a/docs/speech/sample.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Speech Sample
-=============
-
-.. automodule:: google.cloud.speech.sample
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/setup.py b/setup.py
index 6977c6151ddc7..ca6491ec530e4 100644
--- a/setup.py
+++ b/setup.py
@@ -63,7 +63,7 @@
     'google-cloud-resource-manager >= 0.25.0, < 0.26dev',
     'google-cloud-runtimeconfig >= 0.25.0, < 0.26dev',
     'google-cloud-spanner >= 0.25.0, < 0.26dev',
-    'google-cloud-speech >= 0.26.0, < 0.27dev',
+    'google-cloud-speech >= 0.27.0, < 0.28dev',
     'google-cloud-storage >= 1.2.0, < 1.3dev',
     'google-cloud-translate >= 0.25.0, < 0.26dev',
     'google-cloud-videointelligence >= 0.25.0, < 0.26dev',
@@ -72,7 +72,7 @@
 
 setup(
     name='google-cloud',
-    version='0.26.1',
+    version='0.26.2',
     description='API Client library for Google Cloud',
     long_description=README,
     install_requires=REQUIREMENTS,
diff --git a/speech/google/cloud/gapic/__init__.py b/speech/google/cloud/gapic/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/speech/google/cloud/gapic/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/speech/google/cloud/gapic/speech/__init__.py b/speech/google/cloud/gapic/speech/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/speech/google/cloud/gapic/speech/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/speech/google/cloud/gapic/speech/v1/__init__.py b/speech/google/cloud/gapic/speech/v1/__init__.py
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/speech/google/cloud/gapic/speech/v1/enums.py b/speech/google/cloud/gapic/speech/v1/enums.py
new file mode 100644
index 0000000000000..98379c7078a9f
--- /dev/null
+++ b/speech/google/cloud/gapic/speech/v1/enums.py
@@ -0,0 +1,86 @@
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Wrappers for protocol buffer enum types."""
+
+
+class RecognitionConfig(object):
+    class AudioEncoding(object):
+        """
+        Audio encoding of the data sent in the audio message. All encodings support
+        only 1 channel (mono) audio. Only ``FLAC`` includes a header that describes
+        the bytes of audio that follow the header. The other encodings are raw
+        audio bytes with no header.
+
+        For best results, the audio source should be captured and transmitted using
+        a lossless encoding (``FLAC`` or ``LINEAR16``). Recognition accuracy may be
+        reduced if lossy codecs, which include the other codecs listed in
+        this section, are used to capture or transmit the audio, particularly if
+        background noise is present.
+
+        Attributes:
+          ENCODING_UNSPECIFIED (int): Not specified. Will return result ``google.rpc.Code.INVALID_ARGUMENT``.
+          LINEAR16 (int): Uncompressed 16-bit signed little-endian samples (Linear PCM).
+          FLAC (int): ```FLAC`` <https://xiph.org/flac/documentation.html>`_ (Free Lossless Audio
+            Codec) is the recommended encoding because it is
+            lossless--therefore recognition is not compromised--and
+            requires only about half the bandwidth of ``LINEAR16``. ``FLAC`` stream
+            encoding supports 16-bit and 24-bit samples, however, not all fields in
+            ``STREAMINFO`` are supported.
+          MULAW (int): 8-bit samples that compand 14-bit audio samples using G.711 PCMU/mu-law.
+          AMR (int): Adaptive Multi-Rate Narrowband codec. ``sample_rate_hertz`` must be 8000.
+          AMR_WB (int): Adaptive Multi-Rate Wideband codec. ``sample_rate_hertz`` must be 16000.
+          OGG_OPUS (int): Opus encoded audio frames in Ogg container
+            (`OggOpus <https://wiki.xiph.org/OggOpus>`_).
+            ``sample_rate_hertz`` must be 16000.
+          SPEEX_WITH_HEADER_BYTE (int): Although the use of lossy encodings is not recommended, if a very low
+            bitrate encoding is required, ``OGG_OPUS`` is highly preferred over
+            Speex encoding. The `Speex <https://speex.org/>`_  encoding supported by
+            Cloud Speech API has a header byte in each block, as in MIME type
+            ``audio/x-speex-with-header-byte``.
+            It is a variant of the RTP Speex encoding defined in
+            `RFC 5574 <https://tools.ietf.org/html/rfc5574>`_.
+            The stream is a sequence of blocks, one block per RTP packet. Each block
+            starts with a byte containing the length of the block, in bytes, followed
+            by one or more frames of Speex data, padded to an integral number of
+            bytes (octets) as specified in RFC 5574. In other words, each RTP header
+            is replaced with a single byte containing the block length. Only Speex
+            wideband is supported. ``sample_rate_hertz`` must be 16000.
+        """
+        ENCODING_UNSPECIFIED = 0
+        LINEAR16 = 1
+        FLAC = 2
+        MULAW = 3
+        AMR = 4
+        AMR_WB = 5
+        OGG_OPUS = 6
+        SPEEX_WITH_HEADER_BYTE = 7
+
+
+class StreamingRecognizeResponse(object):
+    class SpeechEventType(object):
+        """
+        Indicates the type of speech event.
+
+        Attributes:
+          SPEECH_EVENT_UNSPECIFIED (int): No speech event specified.
+          END_OF_SINGLE_UTTERANCE (int): This event indicates that the server has detected the end of the user's
+            speech utterance and expects no additional speech. Therefore, the server
+            will not process additional audio (although it may subsequently return
+            additional results). The client should stop sending additional audio
+            data, half-close the gRPC connection, and wait for any additional results
+            until the server closes the gRPC connection. This event is only sent if
+            ``single_utterance`` was set to ``true``, and is not used otherwise.
+        """
+        SPEECH_EVENT_UNSPECIFIED = 0
+        END_OF_SINGLE_UTTERANCE = 1
diff --git a/speech/google/cloud/gapic/speech/v1/speech_client.py b/speech/google/cloud/gapic/speech/v1/speech_client.py
new file mode 100644
index 0000000000000..3806330b25bbf
--- /dev/null
+++ b/speech/google/cloud/gapic/speech/v1/speech_client.py
@@ -0,0 +1,285 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# EDITING INSTRUCTIONS
+# This file was generated from the file
+# https://github.com/google/googleapis/blob/master/google/cloud/speech/v1/cloud_speech.proto,
+# and updates to that file get reflected here through a refresh process.
+# For the short term, the refresh process will only be runnable by Google engineers.
+#
+# The only allowed edits are to method and file documentation. A 3-way
+# merge preserves those additions if the generated source changes.
+"""Accesses the google.cloud.speech.v1 Speech API."""
+
+import collections
+import json
+import os
+import pkg_resources
+import platform
+
+from google.gapic.longrunning import operations_client
+from google.gax import api_callable
+from google.gax import config
+from google.gax import path_template
+from google.gax.utils import oneof
+import google.gax
+
+from google.cloud.gapic.speech.v1 import enums
+from google.cloud.proto.speech.v1 import cloud_speech_pb2
+
+
+class SpeechClient(object):
+    """Service that implements Google Cloud Speech API."""
+
+    SERVICE_ADDRESS = 'speech.googleapis.com'
+    """The default address of the service."""
+
+    DEFAULT_SERVICE_PORT = 443
+    """The default port of the service."""
+
+    # The scopes needed to make gRPC calls to all of the methods defined in
+    # this service
+    _ALL_SCOPES = ('https://www.googleapis.com/auth/cloud-platform', )
+
+    def __init__(self,
+                 service_path=SERVICE_ADDRESS,
+                 port=DEFAULT_SERVICE_PORT,
+                 channel=None,
+                 credentials=None,
+                 ssl_credentials=None,
+                 scopes=None,
+                 client_config=None,
+                 app_name=None,
+                 app_version='',
+                 lib_name=None,
+                 lib_version='',
+                 metrics_headers=()):
+        """Constructor.
+
+        Args:
+          service_path (string): The domain name of the API remote host.
+          port (int): The port on which to connect to the remote host.
+          channel (:class:`grpc.Channel`): A ``Channel`` instance through
+            which to make calls.
+          credentials (object): The authorization credentials to attach to
+            requests. These credentials identify this application to the
+            service.
+          ssl_credentials (:class:`grpc.ChannelCredentials`): A
+            ``ChannelCredentials`` instance for use with an SSL-enabled
+            channel.
+          scopes (list[string]): A list of OAuth2 scopes to attach to requests.
+          client_config (dict):
+            A dictionary for call options for each method. See
+            :func:`google.gax.construct_settings` for the structure of
+            this data. Falls back to the default config if not specified
+            or the specified config is missing data points.
+          app_name (string): The name of the application calling
+            the service. Recommended for analytics purposes.
+          app_version (string): The version of the application calling
+            the service. Recommended for analytics purposes.
+          lib_name (string): The API library software used for calling
+            the service. (Unless you are writing an API client itself,
+            leave this as default.)
+          lib_version (string): The API library software version used
+            for calling the service. (Unless you are writing an API client
+            itself, leave this as default.)
+          metrics_headers (dict): A dictionary of values for tracking
+            client library metrics. Ultimately serializes to a string
+            (e.g. 'foo/1.2.3 bar/3.14.1'). This argument should be
+            considered private.
+
+        Returns:
+          A SpeechClient object.
+        """
+        # Unless the calling application specifically requested
+        # OAuth scopes, request everything.
+        if scopes is None:
+            scopes = self._ALL_SCOPES
+
+        # Initialize an empty client config, if none is set.
+        if client_config is None:
+            client_config = {}
+
+        # Initialize metrics_headers as an ordered dictionary
+        # (cuts down on cardinality of the resulting string slightly).
+        metrics_headers = collections.OrderedDict(metrics_headers)
+        metrics_headers['gl-python'] = platform.python_version()
+
+        # The library may or may not be set, depending on what is
+        # calling this client. Newer client libraries set the library name
+        # and version.
+        if lib_name:
+            metrics_headers[lib_name] = lib_version
+
+        # Finally, track the GAPIC package version.
+        metrics_headers['gapic'] = pkg_resources.get_distribution(
+            'google-cloud-speech', ).version
+
+        # Load the configuration defaults.
+        default_client_config = json.loads(
+            pkg_resources.resource_string(
+                __name__, 'speech_client_config.json').decode())
+        defaults = api_callable.construct_settings(
+            'google.cloud.speech.v1.Speech',
+            default_client_config,
+            client_config,
+            config.STATUS_CODE_NAMES,
+            metrics_headers=metrics_headers, )
+        self.speech_stub = config.create_stub(
+            cloud_speech_pb2.SpeechStub,
+            channel=channel,
+            service_path=service_path,
+            service_port=port,
+            credentials=credentials,
+            scopes=scopes,
+            ssl_credentials=ssl_credentials)
+
+        self.operations_client = operations_client.OperationsClient(
+            service_path=service_path,
+            port=port,
+            channel=channel,
+            credentials=credentials,
+            ssl_credentials=ssl_credentials,
+            scopes=scopes,
+            client_config=client_config,
+            metrics_headers=metrics_headers, )
+
+        self._recognize = api_callable.create_api_call(
+            self.speech_stub.Recognize, settings=defaults['recognize'])
+        self._long_running_recognize = api_callable.create_api_call(
+            self.speech_stub.LongRunningRecognize,
+            settings=defaults['long_running_recognize'])
+        self._streaming_recognize = api_callable.create_api_call(
+            self.speech_stub.StreamingRecognize,
+            settings=defaults['streaming_recognize'])
+
+    # Service calls
+    def recognize(self, config, audio, options=None):
+        """
+        Performs synchronous speech recognition: receive results after all audio
+        has been sent and processed.
+
+        Example:
+          >>> from google.cloud.gapic.speech.v1 import speech_client
+          >>> from google.cloud.gapic.speech.v1 import enums
+          >>> from google.cloud.proto.speech.v1 import cloud_speech_pb2
+          >>> client = speech_client.SpeechClient()
+          >>> encoding = enums.RecognitionConfig.AudioEncoding.FLAC
+          >>> sample_rate_hertz = 44100
+          >>> language_code = 'en-US'
+          >>> config = cloud_speech_pb2.RecognitionConfig(encoding=encoding, sample_rate_hertz=sample_rate_hertz, language_code=language_code)
+          >>> uri = 'gs://bucket_name/file_name.flac'
+          >>> audio = cloud_speech_pb2.RecognitionAudio(uri=uri)
+          >>> response = client.recognize(config, audio)
+
+        Args:
+          config (:class:`google.cloud.proto.speech.v1.cloud_speech_pb2.RecognitionConfig`): *Required* Provides information to the recognizer that specifies how to
+            process the request.
+          audio (:class:`google.cloud.proto.speech.v1.cloud_speech_pb2.RecognitionAudio`): *Required* The audio data to be recognized.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          A :class:`google.cloud.proto.speech.v1.cloud_speech_pb2.RecognizeResponse` instance.
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        # Create the request object.
+        request = cloud_speech_pb2.RecognizeRequest(config=config, audio=audio)
+        return self._recognize(request, options)
+
+    def long_running_recognize(self, config, audio, options=None):
+        """
+        Performs asynchronous speech recognition: receive results via the
+        google.longrunning.Operations interface. Returns either an
+        ``Operation.error`` or an ``Operation.response`` which contains
+        a ``LongRunningRecognizeResponse`` message.
+
+        Example:
+          >>> from google.cloud.gapic.speech.v1 import speech_client
+          >>> from google.cloud.gapic.speech.v1 import enums
+          >>> from google.cloud.proto.speech.v1 import cloud_speech_pb2
+          >>> client = speech_client.SpeechClient()
+          >>> encoding = enums.RecognitionConfig.AudioEncoding.FLAC
+          >>> sample_rate_hertz = 44100
+          >>> language_code = 'en-US'
+          >>> config = cloud_speech_pb2.RecognitionConfig(encoding=encoding, sample_rate_hertz=sample_rate_hertz, language_code=language_code)
+          >>> uri = 'gs://bucket_name/file_name.flac'
+          >>> audio = cloud_speech_pb2.RecognitionAudio(uri=uri)
+          >>> response = client.long_running_recognize(config, audio)
+          >>>
+          >>> def callback(operation_future):
+          >>>     # Handle result.
+          >>>     result = operation_future.result()
+          >>>
+          >>> response.add_done_callback(callback)
+          >>>
+          >>> # Handle metadata.
+          >>> metadata = response.metadata()
+
+        Args:
+          config (:class:`google.cloud.proto.speech.v1.cloud_speech_pb2.RecognitionConfig`): *Required* Provides information to the recognizer that specifies how to
+            process the request.
+          audio (:class:`google.cloud.proto.speech.v1.cloud_speech_pb2.RecognitionAudio`): *Required* The audio data to be recognized.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          A :class:`google.gax._OperationFuture` instance.
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        # Create the request object.
+        request = cloud_speech_pb2.LongRunningRecognizeRequest(
+            config=config, audio=audio)
+        return google.gax._OperationFuture(
+            self._long_running_recognize(request,
+                                         options), self.operations_client,
+            cloud_speech_pb2.LongRunningRecognizeResponse,
+            cloud_speech_pb2.LongRunningRecognizeMetadata, options)
+
+    def streaming_recognize(self, requests, options=None):
+        """
+        Performs bidirectional streaming speech recognition: receive results while
+        sending audio. This method is only available via the gRPC API (not REST).
+
+        EXPERIMENTAL: This method interface might change in the future.
+
+        Example:
+          >>> from google.cloud.gapic.speech.v1 import speech_client
+          >>> from google.cloud.proto.speech.v1 import cloud_speech_pb2
+          >>> client = speech_client.SpeechClient()
+          >>> request = cloud_speech_pb2.StreamingRecognizeRequest()
+          >>> requests = [request]
+          >>> for element in client.streaming_recognize(requests):
+          >>>     # process element
+          >>>     pass
+
+        Args:
+          requests (iterator[:class:`google.cloud.proto.speech.v1.cloud_speech_pb2.StreamingRecognizeRequest`]): The input objects.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          iterator[:class:`google.cloud.proto.speech.v1.cloud_speech_pb2.StreamingRecognizeResponse`].
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        return self._streaming_recognize(requests, options)
diff --git a/speech/google/cloud/gapic/speech/v1/speech_client_config.json b/speech/google/cloud/gapic/speech/v1/speech_client_config.json
new file mode 100644
index 0000000000000..4edd15ce865bb
--- /dev/null
+++ b/speech/google/cloud/gapic/speech/v1/speech_client_config.json
@@ -0,0 +1,43 @@
+{
+  "interfaces": {
+    "google.cloud.speech.v1.Speech": {
+      "retry_codes": {
+        "idempotent": [
+          "DEADLINE_EXCEEDED",
+          "UNAVAILABLE"
+        ],
+        "non_idempotent": [
+          "UNAVAILABLE"
+        ]
+      },
+      "retry_params": {
+        "default": {
+          "initial_retry_delay_millis": 100,
+          "retry_delay_multiplier": 1.3,
+          "max_retry_delay_millis": 60000,
+          "initial_rpc_timeout_millis": 190000,
+          "rpc_timeout_multiplier": 1.0,
+          "max_rpc_timeout_millis": 190000,
+          "total_timeout_millis": 600000
+        }
+      },
+      "methods": {
+        "Recognize": {
+          "timeout_millis": 190000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        },
+        "LongRunningRecognize": {
+          "timeout_millis": 60000,
+          "retry_codes_name": "non_idempotent",
+          "retry_params_name": "default"
+        },
+        "StreamingRecognize": {
+          "timeout_millis": 190000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        }
+      }
+    }
+  }
+}
diff --git a/speech/google/cloud/proto/__init__.py b/speech/google/cloud/proto/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/speech/google/cloud/proto/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/speech/google/cloud/proto/speech/__init__.py b/speech/google/cloud/proto/speech/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/speech/google/cloud/proto/speech/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/speech/google/cloud/proto/speech/v1/__init__.py b/speech/google/cloud/proto/speech/v1/__init__.py
new file mode 100644
index 0000000000000..8b137891791fe
--- /dev/null
+++ b/speech/google/cloud/proto/speech/v1/__init__.py
@@ -0,0 +1 @@
+
diff --git a/speech/google/cloud/proto/speech/v1/cloud_speech_pb2.py b/speech/google/cloud/proto/speech/v1/cloud_speech_pb2.py
new file mode 100644
index 0000000000000..29d73064b5564
--- /dev/null
+++ b/speech/google/cloud/proto/speech/v1/cloud_speech_pb2.py
@@ -0,0 +1,1331 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: google/cloud/proto/speech/v1/cloud_speech.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf import descriptor_pb2
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from google.longrunning import operations_pb2 as google_dot_longrunning_dot_operations__pb2
+from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2
+from google.protobuf import duration_pb2 as google_dot_protobuf_dot_duration__pb2
+from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
+from google.rpc import status_pb2 as google_dot_rpc_dot_status__pb2
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='google/cloud/proto/speech/v1/cloud_speech.proto',
+  package='google.cloud.speech.v1',
+  syntax='proto3',
+  serialized_pb=_b('\n/google/cloud/proto/speech/v1/cloud_speech.proto\x12\x16google.cloud.speech.v1\x1a\x1cgoogle/api/annotations.proto\x1a#google/longrunning/operations.proto\x1a\x19google/protobuf/any.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17google/rpc/status.proto\"\x86\x01\n\x10RecognizeRequest\x12\x39\n\x06\x63onfig\x18\x01 \x01(\x0b\x32).google.cloud.speech.v1.RecognitionConfig\x12\x37\n\x05\x61udio\x18\x02 \x01(\x0b\x32(.google.cloud.speech.v1.RecognitionAudio\"\x91\x01\n\x1bLongRunningRecognizeRequest\x12\x39\n\x06\x63onfig\x18\x01 \x01(\x0b\x32).google.cloud.speech.v1.RecognitionConfig\x12\x37\n\x05\x61udio\x18\x02 \x01(\x0b\x32(.google.cloud.speech.v1.RecognitionAudio\"\x99\x01\n\x19StreamingRecognizeRequest\x12N\n\x10streaming_config\x18\x01 \x01(\x0b\x32\x32.google.cloud.speech.v1.StreamingRecognitionConfigH\x00\x12\x17\n\raudio_content\x18\x02 \x01(\x0cH\x00\x42\x13\n\x11streaming_request\"\x8a\x01\n\x1aStreamingRecognitionConfig\x12\x39\n\x06\x63onfig\x18\x01 \x01(\x0b\x32).google.cloud.speech.v1.RecognitionConfig\x12\x18\n\x10single_utterance\x18\x02 \x01(\x08\x12\x17\n\x0finterim_results\x18\x03 \x01(\x08\"\x92\x03\n\x11RecognitionConfig\x12I\n\x08\x65ncoding\x18\x01 \x01(\x0e\x32\x37.google.cloud.speech.v1.RecognitionConfig.AudioEncoding\x12\x19\n\x11sample_rate_hertz\x18\x02 \x01(\x05\x12\x15\n\rlanguage_code\x18\x03 \x01(\t\x12\x18\n\x10max_alternatives\x18\x04 \x01(\x05\x12\x18\n\x10profanity_filter\x18\x05 \x01(\x08\x12>\n\x0fspeech_contexts\x18\x06 \x03(\x0b\x32%.google.cloud.speech.v1.SpeechContext\"\x8b\x01\n\rAudioEncoding\x12\x18\n\x14\x45NCODING_UNSPECIFIED\x10\x00\x12\x0c\n\x08LINEAR16\x10\x01\x12\x08\n\x04\x46LAC\x10\x02\x12\t\n\x05MULAW\x10\x03\x12\x07\n\x03\x41MR\x10\x04\x12\n\n\x06\x41MR_WB\x10\x05\x12\x0c\n\x08OGG_OPUS\x10\x06\x12\x1a\n\x16SPEEX_WITH_HEADER_BYTE\x10\x07\" \n\rSpeechContext\x12\x0f\n\x07phrases\x18\x01 \x03(\t\"D\n\x10RecognitionAudio\x12\x11\n\x07\x63ontent\x18\x01 \x01(\x0cH\x00\x12\r\n\x03uri\x18\x02 \x01(\tH\x00\x42\x0e\n\x0c\x61udio_source\"U\n\x11RecognizeResponse\x12@\n\x07results\x18\x02 \x03(\x0b\x32/.google.cloud.speech.v1.SpeechRecognitionResult\"`\n\x1cLongRunningRecognizeResponse\x12@\n\x07results\x18\x02 \x03(\x0b\x32/.google.cloud.speech.v1.SpeechRecognitionResult\"\x9e\x01\n\x1cLongRunningRecognizeMetadata\x12\x18\n\x10progress_percent\x18\x01 \x01(\x05\x12.\n\nstart_time\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x34\n\x10last_update_time\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\"\xb1\x02\n\x1aStreamingRecognizeResponse\x12!\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x12.google.rpc.Status\x12\x43\n\x07results\x18\x02 \x03(\x0b\x32\x32.google.cloud.speech.v1.StreamingRecognitionResult\x12]\n\x11speech_event_type\x18\x04 \x01(\x0e\x32\x42.google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType\"L\n\x0fSpeechEventType\x12\x1c\n\x18SPEECH_EVENT_UNSPECIFIED\x10\x00\x12\x1b\n\x17\x45ND_OF_SINGLE_UTTERANCE\x10\x01\"\x8d\x01\n\x1aStreamingRecognitionResult\x12J\n\x0c\x61lternatives\x18\x01 \x03(\x0b\x32\x34.google.cloud.speech.v1.SpeechRecognitionAlternative\x12\x10\n\x08is_final\x18\x02 \x01(\x08\x12\x11\n\tstability\x18\x03 \x01(\x02\"e\n\x17SpeechRecognitionResult\x12J\n\x0c\x61lternatives\x18\x01 \x03(\x0b\x32\x34.google.cloud.speech.v1.SpeechRecognitionAlternative\"F\n\x1cSpeechRecognitionAlternative\x12\x12\n\ntranscript\x18\x01 \x01(\t\x12\x12\n\nconfidence\x18\x02 \x01(\x02\x32\xa6\x03\n\x06Speech\x12\x81\x01\n\tRecognize\x12(.google.cloud.speech.v1.RecognizeRequest\x1a).google.cloud.speech.v1.RecognizeResponse\"\x1f\x82\xd3\xe4\x93\x02\x19\"\x14/v1/speech:recognize:\x01*\x12\x96\x01\n\x14LongRunningRecognize\x12\x33.google.cloud.speech.v1.LongRunningRecognizeRequest\x1a\x1d.google.longrunning.Operation\"*\x82\xd3\xe4\x93\x02$\"\x1f/v1/speech:longrunningrecognize:\x01*\x12\x7f\n\x12StreamingRecognize\x12\x31.google.cloud.speech.v1.StreamingRecognizeRequest\x1a\x32.google.cloud.speech.v1.StreamingRecognizeResponse(\x01\x30\x01\x42i\n\x1a\x63om.google.cloud.speech.v1B\x0bSpeechProtoP\x01Z<google.golang.org/genproto/googleapis/cloud/speech/v1;speechb\x06proto3')
+  ,
+  dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_longrunning_dot_operations__pb2.DESCRIPTOR,google_dot_protobuf_dot_any__pb2.DESCRIPTOR,google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,google_dot_rpc_dot_status__pb2.DESCRIPTOR,])
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+
+
+_RECOGNITIONCONFIG_AUDIOENCODING = _descriptor.EnumDescriptor(
+  name='AudioEncoding',
+  full_name='google.cloud.speech.v1.RecognitionConfig.AudioEncoding',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='ENCODING_UNSPECIFIED', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LINEAR16', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='FLAC', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MULAW', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AMR', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AMR_WB', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='OGG_OPUS', index=6, number=6,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SPEEX_WITH_HEADER_BYTE', index=7, number=7,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=1105,
+  serialized_end=1244,
+)
+_sym_db.RegisterEnumDescriptor(_RECOGNITIONCONFIG_AUDIOENCODING)
+
+_STREAMINGRECOGNIZERESPONSE_SPEECHEVENTTYPE = _descriptor.EnumDescriptor(
+  name='SpeechEventType',
+  full_name='google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='SPEECH_EVENT_UNSPECIFIED', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='END_OF_SINGLE_UTTERANCE', index=1, number=1,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=1926,
+  serialized_end=2002,
+)
+_sym_db.RegisterEnumDescriptor(_STREAMINGRECOGNIZERESPONSE_SPEECHEVENTTYPE)
+
+
+_RECOGNIZEREQUEST = _descriptor.Descriptor(
+  name='RecognizeRequest',
+  full_name='google.cloud.speech.v1.RecognizeRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='config', full_name='google.cloud.speech.v1.RecognizeRequest.config', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='audio', full_name='google.cloud.speech.v1.RecognizeRequest.audio', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=260,
+  serialized_end=394,
+)
+
+
+_LONGRUNNINGRECOGNIZEREQUEST = _descriptor.Descriptor(
+  name='LongRunningRecognizeRequest',
+  full_name='google.cloud.speech.v1.LongRunningRecognizeRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='config', full_name='google.cloud.speech.v1.LongRunningRecognizeRequest.config', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='audio', full_name='google.cloud.speech.v1.LongRunningRecognizeRequest.audio', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=397,
+  serialized_end=542,
+)
+
+
+_STREAMINGRECOGNIZEREQUEST = _descriptor.Descriptor(
+  name='StreamingRecognizeRequest',
+  full_name='google.cloud.speech.v1.StreamingRecognizeRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='streaming_config', full_name='google.cloud.speech.v1.StreamingRecognizeRequest.streaming_config', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='audio_content', full_name='google.cloud.speech.v1.StreamingRecognizeRequest.audio_content', index=1,
+      number=2, type=12, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b(""),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+    _descriptor.OneofDescriptor(
+      name='streaming_request', full_name='google.cloud.speech.v1.StreamingRecognizeRequest.streaming_request',
+      index=0, containing_type=None, fields=[]),
+  ],
+  serialized_start=545,
+  serialized_end=698,
+)
+
+
+_STREAMINGRECOGNITIONCONFIG = _descriptor.Descriptor(
+  name='StreamingRecognitionConfig',
+  full_name='google.cloud.speech.v1.StreamingRecognitionConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='config', full_name='google.cloud.speech.v1.StreamingRecognitionConfig.config', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='single_utterance', full_name='google.cloud.speech.v1.StreamingRecognitionConfig.single_utterance', index=1,
+      number=2, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='interim_results', full_name='google.cloud.speech.v1.StreamingRecognitionConfig.interim_results', index=2,
+      number=3, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=701,
+  serialized_end=839,
+)
+
+
+_RECOGNITIONCONFIG = _descriptor.Descriptor(
+  name='RecognitionConfig',
+  full_name='google.cloud.speech.v1.RecognitionConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='encoding', full_name='google.cloud.speech.v1.RecognitionConfig.encoding', index=0,
+      number=1, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='sample_rate_hertz', full_name='google.cloud.speech.v1.RecognitionConfig.sample_rate_hertz', index=1,
+      number=2, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='language_code', full_name='google.cloud.speech.v1.RecognitionConfig.language_code', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='max_alternatives', full_name='google.cloud.speech.v1.RecognitionConfig.max_alternatives', index=3,
+      number=4, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='profanity_filter', full_name='google.cloud.speech.v1.RecognitionConfig.profanity_filter', index=4,
+      number=5, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='speech_contexts', full_name='google.cloud.speech.v1.RecognitionConfig.speech_contexts', index=5,
+      number=6, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _RECOGNITIONCONFIG_AUDIOENCODING,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=842,
+  serialized_end=1244,
+)
+
+
+_SPEECHCONTEXT = _descriptor.Descriptor(
+  name='SpeechContext',
+  full_name='google.cloud.speech.v1.SpeechContext',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='phrases', full_name='google.cloud.speech.v1.SpeechContext.phrases', index=0,
+      number=1, type=9, cpp_type=9, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1246,
+  serialized_end=1278,
+)
+
+
+_RECOGNITIONAUDIO = _descriptor.Descriptor(
+  name='RecognitionAudio',
+  full_name='google.cloud.speech.v1.RecognitionAudio',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='content', full_name='google.cloud.speech.v1.RecognitionAudio.content', index=0,
+      number=1, type=12, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b(""),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='uri', full_name='google.cloud.speech.v1.RecognitionAudio.uri', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+    _descriptor.OneofDescriptor(
+      name='audio_source', full_name='google.cloud.speech.v1.RecognitionAudio.audio_source',
+      index=0, containing_type=None, fields=[]),
+  ],
+  serialized_start=1280,
+  serialized_end=1348,
+)
+
+
+_RECOGNIZERESPONSE = _descriptor.Descriptor(
+  name='RecognizeResponse',
+  full_name='google.cloud.speech.v1.RecognizeResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='results', full_name='google.cloud.speech.v1.RecognizeResponse.results', index=0,
+      number=2, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1350,
+  serialized_end=1435,
+)
+
+
+_LONGRUNNINGRECOGNIZERESPONSE = _descriptor.Descriptor(
+  name='LongRunningRecognizeResponse',
+  full_name='google.cloud.speech.v1.LongRunningRecognizeResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='results', full_name='google.cloud.speech.v1.LongRunningRecognizeResponse.results', index=0,
+      number=2, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1437,
+  serialized_end=1533,
+)
+
+
+_LONGRUNNINGRECOGNIZEMETADATA = _descriptor.Descriptor(
+  name='LongRunningRecognizeMetadata',
+  full_name='google.cloud.speech.v1.LongRunningRecognizeMetadata',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='progress_percent', full_name='google.cloud.speech.v1.LongRunningRecognizeMetadata.progress_percent', index=0,
+      number=1, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='start_time', full_name='google.cloud.speech.v1.LongRunningRecognizeMetadata.start_time', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='last_update_time', full_name='google.cloud.speech.v1.LongRunningRecognizeMetadata.last_update_time', index=2,
+      number=3, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1536,
+  serialized_end=1694,
+)
+
+
+_STREAMINGRECOGNIZERESPONSE = _descriptor.Descriptor(
+  name='StreamingRecognizeResponse',
+  full_name='google.cloud.speech.v1.StreamingRecognizeResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='error', full_name='google.cloud.speech.v1.StreamingRecognizeResponse.error', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='results', full_name='google.cloud.speech.v1.StreamingRecognizeResponse.results', index=1,
+      number=2, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='speech_event_type', full_name='google.cloud.speech.v1.StreamingRecognizeResponse.speech_event_type', index=2,
+      number=4, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _STREAMINGRECOGNIZERESPONSE_SPEECHEVENTTYPE,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1697,
+  serialized_end=2002,
+)
+
+
+_STREAMINGRECOGNITIONRESULT = _descriptor.Descriptor(
+  name='StreamingRecognitionResult',
+  full_name='google.cloud.speech.v1.StreamingRecognitionResult',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='alternatives', full_name='google.cloud.speech.v1.StreamingRecognitionResult.alternatives', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='is_final', full_name='google.cloud.speech.v1.StreamingRecognitionResult.is_final', index=1,
+      number=2, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='stability', full_name='google.cloud.speech.v1.StreamingRecognitionResult.stability', index=2,
+      number=3, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=2005,
+  serialized_end=2146,
+)
+
+
+_SPEECHRECOGNITIONRESULT = _descriptor.Descriptor(
+  name='SpeechRecognitionResult',
+  full_name='google.cloud.speech.v1.SpeechRecognitionResult',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='alternatives', full_name='google.cloud.speech.v1.SpeechRecognitionResult.alternatives', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=2148,
+  serialized_end=2249,
+)
+
+
+_SPEECHRECOGNITIONALTERNATIVE = _descriptor.Descriptor(
+  name='SpeechRecognitionAlternative',
+  full_name='google.cloud.speech.v1.SpeechRecognitionAlternative',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='transcript', full_name='google.cloud.speech.v1.SpeechRecognitionAlternative.transcript', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='confidence', full_name='google.cloud.speech.v1.SpeechRecognitionAlternative.confidence', index=1,
+      number=2, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=2251,
+  serialized_end=2321,
+)
+
+_RECOGNIZEREQUEST.fields_by_name['config'].message_type = _RECOGNITIONCONFIG
+_RECOGNIZEREQUEST.fields_by_name['audio'].message_type = _RECOGNITIONAUDIO
+_LONGRUNNINGRECOGNIZEREQUEST.fields_by_name['config'].message_type = _RECOGNITIONCONFIG
+_LONGRUNNINGRECOGNIZEREQUEST.fields_by_name['audio'].message_type = _RECOGNITIONAUDIO
+_STREAMINGRECOGNIZEREQUEST.fields_by_name['streaming_config'].message_type = _STREAMINGRECOGNITIONCONFIG
+_STREAMINGRECOGNIZEREQUEST.oneofs_by_name['streaming_request'].fields.append(
+  _STREAMINGRECOGNIZEREQUEST.fields_by_name['streaming_config'])
+_STREAMINGRECOGNIZEREQUEST.fields_by_name['streaming_config'].containing_oneof = _STREAMINGRECOGNIZEREQUEST.oneofs_by_name['streaming_request']
+_STREAMINGRECOGNIZEREQUEST.oneofs_by_name['streaming_request'].fields.append(
+  _STREAMINGRECOGNIZEREQUEST.fields_by_name['audio_content'])
+_STREAMINGRECOGNIZEREQUEST.fields_by_name['audio_content'].containing_oneof = _STREAMINGRECOGNIZEREQUEST.oneofs_by_name['streaming_request']
+_STREAMINGRECOGNITIONCONFIG.fields_by_name['config'].message_type = _RECOGNITIONCONFIG
+_RECOGNITIONCONFIG.fields_by_name['encoding'].enum_type = _RECOGNITIONCONFIG_AUDIOENCODING
+_RECOGNITIONCONFIG.fields_by_name['speech_contexts'].message_type = _SPEECHCONTEXT
+_RECOGNITIONCONFIG_AUDIOENCODING.containing_type = _RECOGNITIONCONFIG
+_RECOGNITIONAUDIO.oneofs_by_name['audio_source'].fields.append(
+  _RECOGNITIONAUDIO.fields_by_name['content'])
+_RECOGNITIONAUDIO.fields_by_name['content'].containing_oneof = _RECOGNITIONAUDIO.oneofs_by_name['audio_source']
+_RECOGNITIONAUDIO.oneofs_by_name['audio_source'].fields.append(
+  _RECOGNITIONAUDIO.fields_by_name['uri'])
+_RECOGNITIONAUDIO.fields_by_name['uri'].containing_oneof = _RECOGNITIONAUDIO.oneofs_by_name['audio_source']
+_RECOGNIZERESPONSE.fields_by_name['results'].message_type = _SPEECHRECOGNITIONRESULT
+_LONGRUNNINGRECOGNIZERESPONSE.fields_by_name['results'].message_type = _SPEECHRECOGNITIONRESULT
+_LONGRUNNINGRECOGNIZEMETADATA.fields_by_name['start_time'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP
+_LONGRUNNINGRECOGNIZEMETADATA.fields_by_name['last_update_time'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP
+_STREAMINGRECOGNIZERESPONSE.fields_by_name['error'].message_type = google_dot_rpc_dot_status__pb2._STATUS
+_STREAMINGRECOGNIZERESPONSE.fields_by_name['results'].message_type = _STREAMINGRECOGNITIONRESULT
+_STREAMINGRECOGNIZERESPONSE.fields_by_name['speech_event_type'].enum_type = _STREAMINGRECOGNIZERESPONSE_SPEECHEVENTTYPE
+_STREAMINGRECOGNIZERESPONSE_SPEECHEVENTTYPE.containing_type = _STREAMINGRECOGNIZERESPONSE
+_STREAMINGRECOGNITIONRESULT.fields_by_name['alternatives'].message_type = _SPEECHRECOGNITIONALTERNATIVE
+_SPEECHRECOGNITIONRESULT.fields_by_name['alternatives'].message_type = _SPEECHRECOGNITIONALTERNATIVE
+DESCRIPTOR.message_types_by_name['RecognizeRequest'] = _RECOGNIZEREQUEST
+DESCRIPTOR.message_types_by_name['LongRunningRecognizeRequest'] = _LONGRUNNINGRECOGNIZEREQUEST
+DESCRIPTOR.message_types_by_name['StreamingRecognizeRequest'] = _STREAMINGRECOGNIZEREQUEST
+DESCRIPTOR.message_types_by_name['StreamingRecognitionConfig'] = _STREAMINGRECOGNITIONCONFIG
+DESCRIPTOR.message_types_by_name['RecognitionConfig'] = _RECOGNITIONCONFIG
+DESCRIPTOR.message_types_by_name['SpeechContext'] = _SPEECHCONTEXT
+DESCRIPTOR.message_types_by_name['RecognitionAudio'] = _RECOGNITIONAUDIO
+DESCRIPTOR.message_types_by_name['RecognizeResponse'] = _RECOGNIZERESPONSE
+DESCRIPTOR.message_types_by_name['LongRunningRecognizeResponse'] = _LONGRUNNINGRECOGNIZERESPONSE
+DESCRIPTOR.message_types_by_name['LongRunningRecognizeMetadata'] = _LONGRUNNINGRECOGNIZEMETADATA
+DESCRIPTOR.message_types_by_name['StreamingRecognizeResponse'] = _STREAMINGRECOGNIZERESPONSE
+DESCRIPTOR.message_types_by_name['StreamingRecognitionResult'] = _STREAMINGRECOGNITIONRESULT
+DESCRIPTOR.message_types_by_name['SpeechRecognitionResult'] = _SPEECHRECOGNITIONRESULT
+DESCRIPTOR.message_types_by_name['SpeechRecognitionAlternative'] = _SPEECHRECOGNITIONALTERNATIVE
+
+RecognizeRequest = _reflection.GeneratedProtocolMessageType('RecognizeRequest', (_message.Message,), dict(
+  DESCRIPTOR = _RECOGNIZEREQUEST,
+  __module__ = 'google.cloud.proto.speech.v1.cloud_speech_pb2'
+  ,
+  __doc__ = """The top-level message sent by the client for the ``Recognize`` method.
+  
+  
+  Attributes:
+      config:
+          *Required* Provides information to the recognizer that
+          specifies how to process the request.
+      audio:
+          *Required* The audio data to be recognized.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.RecognizeRequest)
+  ))
+_sym_db.RegisterMessage(RecognizeRequest)
+
+LongRunningRecognizeRequest = _reflection.GeneratedProtocolMessageType('LongRunningRecognizeRequest', (_message.Message,), dict(
+  DESCRIPTOR = _LONGRUNNINGRECOGNIZEREQUEST,
+  __module__ = 'google.cloud.proto.speech.v1.cloud_speech_pb2'
+  ,
+  __doc__ = """The top-level message sent by the client for the
+  ``LongRunningRecognize`` method.
+  
+  
+  Attributes:
+      config:
+          *Required* Provides information to the recognizer that
+          specifies how to process the request.
+      audio:
+          *Required* The audio data to be recognized.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.LongRunningRecognizeRequest)
+  ))
+_sym_db.RegisterMessage(LongRunningRecognizeRequest)
+
+StreamingRecognizeRequest = _reflection.GeneratedProtocolMessageType('StreamingRecognizeRequest', (_message.Message,), dict(
+  DESCRIPTOR = _STREAMINGRECOGNIZEREQUEST,
+  __module__ = 'google.cloud.proto.speech.v1.cloud_speech_pb2'
+  ,
+  __doc__ = """The top-level message sent by the client for the ``StreamingRecognize``
+  method. Multiple ``StreamingRecognizeRequest`` messages are sent. The
+  first message must contain a ``streaming_config`` message and must not
+  contain ``audio`` data. All subsequent messages must contain ``audio``
+  data and must not contain a ``streaming_config`` message.
+  
+  
+  Attributes:
+      streaming_config:
+          Provides information to the recognizer that specifies how to
+          process the request. The first ``StreamingRecognizeRequest``
+          message must contain a ``streaming_config`` message.
+      audio_content:
+          The audio data to be recognized. Sequential chunks of audio
+          data are sent in sequential ``StreamingRecognizeRequest``
+          messages. The first ``StreamingRecognizeRequest`` message must
+          not contain ``audio_content`` data and all subsequent
+          ``StreamingRecognizeRequest`` messages must contain
+          ``audio_content`` data. The audio bytes must be encoded as
+          specified in ``RecognitionConfig``. Note: as with all bytes
+          fields, protobuffers use a pure binary representation (not
+          base64). See `audio limits
+          <https://cloud.google.com/speech/limits#content>`__.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.StreamingRecognizeRequest)
+  ))
+_sym_db.RegisterMessage(StreamingRecognizeRequest)
+
+StreamingRecognitionConfig = _reflection.GeneratedProtocolMessageType('StreamingRecognitionConfig', (_message.Message,), dict(
+  DESCRIPTOR = _STREAMINGRECOGNITIONCONFIG,
+  __module__ = 'google.cloud.proto.speech.v1.cloud_speech_pb2'
+  ,
+  __doc__ = """Provides information to the recognizer that specifies how to process the
+  request.
+  
+  
+  Attributes:
+      config:
+          *Required* Provides information to the recognizer that
+          specifies how to process the request.
+      single_utterance:
+          *Optional* If ``false`` or omitted, the recognizer will
+          perform continuous recognition (continuing to wait for and
+          process audio even if the user pauses speaking) until the
+          client closes the input stream (gRPC API) or until the maximum
+          time limit has been reached. May return multiple
+          ``StreamingRecognitionResult``\ s with the ``is_final`` flag
+          set to ``true``.  If ``true``, the recognizer will detect a
+          single spoken utterance. When it detects that the user has
+          paused or stopped speaking, it will return an
+          ``END_OF_SINGLE_UTTERANCE`` event and cease recognition. It
+          will return no more than one ``StreamingRecognitionResult``
+          with the ``is_final`` flag set to ``true``.
+      interim_results:
+          *Optional* If ``true``, interim results (tentative hypotheses)
+          may be returned as they become available (these interim
+          results are indicated with the ``is_final=false`` flag). If
+          ``false`` or omitted, only ``is_final=true`` result(s) are
+          returned.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.StreamingRecognitionConfig)
+  ))
+_sym_db.RegisterMessage(StreamingRecognitionConfig)
+
+RecognitionConfig = _reflection.GeneratedProtocolMessageType('RecognitionConfig', (_message.Message,), dict(
+  DESCRIPTOR = _RECOGNITIONCONFIG,
+  __module__ = 'google.cloud.proto.speech.v1.cloud_speech_pb2'
+  ,
+  __doc__ = """Provides information to the recognizer that specifies how to process the
+  request.
+  
+  
+  Attributes:
+      encoding:
+          *Required* Encoding of audio data sent in all
+          ``RecognitionAudio`` messages.
+      sample_rate_hertz:
+          *Required* Sample rate in Hertz of the audio data sent in all
+          ``RecognitionAudio`` messages. Valid values are: 8000-48000.
+          16000 is optimal. For best results, set the sampling rate of
+          the audio source to 16000 Hz. If that's not possible, use the
+          native sample rate of the audio source (instead of re-
+          sampling).
+      language_code:
+          *Required* The language of the supplied audio as a `BCP-47
+          <https://www.rfc-editor.org/rfc/bcp/bcp47.txt>`__ language
+          tag. Example: "en-US". See `Language Support
+          <https://cloud.google.com/speech/docs/languages>`__ for a list
+          of the currently supported language codes.
+      max_alternatives:
+          *Optional* Maximum number of recognition hypotheses to be
+          returned. Specifically, the maximum number of
+          ``SpeechRecognitionAlternative`` messages within each
+          ``SpeechRecognitionResult``. The server may return fewer than
+          ``max_alternatives``. Valid values are ``0``-``30``. A value
+          of ``0`` or ``1`` will return a maximum of one. If omitted,
+          will return a maximum of one.
+      profanity_filter:
+          *Optional* If set to ``true``, the server will attempt to
+          filter out profanities, replacing all but the initial
+          character in each filtered word with asterisks, e.g.
+          "f\*\*\*". If set to ``false`` or omitted, profanities won't
+          be filtered out.
+      speech_contexts:
+          *Optional* A means to provide context to assist the speech
+          recognition.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.RecognitionConfig)
+  ))
+_sym_db.RegisterMessage(RecognitionConfig)
+
+SpeechContext = _reflection.GeneratedProtocolMessageType('SpeechContext', (_message.Message,), dict(
+  DESCRIPTOR = _SPEECHCONTEXT,
+  __module__ = 'google.cloud.proto.speech.v1.cloud_speech_pb2'
+  ,
+  __doc__ = """Provides "hints" to the speech recognizer to favor specific words and
+  phrases in the results.
+  
+  
+  Attributes:
+      phrases:
+          *Optional* A list of strings containing words and phrases
+          "hints" so that the speech recognition is more likely to
+          recognize them. This can be used to improve the accuracy for
+          specific words and phrases, for example, if specific commands
+          are typically spoken by the user. This can also be used to add
+          additional words to the vocabulary of the recognizer. See
+          `usage limits
+          <https://cloud.google.com/speech/limits#content>`__.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.SpeechContext)
+  ))
+_sym_db.RegisterMessage(SpeechContext)
+
+RecognitionAudio = _reflection.GeneratedProtocolMessageType('RecognitionAudio', (_message.Message,), dict(
+  DESCRIPTOR = _RECOGNITIONAUDIO,
+  __module__ = 'google.cloud.proto.speech.v1.cloud_speech_pb2'
+  ,
+  __doc__ = """Contains audio data in the encoding specified in the
+  ``RecognitionConfig``. Either ``content`` or ``uri`` must be supplied.
+  Supplying both or neither returns [google.rpc.Code.INVALID\_ARGUMENT][].
+  See `audio limits <https://cloud.google.com/speech/limits#content>`__.
+  
+  
+  Attributes:
+      content:
+          The audio data bytes encoded as specified in
+          ``RecognitionConfig``. Note: as with all bytes fields,
+          protobuffers use a pure binary representation, whereas JSON
+          representations use base64.
+      uri:
+          URI that points to a file that contains audio data bytes as
+          specified in ``RecognitionConfig``. Currently, only Google
+          Cloud Storage URIs are supported, which must be specified in
+          the following format: ``gs://bucket_name/object_name`` (other
+          URI formats return [google.rpc.Code.INVALID\_ARGUMENT][]). For
+          more information, see `Request URIs
+          <https://cloud.google.com/storage/docs/reference-uris>`__.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.RecognitionAudio)
+  ))
+_sym_db.RegisterMessage(RecognitionAudio)
+
+RecognizeResponse = _reflection.GeneratedProtocolMessageType('RecognizeResponse', (_message.Message,), dict(
+  DESCRIPTOR = _RECOGNIZERESPONSE,
+  __module__ = 'google.cloud.proto.speech.v1.cloud_speech_pb2'
+  ,
+  __doc__ = """The only message returned to the client by the ``Recognize`` method. It
+  contains the result as zero or more sequential
+  ``SpeechRecognitionResult`` messages.
+  
+  
+  Attributes:
+      results:
+          *Output-only* Sequential list of transcription results
+          corresponding to sequential portions of audio.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.RecognizeResponse)
+  ))
+_sym_db.RegisterMessage(RecognizeResponse)
+
+LongRunningRecognizeResponse = _reflection.GeneratedProtocolMessageType('LongRunningRecognizeResponse', (_message.Message,), dict(
+  DESCRIPTOR = _LONGRUNNINGRECOGNIZERESPONSE,
+  __module__ = 'google.cloud.proto.speech.v1.cloud_speech_pb2'
+  ,
+  __doc__ = """The only message returned to the client by the ``LongRunningRecognize``
+  method. It contains the result as zero or more sequential
+  ``SpeechRecognitionResult`` messages. It is included in the
+  ``result.response`` field of the ``Operation`` returned by the
+  ``GetOperation`` call of the ``google::longrunning::Operations``
+  service.
+  
+  
+  Attributes:
+      results:
+          *Output-only* Sequential list of transcription results
+          corresponding to sequential portions of audio.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.LongRunningRecognizeResponse)
+  ))
+_sym_db.RegisterMessage(LongRunningRecognizeResponse)
+
+LongRunningRecognizeMetadata = _reflection.GeneratedProtocolMessageType('LongRunningRecognizeMetadata', (_message.Message,), dict(
+  DESCRIPTOR = _LONGRUNNINGRECOGNIZEMETADATA,
+  __module__ = 'google.cloud.proto.speech.v1.cloud_speech_pb2'
+  ,
+  __doc__ = """Describes the progress of a long-running ``LongRunningRecognize`` call.
+  It is included in the ``metadata`` field of the ``Operation`` returned
+  by the ``GetOperation`` call of the ``google::longrunning::Operations``
+  service.
+  
+  
+  Attributes:
+      progress_percent:
+          Approximate percentage of audio processed thus far. Guaranteed
+          to be 100 when the audio is fully processed and the results
+          are available.
+      start_time:
+          Time when the request was received.
+      last_update_time:
+          Time of the most recent processing update.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.LongRunningRecognizeMetadata)
+  ))
+_sym_db.RegisterMessage(LongRunningRecognizeMetadata)
+
+StreamingRecognizeResponse = _reflection.GeneratedProtocolMessageType('StreamingRecognizeResponse', (_message.Message,), dict(
+  DESCRIPTOR = _STREAMINGRECOGNIZERESPONSE,
+  __module__ = 'google.cloud.proto.speech.v1.cloud_speech_pb2'
+  ,
+  __doc__ = """``StreamingRecognizeResponse`` is the only message returned to the
+  client by ``StreamingRecognize``. A series of one or more
+  ``StreamingRecognizeResponse`` messages are streamed back to the client.
+  
+  Here's an example of a series of ten ``StreamingRecognizeResponse``\ s
+  that might be returned while processing audio:
+  
+  1. results { alternatives { transcript: "tube" } stability: 0.01 }
+  
+  2. results { alternatives { transcript: "to be a" } stability: 0.01 }
+  
+  3. results { alternatives { transcript: "to be" } stability: 0.9 }
+     results { alternatives { transcript: " or not to be" } stability:
+     0.01 }
+  
+  4. results { alternatives { transcript: "to be or not to be" confidence:
+     0.92 } alternatives { transcript: "to bee or not to bee" } is\_final:
+     true }
+  
+  5. results { alternatives { transcript: " that's" } stability: 0.01 }
+  
+  6. results { alternatives { transcript: " that is" } stability: 0.9 }
+     results { alternatives { transcript: " the question" } stability:
+     0.01 }
+  
+  7. speech\_event\_type: END\_OF\_SINGLE\_UTTERANCE
+  
+  8. results { alternatives { transcript: " that is the question"
+     confidence: 0.98 } alternatives { transcript: " that was the
+     question" } is\_final: true }
+  
+  Notes:
+  
+  -  Only two of the above responses #4 and #8 contain final results; they
+     are indicated by ``is_final: true``. Concatenating these together
+     generates the full transcript: "to be or not to be that is the
+     question".
+  
+  -  The others contain interim ``results``. #3 and #6 contain two interim
+     ``results``: the first portion has a high stability and is less
+     likely to change; the second portion has a low stability and is very
+     likely to change. A UI designer might choose to show only high
+     stability ``results``.
+  
+  -  The specific ``stability`` and ``confidence`` values shown above are
+     only for illustrative purposes. Actual values may vary.
+  
+  -  In each response, only one of these fields will be set: ``error``,
+     ``speech_event_type``, or one or more (repeated) ``results``.
+  
+  
+  
+  
+  Attributes:
+      error:
+          *Output-only* If set, returns a [google.rpc.Status][] message
+          that specifies the error for the operation.
+      results:
+          *Output-only* This repeated list contains zero or more results
+          that correspond to consecutive portions of the audio currently
+          being processed. It contains zero or one ``is_final=true``
+          result (the newly settled portion), followed by zero or more
+          ``is_final=false`` results.
+      speech_event_type:
+          *Output-only* Indicates the type of speech event.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.StreamingRecognizeResponse)
+  ))
+_sym_db.RegisterMessage(StreamingRecognizeResponse)
+
+StreamingRecognitionResult = _reflection.GeneratedProtocolMessageType('StreamingRecognitionResult', (_message.Message,), dict(
+  DESCRIPTOR = _STREAMINGRECOGNITIONRESULT,
+  __module__ = 'google.cloud.proto.speech.v1.cloud_speech_pb2'
+  ,
+  __doc__ = """A streaming speech recognition result corresponding to a portion of the
+  audio that is currently being processed.
+  
+  
+  Attributes:
+      alternatives:
+          *Output-only* May contain one or more recognition hypotheses
+          (up to the maximum specified in ``max_alternatives``).
+      is_final:
+          *Output-only* If ``false``, this
+          ``StreamingRecognitionResult`` represents an interim result
+          that may change. If ``true``, this is the final time the
+          speech service will return this particular
+          ``StreamingRecognitionResult``, the recognizer will not return
+          any further hypotheses for this portion of the transcript and
+          corresponding audio.
+      stability:
+          *Output-only* An estimate of the likelihood that the
+          recognizer will not change its guess about this interim
+          result. Values range from 0.0 (completely unstable) to 1.0
+          (completely stable). This field is only provided for interim
+          results (``is_final=false``). The default of 0.0 is a sentinel
+          value indicating ``stability`` was not set.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.StreamingRecognitionResult)
+  ))
+_sym_db.RegisterMessage(StreamingRecognitionResult)
+
+SpeechRecognitionResult = _reflection.GeneratedProtocolMessageType('SpeechRecognitionResult', (_message.Message,), dict(
+  DESCRIPTOR = _SPEECHRECOGNITIONRESULT,
+  __module__ = 'google.cloud.proto.speech.v1.cloud_speech_pb2'
+  ,
+  __doc__ = """A speech recognition result corresponding to a portion of the audio.
+  
+  
+  Attributes:
+      alternatives:
+          *Output-only* May contain one or more recognition hypotheses
+          (up to the maximum specified in ``max_alternatives``).
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.SpeechRecognitionResult)
+  ))
+_sym_db.RegisterMessage(SpeechRecognitionResult)
+
+SpeechRecognitionAlternative = _reflection.GeneratedProtocolMessageType('SpeechRecognitionAlternative', (_message.Message,), dict(
+  DESCRIPTOR = _SPEECHRECOGNITIONALTERNATIVE,
+  __module__ = 'google.cloud.proto.speech.v1.cloud_speech_pb2'
+  ,
+  __doc__ = """Alternative hypotheses (a.k.a. n-best list).
+  
+  
+  Attributes:
+      transcript:
+          *Output-only* Transcript text representing the words that the
+          user spoke.
+      confidence:
+          *Output-only* The confidence estimate between 0.0 and 1.0. A
+          higher number indicates an estimated greater likelihood that
+          the recognized words are correct. This field is typically
+          provided only for the top hypothesis, and only for
+          ``is_final=true`` results. Clients should not rely on the
+          ``confidence`` field as it is not guaranteed to be accurate,
+          or even set, in any of the results. The default of 0.0 is a
+          sentinel value indicating ``confidence`` was not set.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.SpeechRecognitionAlternative)
+  ))
+_sym_db.RegisterMessage(SpeechRecognitionAlternative)
+
+
+DESCRIPTOR.has_options = True
+DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\032com.google.cloud.speech.v1B\013SpeechProtoP\001Z<google.golang.org/genproto/googleapis/cloud/speech/v1;speech'))
+try:
+  # THESE ELEMENTS WILL BE DEPRECATED.
+  # Please use the generated *_pb2_grpc.py files instead.
+  import grpc
+  from grpc.beta import implementations as beta_implementations
+  from grpc.beta import interfaces as beta_interfaces
+  from grpc.framework.common import cardinality
+  from grpc.framework.interfaces.face import utilities as face_utilities
+
+
+  class SpeechStub(object):
+    """Service that implements Google Cloud Speech API.
+    """
+
+    def __init__(self, channel):
+      """Constructor.
+
+      Args:
+        channel: A grpc.Channel.
+      """
+      self.Recognize = channel.unary_unary(
+          '/google.cloud.speech.v1.Speech/Recognize',
+          request_serializer=RecognizeRequest.SerializeToString,
+          response_deserializer=RecognizeResponse.FromString,
+          )
+      self.LongRunningRecognize = channel.unary_unary(
+          '/google.cloud.speech.v1.Speech/LongRunningRecognize',
+          request_serializer=LongRunningRecognizeRequest.SerializeToString,
+          response_deserializer=google_dot_longrunning_dot_operations__pb2.Operation.FromString,
+          )
+      self.StreamingRecognize = channel.stream_stream(
+          '/google.cloud.speech.v1.Speech/StreamingRecognize',
+          request_serializer=StreamingRecognizeRequest.SerializeToString,
+          response_deserializer=StreamingRecognizeResponse.FromString,
+          )
+
+
+  class SpeechServicer(object):
+    """Service that implements Google Cloud Speech API.
+    """
+
+    def Recognize(self, request, context):
+      """Performs synchronous speech recognition: receive results after all audio
+      has been sent and processed.
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+    def LongRunningRecognize(self, request, context):
+      """Performs asynchronous speech recognition: receive results via the
+      google.longrunning.Operations interface. Returns either an
+      `Operation.error` or an `Operation.response` which contains
+      a `LongRunningRecognizeResponse` message.
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+    def StreamingRecognize(self, request_iterator, context):
+      """Performs bidirectional streaming speech recognition: receive results while
+      sending audio. This method is only available via the gRPC API (not REST).
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+
+  def add_SpeechServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+        'Recognize': grpc.unary_unary_rpc_method_handler(
+            servicer.Recognize,
+            request_deserializer=RecognizeRequest.FromString,
+            response_serializer=RecognizeResponse.SerializeToString,
+        ),
+        'LongRunningRecognize': grpc.unary_unary_rpc_method_handler(
+            servicer.LongRunningRecognize,
+            request_deserializer=LongRunningRecognizeRequest.FromString,
+            response_serializer=google_dot_longrunning_dot_operations__pb2.Operation.SerializeToString,
+        ),
+        'StreamingRecognize': grpc.stream_stream_rpc_method_handler(
+            servicer.StreamingRecognize,
+            request_deserializer=StreamingRecognizeRequest.FromString,
+            response_serializer=StreamingRecognizeResponse.SerializeToString,
+        ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+        'google.cloud.speech.v1.Speech', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+
+
+  class BetaSpeechServicer(object):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This class was generated
+    only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
+    """Service that implements Google Cloud Speech API.
+    """
+    def Recognize(self, request, context):
+      """Performs synchronous speech recognition: receive results after all audio
+      has been sent and processed.
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+    def LongRunningRecognize(self, request, context):
+      """Performs asynchronous speech recognition: receive results via the
+      google.longrunning.Operations interface. Returns either an
+      `Operation.error` or an `Operation.response` which contains
+      a `LongRunningRecognizeResponse` message.
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+    def StreamingRecognize(self, request_iterator, context):
+      """Performs bidirectional streaming speech recognition: receive results while
+      sending audio. This method is only available via the gRPC API (not REST).
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+
+
+  class BetaSpeechStub(object):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This class was generated
+    only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
+    """Service that implements Google Cloud Speech API.
+    """
+    def Recognize(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+      """Performs synchronous speech recognition: receive results after all audio
+      has been sent and processed.
+      """
+      raise NotImplementedError()
+    Recognize.future = None
+    def LongRunningRecognize(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+      """Performs asynchronous speech recognition: receive results via the
+      google.longrunning.Operations interface. Returns either an
+      `Operation.error` or an `Operation.response` which contains
+      a `LongRunningRecognizeResponse` message.
+      """
+      raise NotImplementedError()
+    LongRunningRecognize.future = None
+    def StreamingRecognize(self, request_iterator, timeout, metadata=None, with_call=False, protocol_options=None):
+      """Performs bidirectional streaming speech recognition: receive results while
+      sending audio. This method is only available via the gRPC API (not REST).
+      """
+      raise NotImplementedError()
+
+
+  def beta_create_Speech_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This function was
+    generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
+    request_deserializers = {
+      ('google.cloud.speech.v1.Speech', 'LongRunningRecognize'): LongRunningRecognizeRequest.FromString,
+      ('google.cloud.speech.v1.Speech', 'Recognize'): RecognizeRequest.FromString,
+      ('google.cloud.speech.v1.Speech', 'StreamingRecognize'): StreamingRecognizeRequest.FromString,
+    }
+    response_serializers = {
+      ('google.cloud.speech.v1.Speech', 'LongRunningRecognize'): google_dot_longrunning_dot_operations__pb2.Operation.SerializeToString,
+      ('google.cloud.speech.v1.Speech', 'Recognize'): RecognizeResponse.SerializeToString,
+      ('google.cloud.speech.v1.Speech', 'StreamingRecognize'): StreamingRecognizeResponse.SerializeToString,
+    }
+    method_implementations = {
+      ('google.cloud.speech.v1.Speech', 'LongRunningRecognize'): face_utilities.unary_unary_inline(servicer.LongRunningRecognize),
+      ('google.cloud.speech.v1.Speech', 'Recognize'): face_utilities.unary_unary_inline(servicer.Recognize),
+      ('google.cloud.speech.v1.Speech', 'StreamingRecognize'): face_utilities.stream_stream_inline(servicer.StreamingRecognize),
+    }
+    server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout)
+    return beta_implementations.server(method_implementations, options=server_options)
+
+
+  def beta_create_Speech_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This function was
+    generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
+    request_serializers = {
+      ('google.cloud.speech.v1.Speech', 'LongRunningRecognize'): LongRunningRecognizeRequest.SerializeToString,
+      ('google.cloud.speech.v1.Speech', 'Recognize'): RecognizeRequest.SerializeToString,
+      ('google.cloud.speech.v1.Speech', 'StreamingRecognize'): StreamingRecognizeRequest.SerializeToString,
+    }
+    response_deserializers = {
+      ('google.cloud.speech.v1.Speech', 'LongRunningRecognize'): google_dot_longrunning_dot_operations__pb2.Operation.FromString,
+      ('google.cloud.speech.v1.Speech', 'Recognize'): RecognizeResponse.FromString,
+      ('google.cloud.speech.v1.Speech', 'StreamingRecognize'): StreamingRecognizeResponse.FromString,
+    }
+    cardinalities = {
+      'LongRunningRecognize': cardinality.Cardinality.UNARY_UNARY,
+      'Recognize': cardinality.Cardinality.UNARY_UNARY,
+      'StreamingRecognize': cardinality.Cardinality.STREAM_STREAM,
+    }
+    stub_options = beta_implementations.stub_options(host=host, metadata_transformer=metadata_transformer, request_serializers=request_serializers, response_deserializers=response_deserializers, thread_pool=pool, thread_pool_size=pool_size)
+    return beta_implementations.dynamic_stub(channel, 'google.cloud.speech.v1.Speech', cardinalities, options=stub_options)
+except ImportError:
+  pass
+# @@protoc_insertion_point(module_scope)
diff --git a/speech/google/cloud/proto/speech/v1/cloud_speech_pb2_grpc.py b/speech/google/cloud/proto/speech/v1/cloud_speech_pb2_grpc.py
new file mode 100644
index 0000000000000..730f8443a3bd8
--- /dev/null
+++ b/speech/google/cloud/proto/speech/v1/cloud_speech_pb2_grpc.py
@@ -0,0 +1,86 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+import grpc
+
+import google.cloud.proto.speech.v1.cloud_speech_pb2 as google_dot_cloud_dot_proto_dot_speech_dot_v1_dot_cloud__speech__pb2
+import google.longrunning.operations_pb2 as google_dot_longrunning_dot_operations__pb2
+
+
+class SpeechStub(object):
+  """Service that implements Google Cloud Speech API.
+  """
+
+  def __init__(self, channel):
+    """Constructor.
+
+    Args:
+      channel: A grpc.Channel.
+    """
+    self.Recognize = channel.unary_unary(
+        '/google.cloud.speech.v1.Speech/Recognize',
+        request_serializer=google_dot_cloud_dot_proto_dot_speech_dot_v1_dot_cloud__speech__pb2.RecognizeRequest.SerializeToString,
+        response_deserializer=google_dot_cloud_dot_proto_dot_speech_dot_v1_dot_cloud__speech__pb2.RecognizeResponse.FromString,
+        )
+    self.LongRunningRecognize = channel.unary_unary(
+        '/google.cloud.speech.v1.Speech/LongRunningRecognize',
+        request_serializer=google_dot_cloud_dot_proto_dot_speech_dot_v1_dot_cloud__speech__pb2.LongRunningRecognizeRequest.SerializeToString,
+        response_deserializer=google_dot_longrunning_dot_operations__pb2.Operation.FromString,
+        )
+    self.StreamingRecognize = channel.stream_stream(
+        '/google.cloud.speech.v1.Speech/StreamingRecognize',
+        request_serializer=google_dot_cloud_dot_proto_dot_speech_dot_v1_dot_cloud__speech__pb2.StreamingRecognizeRequest.SerializeToString,
+        response_deserializer=google_dot_cloud_dot_proto_dot_speech_dot_v1_dot_cloud__speech__pb2.StreamingRecognizeResponse.FromString,
+        )
+
+
+class SpeechServicer(object):
+  """Service that implements Google Cloud Speech API.
+  """
+
+  def Recognize(self, request, context):
+    """Performs synchronous speech recognition: receive results after all audio
+    has been sent and processed.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+  def LongRunningRecognize(self, request, context):
+    """Performs asynchronous speech recognition: receive results via the
+    google.longrunning.Operations interface. Returns either an
+    `Operation.error` or an `Operation.response` which contains
+    a `LongRunningRecognizeResponse` message.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+  def StreamingRecognize(self, request_iterator, context):
+    """Performs bidirectional streaming speech recognition: receive results while
+    sending audio. This method is only available via the gRPC API (not REST).
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+
+def add_SpeechServicer_to_server(servicer, server):
+  rpc_method_handlers = {
+      'Recognize': grpc.unary_unary_rpc_method_handler(
+          servicer.Recognize,
+          request_deserializer=google_dot_cloud_dot_proto_dot_speech_dot_v1_dot_cloud__speech__pb2.RecognizeRequest.FromString,
+          response_serializer=google_dot_cloud_dot_proto_dot_speech_dot_v1_dot_cloud__speech__pb2.RecognizeResponse.SerializeToString,
+      ),
+      'LongRunningRecognize': grpc.unary_unary_rpc_method_handler(
+          servicer.LongRunningRecognize,
+          request_deserializer=google_dot_cloud_dot_proto_dot_speech_dot_v1_dot_cloud__speech__pb2.LongRunningRecognizeRequest.FromString,
+          response_serializer=google_dot_longrunning_dot_operations__pb2.Operation.SerializeToString,
+      ),
+      'StreamingRecognize': grpc.stream_stream_rpc_method_handler(
+          servicer.StreamingRecognize,
+          request_deserializer=google_dot_cloud_dot_proto_dot_speech_dot_v1_dot_cloud__speech__pb2.StreamingRecognizeRequest.FromString,
+          response_serializer=google_dot_cloud_dot_proto_dot_speech_dot_v1_dot_cloud__speech__pb2.StreamingRecognizeResponse.SerializeToString,
+      ),
+  }
+  generic_handler = grpc.method_handlers_generic_handler(
+      'google.cloud.speech.v1.Speech', rpc_method_handlers)
+  server.add_generic_rpc_handlers((generic_handler,))
diff --git a/speech/google/cloud/speech/__init__.py b/speech/google/cloud/speech/__init__.py
index 9c1654a2a6c71..1035b45c1d0d7 100644
--- a/speech/google/cloud/speech/__init__.py
+++ b/speech/google/cloud/speech/__init__.py
@@ -23,5 +23,23 @@
 from google.cloud.speech.encoding import Encoding
 from google.cloud.speech.operation import Operation
 
+from google.cloud.speech_v1 import enums
+from google.cloud.speech_v1 import SpeechClient
+from google.cloud.speech_v1 import types
 
-__all__ = ['__version__', 'Alternative', 'Client', 'Encoding', 'Operation']
+
+__all__ = (
+    # Common
+    '__version__',
+
+    # Deprecated Manual Layer
+    'Alternative',
+    'Client',
+    'Encoding',
+    'Operation',
+
+    # GAPIC & Partial Manual Layer
+    'enums',
+    'SpeechClient',
+    'types',
+)
diff --git a/speech/google/cloud/speech/_gax.py b/speech/google/cloud/speech/_gax.py
index c03c085402147..48d063bfaa8e7 100644
--- a/speech/google/cloud/speech/_gax.py
+++ b/speech/google/cloud/speech/_gax.py
@@ -26,8 +26,7 @@
     StreamingRecognizeRequest)
 from google.longrunning import operations_grpc
 
-from google.cloud._helpers import make_secure_channel
-from google.cloud._helpers import make_secure_stub
+from google.cloud import _helpers
 from google.cloud._http import DEFAULT_USER_AGENT
 
 from google.cloud.speech import __version__
@@ -46,7 +45,7 @@ class GAPICSpeechAPI(object):
     def __init__(self, client=None):
         self._client = client
         credentials = self._client._credentials
-        channel = make_secure_channel(
+        channel = _helpers.make_secure_channel(
             credentials, DEFAULT_USER_AGENT,
             SpeechClient.SERVICE_ADDRESS)
         self._gapic_api = SpeechClient(
@@ -54,7 +53,7 @@ def __init__(self, client=None):
             lib_name='gccl',
             lib_version=__version__,
         )
-        self._operations_stub = make_secure_stub(
+        self._operations_stub = _helpers.make_secure_stub(
             credentials,
             DEFAULT_USER_AGENT,
             operations_grpc.OperationsStub,
diff --git a/speech/google/cloud/speech/client.py b/speech/google/cloud/speech/client.py
index f9eb211c4a807..7c066d48cb9d2 100644
--- a/speech/google/cloud/speech/client.py
+++ b/speech/google/cloud/speech/client.py
@@ -14,7 +14,10 @@
 
 """Basic client for Google Cloud Speech API."""
 
+from __future__ import absolute_import
+
 import os
+import warnings
 
 from google.cloud.client import Client as BaseClient
 from google.cloud.environment_vars import DISABLE_GRPC
@@ -60,6 +63,14 @@ class Client(BaseClient):
     _speech_api = None
 
     def __init__(self, credentials=None, _http=None, _use_grpc=None):
+        warnings.warn(
+            'This client class and objects that derive from it have been '
+            'deprecated. Use `google.cloud.speech.SpeechClient` '
+            '(provided by this package) instead. This client will be removed '
+            'in a future release.',
+            DeprecationWarning,
+        )
+
         super(Client, self).__init__(credentials=credentials, _http=_http)
         # Save on the actual client class whether we use GAX or not.
         if _use_grpc is None:
diff --git a/speech/google/cloud/speech_v1/__init__.py b/speech/google/cloud/speech_v1/__init__.py
new file mode 100644
index 0000000000000..be9c3772b4a67
--- /dev/null
+++ b/speech/google/cloud/speech_v1/__init__.py
@@ -0,0 +1,34 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+
+from google.cloud.gapic.speech.v1 import speech_client
+from google.cloud.gapic.speech.v1 import enums
+
+from google.cloud.speech_v1.helpers import SpeechHelpers
+from google.cloud.speech_v1 import types
+
+
+class SpeechClient(SpeechHelpers, speech_client.SpeechClient):
+    __doc__ = speech_client.SpeechClient.__doc__
+    enums = enums
+    types = types
+
+
+__all__ = (
+    'enums',
+    'SpeechClient',
+    'types',
+)
diff --git a/speech/google/cloud/speech_v1/helpers.py b/speech/google/cloud/speech_v1/helpers.py
new file mode 100644
index 0000000000000..8ecddc2738f1c
--- /dev/null
+++ b/speech/google/cloud/speech_v1/helpers.py
@@ -0,0 +1,88 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+
+
+class SpeechHelpers(object):
+    """A set of convenience methods to make the Speech client easier to use.
+
+    This class should be considered abstract; it is used as a superclass
+    in a multiple-inheritance construction alongside the applicable GAPIC.
+    See the :class:`~google.cloud.speech_v1.SpeechClient`.
+    """
+    def streaming_recognize(self, config, requests, options=None):
+        """Perform bi-directional speech recognition.
+
+        This method allows you to receive results while sending audio;
+        it is only available via. gRPC (not REST).
+
+        .. warning::
+
+            This method is EXPERIMENTAL. Its interface might change in the
+            future.
+
+        Example:
+          >>> from google.cloud.speech_v1 import enums
+          >>> from google.cloud.speech_v1 import SpeechClient
+          >>> from google.cloud.speech_v1 import types
+          >>> client = SpeechClient()
+          >>> config = types.StreamingRecognitionConfig(
+          ...     config=types.RecognitionConfig(
+          ...         encoding=enums.RecognitionConfig.AudioEncoding.FLAC,
+          ...     ),
+          ... )
+          >>> request = types.StreamingRecognizeRequest(audio_content=b'...')
+          >>> requests = [request]
+          >>> for element in client.streaming_recognize(config, requests):
+          ...     # process element
+          ...     pass
+
+        Args:
+          config (:class:`~.types.StreamingRecognitionConfig`): The
+            configuration to use for the stream.
+          requests (Iterable[:class:`~.types.StreamingRecognizeRequest`]):
+            The input objects.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          Iterable[:class:`~.types.StreamingRecognizeResponse`]
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        return self._streaming_recognize(
+            self._streaming_request_iterable(config, requests),
+            options,
+        )
+
+    def _streaming_request_iterable(self, config, requests):
+        """A generator that yields the config followed by the requests.
+
+        Args:
+            config (~.speech_v1.types.StreamingRecognitionConfig): The
+                configuration to use for the stream.
+            requests (Iterable[~.speech_v1.types.StreamingRecognizeRequest]):
+                The input objects.
+
+        Returns:
+            Iterable[~.speech_v1.types.StreamingRecognizeRequest]): The
+                correctly formatted input for
+                :meth:`~.speech_v1.SpeechClient.streaming_recognize`.
+        """
+        yield self.types.StreamingRecognizeRequest(streaming_config=config)
+        for request in requests:
+            yield request
diff --git a/speech/google/cloud/speech_v1/types.py b/speech/google/cloud/speech_v1/types.py
new file mode 100644
index 0000000000000..75ec9a5d2b59e
--- /dev/null
+++ b/speech/google/cloud/speech_v1/types.py
@@ -0,0 +1,30 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+import sys
+
+from google.cloud.proto.speech.v1 import cloud_speech_pb2
+
+from google.gax.utils.messages import get_messages
+
+
+names = []
+for name, message in get_messages(cloud_speech_pb2).items():
+    message.__module__ = 'google.cloud.speech_v1.types'
+    setattr(sys.modules[__name__], name, message)
+    names.append(name)
+
+
+__all__ = tuple(sorted(names))
diff --git a/speech/nox.py b/speech/nox.py
index fdda2298bc435..ee174668d0215 100644
--- a/speech/nox.py
+++ b/speech/nox.py
@@ -38,10 +38,16 @@ def unit_tests(session, python_version):
     session.install('-e', '.')
 
     # Run py.test against the unit tests.
-    session.run('py.test', '--quiet',
-        '--cov=google.cloud.speech', '--cov=tests.unit', '--cov-append',
-        '--cov-config=.coveragerc', '--cov-report=', '--cov-fail-under=97',
-        'tests/unit',
+    session.run(
+        'py.test', '--quiet',
+        '--cov=google.cloud.speech',
+        '--cov=google.cloud.speech_v1',
+        '--cov=tests.unit'
+        '--cov-append',
+        '--cov-config=.coveragerc',
+        '--cov-report=',
+        '--cov-fail-under=0',
+        os.path.join('tests', 'unit'),
     )
 
 
diff --git a/speech/setup.py b/speech/setup.py
index 7c208dffdd885..7bd990e2be3dc 100644
--- a/speech/setup.py
+++ b/speech/setup.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import io
 import os
 
 from setuptools import find_packages
@@ -20,6 +21,7 @@
 
 PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))
 
+
 with open(os.path.join(PACKAGE_ROOT, 'README.rst')) as file_obj:
     README = file_obj.read()
 
@@ -51,20 +53,44 @@
 
 REQUIREMENTS = [
     'google-cloud-core >= 0.25.0, < 0.26dev',
-    'grpcio >= 1.0.2, < 2.0dev',
-    'gapic-google-cloud-speech-v1 >= 0.15.3, < 0.16dev',
+    'google-gax >= 0.15.13, < 0.16dev',
+    'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',
 ]
 
 setup(
+    author='Google Cloud Platform',
+    author_email='googleapis-packages@google.com',
     name='google-cloud-speech',
-    version='0.26.0',
+    version='0.27.0',
     description='Python Client for Google Cloud Speech',
     long_description=README,
     namespace_packages=[
         'google',
         'google.cloud',
+        'google.cloud.gapic',
+        'google.cloud.gapic.speech',
+        'google.cloud.proto',
+        'google.cloud.proto.speech',
     ],
     packages=find_packages(exclude=('tests*',)),
     install_requires=REQUIREMENTS,
-    **SETUP_BASE
+    url='https://github.com/GoogleCloudPlatform/google-cloud-python',
+    license='Apache 2.0',
+    platforms='Posix; MacOS X; Windows',
+    include_package_data=True,
+    zip_safe=False,
+    scripts=[],
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: Apache Software License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Topic :: Internet',
+    ],
 )
diff --git a/speech/tests/gapic/test_speech_client_v1.py b/speech/tests/gapic/test_speech_client_v1.py
new file mode 100644
index 0000000000000..acd196adde681
--- /dev/null
+++ b/speech/tests/gapic/test_speech_client_v1.py
@@ -0,0 +1,212 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Unit tests."""
+
+import mock
+import unittest
+
+from google.gax import errors
+from google.rpc import status_pb2
+
+from google.cloud.gapic.speech.v1 import enums
+from google.cloud.gapic.speech.v1 import speech_client
+from google.cloud.proto.speech.v1 import cloud_speech_pb2
+from google.longrunning import operations_pb2
+
+
+class CustomException(Exception):
+    pass
+
+
+class TestSpeechClient(unittest.TestCase):
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_recognize(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = speech_client.SpeechClient()
+
+        # Mock request
+        encoding = enums.RecognitionConfig.AudioEncoding.FLAC
+        sample_rate_hertz = 44100
+        language_code = 'en-US'
+        config = cloud_speech_pb2.RecognitionConfig(
+            encoding=encoding,
+            sample_rate_hertz=sample_rate_hertz,
+            language_code=language_code)
+        uri = 'gs://bucket_name/file_name.flac'
+        audio = cloud_speech_pb2.RecognitionAudio(uri=uri)
+
+        # Mock response
+        expected_response = cloud_speech_pb2.RecognizeResponse()
+        grpc_stub.Recognize.return_value = expected_response
+
+        response = client.recognize(config, audio)
+        self.assertEqual(expected_response, response)
+
+        grpc_stub.Recognize.assert_called_once()
+        args, kwargs = grpc_stub.Recognize.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_request = args[0]
+
+        expected_request = cloud_speech_pb2.RecognizeRequest(
+            config=config, audio=audio)
+        self.assertEqual(expected_request, actual_request)
+
+    @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_recognize_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = speech_client.SpeechClient()
+
+        # Mock request
+        encoding = enums.RecognitionConfig.AudioEncoding.FLAC
+        sample_rate_hertz = 44100
+        language_code = 'en-US'
+        config = cloud_speech_pb2.RecognitionConfig(
+            encoding=encoding,
+            sample_rate_hertz=sample_rate_hertz,
+            language_code=language_code)
+        uri = 'gs://bucket_name/file_name.flac'
+        audio = cloud_speech_pb2.RecognitionAudio(uri=uri)
+
+        # Mock exception response
+        grpc_stub.Recognize.side_effect = CustomException()
+
+        self.assertRaises(errors.GaxError, client.recognize, config, audio)
+
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_long_running_recognize(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = speech_client.SpeechClient()
+
+        # Mock request
+        encoding = enums.RecognitionConfig.AudioEncoding.FLAC
+        sample_rate_hertz = 44100
+        language_code = 'en-US'
+        config = cloud_speech_pb2.RecognitionConfig(
+            encoding=encoding,
+            sample_rate_hertz=sample_rate_hertz,
+            language_code=language_code)
+        uri = 'gs://bucket_name/file_name.flac'
+        audio = cloud_speech_pb2.RecognitionAudio(uri=uri)
+
+        # Mock response
+        expected_response = cloud_speech_pb2.LongRunningRecognizeResponse()
+        operation = operations_pb2.Operation(
+            name='operations/test_long_running_recognize', done=True)
+        operation.response.Pack(expected_response)
+        grpc_stub.LongRunningRecognize.return_value = operation
+
+        response = client.long_running_recognize(config, audio)
+        self.assertEqual(expected_response, response.result())
+
+        grpc_stub.LongRunningRecognize.assert_called_once()
+        args, kwargs = grpc_stub.LongRunningRecognize.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_request = args[0]
+
+        expected_request = cloud_speech_pb2.LongRunningRecognizeRequest(
+            config=config, audio=audio)
+        self.assertEqual(expected_request, actual_request)
+
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_long_running_recognize_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = speech_client.SpeechClient()
+
+        # Mock request
+        encoding = enums.RecognitionConfig.AudioEncoding.FLAC
+        sample_rate_hertz = 44100
+        language_code = 'en-US'
+        config = cloud_speech_pb2.RecognitionConfig(
+            encoding=encoding,
+            sample_rate_hertz=sample_rate_hertz,
+            language_code=language_code)
+        uri = 'gs://bucket_name/file_name.flac'
+        audio = cloud_speech_pb2.RecognitionAudio(uri=uri)
+
+        # Mock exception response
+        error = status_pb2.Status()
+        operation = operations_pb2.Operation(
+            name='operations/test_long_running_recognize_exception', done=True)
+        operation.error.CopyFrom(error)
+        grpc_stub.LongRunningRecognize.return_value = operation
+
+        response = client.long_running_recognize(config, audio)
+        self.assertEqual(error, response.exception())
+
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_streaming_recognize(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = speech_client.SpeechClient()
+
+        # Mock request
+        request = cloud_speech_pb2.StreamingRecognizeRequest()
+        requests = [request]
+
+        # Mock response
+        expected_response = cloud_speech_pb2.StreamingRecognizeResponse()
+        grpc_stub.StreamingRecognize.return_value = iter([expected_response])
+
+        response = client.streaming_recognize(requests)
+        resources = list(response)
+        self.assertEqual(1, len(resources))
+        self.assertEqual(expected_response, resources[0])
+
+        grpc_stub.StreamingRecognize.assert_called_once()
+        args, kwargs = grpc_stub.StreamingRecognize.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_requests = args[0]
+        self.assertEqual(1, len(actual_requests))
+        actual_request = list(actual_requests)[0]
+        self.assertEqual(request, actual_request)
+
+    @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_streaming_recognize_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = speech_client.SpeechClient()
+
+        # Mock request
+        request = cloud_speech_pb2.StreamingRecognizeRequest()
+        requests = [request]
+
+        # Mock exception response
+        grpc_stub.StreamingRecognize.side_effect = CustomException()
+
+        self.assertRaises(errors.GaxError, client.streaming_recognize,
+                          requests)
diff --git a/speech/tests/system.py b/speech/tests/system.py
index 0c4acfb527674..35c1ee3d15213 100644
--- a/speech/tests/system.py
+++ b/speech/tests/system.py
@@ -16,6 +16,8 @@
 import time
 import unittest
 
+import six
+
 from google.cloud import exceptions
 from google.cloud import speech
 from google.cloud import storage
@@ -158,11 +160,11 @@ def test_sync_recognize_local_file(self):
             content = file_obj.read()
 
         results = self._make_sync_request(content=content,
-                                          max_alternatives=2)
+                                          max_alternatives=1)
         self.assertEqual(len(results), 1)
         alternatives = results[0].alternatives
-        self.assertEqual(len(alternatives), 2)
-        self._check_results(alternatives, 2)
+        self.assertEqual(len(alternatives), 1)
+        self._check_results(alternatives, 1)
 
     def test_sync_recognize_gcs_file(self):
         bucket_name = Config.TEST_BUCKET.name
@@ -183,12 +185,12 @@ def test_async_recognize_local_file(self):
             content = file_obj.read()
 
         operation = self._make_async_request(content=content,
-                                             max_alternatives=2)
+                                             max_alternatives=1)
         _wait_until_complete(operation)
         self.assertEqual(len(operation.results), 1)
         alternatives = operation.results[0].alternatives
-        self.assertEqual(len(alternatives), 2)
-        self._check_results(alternatives, 2)
+        self.assertEqual(len(alternatives), 1)
+        self._check_results(alternatives, 1)
 
     def test_async_recognize_gcs_file(self):
         bucket_name = Config.TEST_BUCKET.name
@@ -200,13 +202,13 @@ def test_async_recognize_gcs_file(self):
 
         source_uri = 'gs://%s/%s' % (bucket_name, blob_name)
         operation = self._make_async_request(source_uri=source_uri,
-                                             max_alternatives=2)
+                                             max_alternatives=1)
 
         _wait_until_complete(operation)
         self.assertEqual(len(operation.results), 1)
         alternatives = operation.results[0].alternatives
-        self.assertEqual(len(alternatives), 2)
-        self._check_results(alternatives, 2)
+        self.assertEqual(len(alternatives), 1)
+        self._check_results(alternatives, 1)
 
     def test_stream_recognize(self):
         if not Config.USE_GRPC:
@@ -220,18 +222,17 @@ def test_stream_recognize_interim_results(self):
         if not Config.USE_GRPC:
             self.skipTest('gRPC is required for Speech Streaming Recognize.')
 
-        # These extra words are interim_results that the API returns as it's
-        # deciphering the speech audio. This has a high probability of becoming
-        # out of date and causing the test to fail.
-        extras = ' Google Now who hello thank you for you for use hello '
+        # Just test that the iterim results exist; the exact value can and
+        # does change, so writing a test for it is difficult.
         with open(AUDIO_FILE, 'rb') as file_obj:
             recognize = self._make_streaming_request(file_obj,
                                                      interim_results=True)
             responses = list(recognize)
             for response in responses:
-                if response.alternatives[0].transcript:
-                    self.assertIn(response.alternatives[0].transcript,
-                                  extras + self.ASSERT_TEXT)
+                self.assertIsInstance(
+                    response.alternatives[0].transcript,
+                    six.text_type,
+                )
 
             self.assertGreater(len(responses), 5)
             self._check_results(responses[-1].alternatives)
diff --git a/speech/tests/unit/test__gax.py b/speech/tests/unit/test__gax.py
index 7cf44ba58f6ea..4587f3b6d6a56 100644
--- a/speech/tests/unit/test__gax.py
+++ b/speech/tests/unit/test__gax.py
@@ -34,18 +34,17 @@ def _get_target_class():
     def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
+    @mock.patch('google.cloud._helpers.make_secure_channel',
+                return_value=mock.sentinel.channel)
     @mock.patch(
-        'google.cloud._helpers.make_secure_channel',
-        return_value=mock.sentinel.channel)
-    @mock.patch(
-        'google.cloud.gapic.speech.v1.speech_client.SpeechClient',
-        SERVICE_ADDRESS='hey.you.guys')
-    @mock.patch(
-        'google.cloud._helpers.make_secure_stub',
-        return_value=mock.sentinel.stub)
-    def test_constructor(self, mocked_stub, mocked_cls, mocked_channel):
+        'google.cloud.gapic.speech.v1.speech_client.SpeechClient.__init__',
+        return_value=None)
+    @mock.patch('google.cloud._helpers.make_secure_stub',
+                return_value=mock.sentinel.stub)
+    def test_constructor(self, mocked_stub, mocked_init, mocked_channel):
         from google.longrunning import operations_grpc
         from google.cloud._http import DEFAULT_USER_AGENT
+        from google.cloud.gapic.speech.v1.speech_client import SpeechClient
         from google.cloud.speech import __version__
         from google.cloud.speech._gax import OPERATIONS_API_HOST
 
@@ -57,17 +56,17 @@ def test_constructor(self, mocked_stub, mocked_cls, mocked_channel):
 
         speech_api = self._make_one(mock_client)
         self.assertIs(speech_api._client, mock_client)
-        self.assertIs(speech_api._gapic_api, mocked_cls.return_value)
+        self.assertIsInstance(speech_api._gapic_api, SpeechClient)
 
         mocked_stub.assert_called_once_with(
             mock_cnxn.credentials, DEFAULT_USER_AGENT,
             operations_grpc.OperationsStub, OPERATIONS_API_HOST)
-        mocked_cls.assert_called_once_with(
+        mocked_init.assert_called_once_with(
             channel=mock.sentinel.channel, lib_name='gccl',
             lib_version=__version__)
         mocked_channel.assert_called_once_with(
             mock_cnxn.credentials, DEFAULT_USER_AGENT,
-            mocked_cls.SERVICE_ADDRESS)
+            'speech.googleapis.com')
 
 
 class TestSpeechGAXMakeRequests(unittest.TestCase):
diff --git a/speech/tests/unit/test_client.py b/speech/tests/unit/test_client.py
index ef3ea2dc84e64..259df66b0a3d2 100644
--- a/speech/tests/unit/test_client.py
+++ b/speech/tests/unit/test_client.py
@@ -246,6 +246,7 @@ def test_sync_recognize_with_empty_results_no_gax(self):
             next(sample.recognize(language_code='en-US'))
 
     def test_sync_recognize_with_empty_results_gax(self):
+        from google.cloud import _helpers
         from google.cloud._testing import _Monkey
 
         from google.cloud import speech
@@ -255,13 +256,6 @@ def test_sync_recognize_with_empty_results_gax(self):
         client = self._make_one(credentials=credentials, _use_grpc=True)
         client._credentials = credentials
 
-        channel_args = []
-        channel_obj = object()
-
-        def make_channel(*args):
-            channel_args.append(args)
-            return channel_obj
-
         def speech_api(channel=None, **kwargs):
             return _MockGAPICSpeechAPI(
                 response=_make_sync_response(), channel=channel, **kwargs)
@@ -269,16 +263,19 @@ def speech_api(channel=None, **kwargs):
         host = 'foo.apis.invalid'
         speech_api.SERVICE_ADDRESS = host
 
-        with _Monkey(_gax, SpeechClient=speech_api,
-                     make_secure_channel=make_channel):
-            client._speech_api = _gax.GAPICSpeechAPI(client)
+        with _Monkey(_gax, SpeechClient=speech_api):
+            with mock.patch.object(_helpers, 'make_secure_channel') as msc:
+                client._speech_api = _gax.GAPICSpeechAPI(client)
 
-        low_level = client.speech_api._gapic_api
-        self.assertIsInstance(low_level, _MockGAPICSpeechAPI)
-        self.assertIs(low_level._channel, channel_obj)
-        self.assertEqual(
-            channel_args,
-            [(credentials, _gax.DEFAULT_USER_AGENT, host)])
+                low_level = client.speech_api._gapic_api
+                self.assertIsInstance(low_level, _MockGAPICSpeechAPI)
+                self.assertIs(low_level._channel, msc.return_value)
+
+                assert msc.mock_calls[0] == mock.call(
+                    credentials,
+                    _gax.DEFAULT_USER_AGENT,
+                    host,
+                )
 
         sample = client.sample(
             source_uri=self.AUDIO_SOURCE_URI, encoding=speech.Encoding.FLAC,
@@ -288,6 +285,7 @@ def speech_api(channel=None, **kwargs):
             next(sample.recognize(language_code='en-US'))
 
     def test_sync_recognize_with_gax(self):
+        from google.cloud import _helpers
         from google.cloud._testing import _Monkey
 
         from google.cloud import speech
@@ -306,13 +304,6 @@ def test_sync_recognize_with_gax(self):
         }]
         result = _make_result(alternatives)
 
-        channel_args = []
-        channel_obj = object()
-
-        def make_channel(*args):
-            channel_args.append(args)
-            return channel_obj
-
         def speech_api(channel=None, **kwargs):
             return _MockGAPICSpeechAPI(
                 response=_make_sync_response(result), channel=channel,
@@ -325,15 +316,19 @@ def speech_api(channel=None, **kwargs):
             source_uri=self.AUDIO_SOURCE_URI, encoding=speech.Encoding.FLAC,
             sample_rate_hertz=self.SAMPLE_RATE)
 
-        with _Monkey(_gax, SpeechClient=speech_api,
-                     make_secure_channel=make_channel):
-            client._speech_api = _gax.GAPICSpeechAPI(client)
+        with _Monkey(_gax, SpeechClient=speech_api):
+            with mock.patch.object(_helpers, 'make_secure_channel') as msc:
+                client._speech_api = _gax.GAPICSpeechAPI(client)
 
-        low_level = client.speech_api._gapic_api
-        self.assertIsInstance(low_level, _MockGAPICSpeechAPI)
-        self.assertIs(low_level._channel, channel_obj)
-        self.assertEqual(
-            channel_args, [(creds, _gax.DEFAULT_USER_AGENT, host)])
+                low_level = client.speech_api._gapic_api
+                self.assertIsInstance(low_level, _MockGAPICSpeechAPI)
+                self.assertIs(low_level._channel, msc.return_value)
+
+                assert msc.mock_calls[0] == mock.call(
+                    creds,
+                    _gax.DEFAULT_USER_AGENT,
+                    host,
+                )
 
         results = [i for i in sample.recognize(language_code='en-US')]
 
@@ -351,18 +346,6 @@ def speech_api(channel=None, **kwargs):
         self.assertEqual(
             result.alternatives[1].confidence, alternatives[1]['confidence'])
 
-    def test_async_supported_encodings(self):
-        from google.cloud import speech
-
-        credentials = _make_credentials()
-        client = self._make_one(credentials=credentials, _use_grpc=True)
-
-        sample = client.sample(
-            source_uri=self.AUDIO_SOURCE_URI, encoding=speech.Encoding.FLAC,
-            sample_rate_hertz=self.SAMPLE_RATE)
-        with self.assertRaises(ValueError):
-            sample.recognize(language_code='en-US')
-
     def test_async_recognize_no_gax(self):
         from google.cloud import speech
         from google.cloud.speech.operation import Operation
@@ -392,6 +375,7 @@ def test_async_recognize_no_gax(self):
     def test_async_recognize_with_gax(self):
         from google.cloud._testing import _Monkey
 
+        from google.cloud import _helpers
         from google.cloud import speech
         from google.cloud.speech import _gax
         from google.cloud.speech.operation import Operation
@@ -400,13 +384,6 @@ def test_async_recognize_with_gax(self):
         client = self._make_one(credentials=credentials, _use_grpc=True)
         client._credentials = credentials
 
-        channel_args = []
-        channel_obj = object()
-
-        def make_channel(*args):
-            channel_args.append(args)
-            return channel_obj
-
         sample = client.sample(
             encoding=speech.Encoding.LINEAR16,
             sample_rate_hertz=self.SAMPLE_RATE,
@@ -415,20 +392,21 @@ def make_channel(*args):
 
         def speech_api(channel=None, **kwargs):
             return _MockGAPICSpeechAPI(channel=channel, **kwargs)
+        speech_api.SERVICE_ADDRESS = 'foo.api.invalid'
 
-        host = 'foo.apis.invalid'
-        speech_api.SERVICE_ADDRESS = host
+        with _Monkey(_gax, SpeechClient=speech_api):
+            with mock.patch.object(_helpers, 'make_secure_channel') as msc:
+                api = client.speech_api
 
-        with _Monkey(_gax, SpeechClient=speech_api,
-                     make_secure_channel=make_channel):
-            api = client.speech_api
+                low_level = api._gapic_api
+                self.assertIsInstance(low_level, _MockGAPICSpeechAPI)
+                self.assertIs(low_level._channel, msc.return_value)
 
-        low_level = api._gapic_api
-        self.assertIsInstance(low_level, _MockGAPICSpeechAPI)
-        self.assertIs(low_level._channel, channel_obj)
-        expected = (credentials, _gax.DEFAULT_USER_AGENT,
-                    low_level.SERVICE_ADDRESS)
-        self.assertEqual(channel_args, [expected])
+                assert msc.mock_calls[0] == mock.call(
+                    credentials,
+                    _gax.DEFAULT_USER_AGENT,
+                    'foo.api.invalid',
+                )
 
         operation = sample.long_running_recognize(language_code='en-US')
         self.assertIsInstance(operation, Operation)
@@ -450,6 +428,7 @@ def test_streaming_depends_on_gax(self):
     def test_streaming_closed_stream(self):
         from io import BytesIO
 
+        from google.cloud import _helpers
         from google.cloud._testing import _Monkey
 
         from google.cloud.speech import _gax
@@ -460,13 +439,6 @@ def test_streaming_closed_stream(self):
         client = self._make_one(credentials=credentials)
         client._credentials = credentials
 
-        channel_args = []
-        channel_obj = object()
-
-        def make_channel(*args):
-            channel_args.append(args)
-            return channel_obj
-
         def speech_api(channel=None, **kwargs):
             return _MockGAPICSpeechAPI(channel=channel, **kwargs)
 
@@ -480,9 +452,9 @@ def speech_api(channel=None, **kwargs):
             stream=stream, encoding=Encoding.LINEAR16,
             sample_rate_hertz=self.SAMPLE_RATE)
 
-        with _Monkey(_gax, SpeechClient=speech_api,
-                     make_secure_channel=make_channel):
-            client._speech_api = _gax.GAPICSpeechAPI(client)
+        with _Monkey(_gax, SpeechClient=speech_api):
+            with mock.patch.object(_helpers, 'make_secure_channel') as msc:
+                client._speech_api = _gax.GAPICSpeechAPI(client)
 
         with self.assertRaises(ValueError):
             list(sample.streaming_recognize(language_code='en-US'))
@@ -490,6 +462,7 @@ def speech_api(channel=None, **kwargs):
     def test_stream_recognize_interim_results(self):
         from io import BytesIO
 
+        from google.cloud import _helpers
         from google.cloud._testing import _Monkey
 
         from google.cloud.speech import _gax
@@ -518,13 +491,6 @@ def test_stream_recognize_interim_results(self):
                 alternatives, is_final=True, stability=0.4375))
         responses = [first_response, second_response, last_response]
 
-        channel_args = []
-        channel_obj = object()
-
-        def make_channel(*args):
-            channel_args.append(args)
-            return channel_obj
-
         def speech_api(channel=None, **kwargs):
             return _MockGAPICSpeechAPI(
                 channel=channel, response=responses, **kwargs)
@@ -532,9 +498,9 @@ def speech_api(channel=None, **kwargs):
         host = 'foo.apis.invalid'
         speech_api.SERVICE_ADDRESS = host
 
-        with _Monkey(_gax, SpeechClient=speech_api,
-                     make_secure_channel=make_channel):
-            client._speech_api = _gax.GAPICSpeechAPI(client)
+        with _Monkey(_gax, SpeechClient=speech_api):
+            with mock.patch.object(_helpers, 'make_secure_channel') as msc:
+                client._speech_api = _gax.GAPICSpeechAPI(client)
 
         sample = client.sample(
             stream=stream, encoding=Encoding.LINEAR16,
@@ -582,6 +548,7 @@ def speech_api(channel=None, **kwargs):
     def test_stream_recognize(self):
         from io import BytesIO
 
+        from google.cloud import _helpers
         from google.cloud._testing import _Monkey
 
         from google.cloud.speech import _gax
@@ -609,10 +576,6 @@ def test_stream_recognize(self):
         channel_args = []
         channel_obj = object()
 
-        def make_channel(*args):
-            channel_args.append(args)
-            return channel_obj
-
         def speech_api(channel=None, **kwargs):
             return _MockGAPICSpeechAPI(
                 channel=channel, response=responses, **kwargs)
@@ -620,9 +583,9 @@ def speech_api(channel=None, **kwargs):
         host = 'foo.apis.invalid'
         speech_api.SERVICE_ADDRESS = host
 
-        with _Monkey(_gax, SpeechClient=speech_api,
-                     make_secure_channel=make_channel):
-            client._speech_api = _gax.GAPICSpeechAPI(client)
+        with _Monkey(_gax, SpeechClient=speech_api):
+            with mock.patch.object(_helpers, 'make_secure_channel') as msc:
+                client._speech_api = _gax.GAPICSpeechAPI(client)
 
         sample = client.sample(
             stream=stream, encoding=Encoding.LINEAR16,
@@ -639,6 +602,7 @@ def speech_api(channel=None, **kwargs):
     def test_stream_recognize_no_results(self):
         from io import BytesIO
 
+        from google.cloud import _helpers
         from google.cloud._testing import _Monkey
 
         from google.cloud.speech import _gax
@@ -651,13 +615,6 @@ def test_stream_recognize_no_results(self):
 
         responses = [_make_streaming_response()]
 
-        channel_args = []
-        channel_obj = object()
-
-        def make_channel(*args):
-            channel_args.append(args)
-            return channel_obj
-
         def speech_api(channel=None, **kwargs):
             return _MockGAPICSpeechAPI(
                 channel=channel, response=responses, **kwargs)
@@ -665,9 +622,9 @@ def speech_api(channel=None, **kwargs):
         host = 'foo.apis.invalid'
         speech_api.SERVICE_ADDRESS = host
 
-        with _Monkey(_gax, SpeechClient=speech_api,
-                     make_secure_channel=make_channel):
-            client._speech_api = _gax.GAPICSpeechAPI(client)
+        with _Monkey(_gax, SpeechClient=speech_api):
+            with mock.patch.object(_helpers, 'make_secure_channel') as msc:
+                client._speech_api = _gax.GAPICSpeechAPI(client)
 
         sample = client.sample(
             stream=stream, encoding=Encoding.LINEAR16,
@@ -677,6 +634,7 @@ def speech_api(channel=None, **kwargs):
         self.assertEqual(results, [])
 
     def test_speech_api_with_gax(self):
+        from google.cloud import _helpers
         from google.cloud._testing import _Monkey
 
         from google.cloud.speech import _gax
@@ -685,29 +643,25 @@ def test_speech_api_with_gax(self):
         client = self._make_one(credentials=creds, _use_grpc=True)
         client._credentials = creds
 
-        channel_args = []
-        channel_obj = object()
-
-        def make_channel(*args):
-            channel_args.append(args)
-            return channel_obj
-
         def speech_api(channel=None, **kwargs):
             return _MockGAPICSpeechAPI(channel=channel, **kwargs)
 
         host = 'foo.apis.invalid'
         speech_api.SERVICE_ADDRESS = host
 
-        with _Monkey(_gax, SpeechClient=speech_api,
-                     make_secure_channel=make_channel):
-            client._speech_api = _gax.GAPICSpeechAPI(client)
+        with _Monkey(_gax, SpeechClient=speech_api):
+            with mock.patch.object(_helpers, 'make_secure_channel') as msc:
+                client._speech_api = _gax.GAPICSpeechAPI(client)
+
+                low_level = client.speech_api._gapic_api
+                self.assertIsInstance(low_level, _MockGAPICSpeechAPI)
+                self.assertIs(low_level._channel, msc.return_value)
 
-        low_level = client.speech_api._gapic_api
-        self.assertIsInstance(low_level, _MockGAPICSpeechAPI)
-        self.assertIs(low_level._channel, channel_obj)
-        expected = (
-            creds, _gax.DEFAULT_USER_AGENT, low_level.SERVICE_ADDRESS)
-        self.assertEqual(channel_args, [expected])
+                assert msc.mock_calls[0] == mock.call(
+                    creds,
+                    _gax.DEFAULT_USER_AGENT,
+                    low_level.SERVICE_ADDRESS,
+                )
 
     def test_speech_api_without_gax(self):
         from google.cloud._http import Connection
diff --git a/speech/tests/unit/test_helpers.py b/speech/tests/unit/test_helpers.py
new file mode 100644
index 0000000000000..e12507d6565ac
--- /dev/null
+++ b/speech/tests/unit/test_helpers.py
@@ -0,0 +1,66 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+from types import GeneratorType
+import unittest
+
+import mock
+
+
+class TestSpeechClient(unittest.TestCase):
+
+    @staticmethod
+    def _make_one():
+        import google.auth.credentials
+        from google.cloud.speech_v1 import SpeechClient
+
+        credentials = mock.Mock(spec=google.auth.credentials.Credentials)
+        return SpeechClient(credentials=credentials)
+
+    def test_inherited_method(self):
+        from google.cloud.speech_v1 import types
+
+        client = self._make_one()
+
+        config = types.RecognitionConfig(encoding='FLAC')
+        audio = types.RecognitionAudio(uri='http://foo.com/bar.wav')
+        with mock.patch.object(client, '_recognize') as recognize:
+            client.recognize(config, audio)
+
+            # Assert that the underlying GAPIC method was called as expected.
+            recognize.assert_called_once_with(types.RecognizeRequest(
+                config=config,
+                audio=audio,
+            ), None)
+
+    def test_streaming_recognize(self):
+        from google.cloud.speech_v1 import types
+
+        client = self._make_one()
+
+        config = types.StreamingRecognitionConfig()
+        requests = [types.StreamingRecognizeRequest(audio_content=b'...')]
+        with mock.patch.object(client, '_streaming_recognize') as sr:
+            client.streaming_recognize(config, requests)
+
+            # Assert that we called streaming recognize with an iterable
+            # that evalutes to the correct format.
+            _, args, _ = sr.mock_calls[0]
+            api_requests = args[0]
+            assert isinstance(api_requests, GeneratorType)
+            assert list(api_requests) == [
+                types.StreamingRecognizeRequest(streaming_config=config),
+                requests[0],
+            ]

From 408f3570f6a00f6a61955b7b3aadbbc54b1ec8b8 Mon Sep 17 00:00:00 2001
From: David Raleigh <davidraleigh@gmail.com>
Date: Sun, 16 Jul 2017 09:09:26 -0700
Subject: [PATCH 078/211] fix big query documentation broken link (#3611)

closes issue https://github.com/GoogleCloudPlatform/google-cloud-python/issues/3610
---
 bigquery/README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigquery/README.rst b/bigquery/README.rst
index 1dcea16e0cc57..97a94366a49a7 100644
--- a/bigquery/README.rst
+++ b/bigquery/README.rst
@@ -9,7 +9,7 @@ Python Client for Google BigQuery
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/bigquery-usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/bigquery/usage.html
 
 Quick Start
 -----------

From fe9b6cf875dbc31ddcfe293d9b6ce6bdad58af65 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Sun, 16 Jul 2017 18:57:38 -0700
Subject: [PATCH 079/211] Fixing merge conflict in `setup.py` for Speech.
 (#3609)

---
 speech/setup.py | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/speech/setup.py b/speech/setup.py
index 7bd990e2be3dc..1075df8371410 100644
--- a/speech/setup.py
+++ b/speech/setup.py
@@ -37,7 +37,7 @@
     'include_package_data': True,
     'zip_safe': False,
     'classifiers': [
-        'Development Status :: 3 - Alpha',
+        'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
@@ -58,8 +58,6 @@
 ]
 
 setup(
-    author='Google Cloud Platform',
-    author_email='googleapis-packages@google.com',
     name='google-cloud-speech',
     version='0.27.0',
     description='Python Client for Google Cloud Speech',
@@ -74,23 +72,5 @@
     ],
     packages=find_packages(exclude=('tests*',)),
     install_requires=REQUIREMENTS,
-    url='https://github.com/GoogleCloudPlatform/google-cloud-python',
-    license='Apache 2.0',
-    platforms='Posix; MacOS X; Windows',
-    include_package_data=True,
-    zip_safe=False,
-    scripts=[],
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: Apache Software License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Topic :: Internet',
-    ],
+    **SETUP_BASE
 )

From 67f4ba47069146a9b93005e38046eb2cd59b150a Mon Sep 17 00:00:00 2001
From: Cal Peyser <calpeyser@gmail.com>
Date: Mon, 17 Jul 2017 11:37:34 -0400
Subject: [PATCH 080/211] RPC retries (second PR) (#3324)

---
 bigtable/google/cloud/bigtable/retry.py    | 169 +++++++++++++++++++
 bigtable/google/cloud/bigtable/row_data.py |   3 +
 bigtable/google/cloud/bigtable/table.py    | 101 ++++-------
 bigtable/tests/retry_test_script.txt       |  38 +++++
 bigtable/tests/system.py                   |  78 +++++++++
 bigtable/tests/unit/_testing.py            |  27 ++-
 bigtable/tests/unit/test_table.py          | 185 +++++++++++++++++++--
 7 files changed, 520 insertions(+), 81 deletions(-)
 create mode 100644 bigtable/google/cloud/bigtable/retry.py
 create mode 100644 bigtable/tests/retry_test_script.txt

diff --git a/bigtable/google/cloud/bigtable/retry.py b/bigtable/google/cloud/bigtable/retry.py
new file mode 100644
index 0000000000000..f20419ce4f8e0
--- /dev/null
+++ b/bigtable/google/cloud/bigtable/retry.py
@@ -0,0 +1,169 @@
+"""Provides function wrappers that implement retrying."""
+import random
+import time
+import six
+import sys
+
+from google.cloud._helpers import _to_bytes
+from google.cloud.bigtable._generated import (
+    bigtable_pb2 as data_messages_v2_pb2)
+from google.gax import config, errors
+from grpc import RpcError
+
+
+_MILLIS_PER_SECOND = 1000
+
+
+class ReadRowsIterator(object):
+    """Creates an iterator equivalent to a_iter, but that retries on certain
+    exceptions.
+    """
+
+    def __init__(self, client, name, start_key, end_key, filter_, limit,
+                 retry_options, **kwargs):
+        self.client = client
+        self.retry_options = retry_options
+        self.name = name
+        self.start_key = start_key
+        self.start_key_closed = True
+        self.end_key = end_key
+        self.filter_ = filter_
+        self.limit = limit
+        self.delay_mult = retry_options.backoff_settings.retry_delay_multiplier
+        self.max_delay_millis = \
+            retry_options.backoff_settings.max_retry_delay_millis
+        self.timeout_mult = \
+            retry_options.backoff_settings.rpc_timeout_multiplier
+        self.max_timeout = \
+            (retry_options.backoff_settings.max_rpc_timeout_millis /
+             _MILLIS_PER_SECOND)
+        self.total_timeout = \
+            (retry_options.backoff_settings.total_timeout_millis /
+             _MILLIS_PER_SECOND)
+        self.set_stream()
+
+    def set_start_key(self, start_key):
+        """
+        Sets the row key at which this iterator will begin reading.
+        """
+        self.start_key = start_key
+        self.start_key_closed = False
+
+    def set_stream(self):
+        """
+        Resets the read stream by making an RPC on the 'ReadRows' endpoint.
+        """
+        req_pb = _create_row_request(self.name, start_key=self.start_key,
+                                     start_key_closed=self.start_key_closed,
+                                     end_key=self.end_key,
+                                     filter_=self.filter_, limit=self.limit)
+        self.stream = self.client._data_stub.ReadRows(req_pb)
+
+    def next(self, *args, **kwargs):
+        """
+        Read and return the next row from the stream.
+        Retry on idempotent failure.
+        """
+        delay = self.retry_options.backoff_settings.initial_retry_delay_millis
+        exc = errors.RetryError('Retry total timeout exceeded before any'
+                                'response was received')
+        timeout = (self.retry_options.backoff_settings
+                   .initial_rpc_timeout_millis /
+                   _MILLIS_PER_SECOND)
+
+        now = time.time()
+        deadline = now + self.total_timeout
+        while deadline is None or now < deadline:
+            try:
+                return six.next(self.stream)
+            except StopIteration as stop:
+                raise stop
+            except RpcError as error:  # pylint: disable=broad-except
+                code = config.exc_to_code(error)
+                if code not in self.retry_options.retry_codes:
+                    six.reraise(type(error), error)
+
+                # pylint: disable=redefined-variable-type
+                exc = errors.RetryError(
+                    'Retry total timeout exceeded with exception', error)
+
+                # Sleep a random number which will, on average, equal the
+                # expected delay.
+                to_sleep = random.uniform(0, delay * 2)
+                time.sleep(to_sleep / _MILLIS_PER_SECOND)
+                delay = min(delay * self.delay_mult, self.max_delay_millis)
+                now = time.time()
+                timeout = min(
+                    timeout * self.timeout_mult, self.max_timeout,
+                    deadline - now)
+                self.set_stream()
+
+        six.reraise(errors.RetryError, exc, sys.exc_info()[2])
+
+    def __next__(self, *args, **kwargs):
+        return self.next(*args, **kwargs)
+
+
+def _create_row_request(table_name, row_key=None, start_key=None,
+                        start_key_closed=True, end_key=None, filter_=None,
+                        limit=None):
+    """Creates a request to read rows in a table.
+
+    :type table_name: str
+    :param table_name: The name of the table to read from.
+
+    :type row_key: bytes
+    :param row_key: (Optional) The key of a specific row to read from.
+
+    :type start_key: bytes
+    :param start_key: (Optional) The beginning of a range of row keys to
+                      read from. The range will include ``start_key``. If
+                      left empty, will be interpreted as the empty string.
+
+    :type end_key: bytes
+    :param end_key: (Optional) The end of a range of row keys to read from.
+                    The range will not include ``end_key``. If left empty,
+                    will be interpreted as an infinite string.
+
+    :type filter_: :class:`.RowFilter`
+    :param filter_: (Optional) The filter to apply to the contents of the
+                    specified row(s). If unset, reads the entire table.
+
+    :type limit: int
+    :param limit: (Optional) The read will terminate after committing to N
+                  rows' worth of results. The default (zero) is to return
+                  all results.
+
+    :rtype: :class:`data_messages_v2_pb2.ReadRowsRequest`
+    :returns: The ``ReadRowsRequest`` protobuf corresponding to the inputs.
+    :raises: :class:`ValueError <exceptions.ValueError>` if both
+             ``row_key`` and one of ``start_key`` and ``end_key`` are set
+    """
+    request_kwargs = {'table_name': table_name}
+    if (row_key is not None and
+            (start_key is not None or end_key is not None)):
+        raise ValueError('Row key and row range cannot be '
+                         'set simultaneously')
+    range_kwargs = {}
+    if start_key is not None or end_key is not None:
+        if start_key is not None:
+            if start_key_closed:
+                range_kwargs['start_key_closed'] = _to_bytes(start_key)
+            else:
+                range_kwargs['start_key_open'] = _to_bytes(start_key)
+        if end_key is not None:
+            range_kwargs['end_key_open'] = _to_bytes(end_key)
+    if filter_ is not None:
+        request_kwargs['filter'] = filter_.to_pb()
+    if limit is not None:
+        request_kwargs['rows_limit'] = limit
+
+    message = data_messages_v2_pb2.ReadRowsRequest(**request_kwargs)
+
+    if row_key is not None:
+        message.rows.row_keys.append(_to_bytes(row_key))
+
+    if range_kwargs:
+        message.rows.row_ranges.add(**range_kwargs)
+
+    return message
diff --git a/bigtable/google/cloud/bigtable/row_data.py b/bigtable/google/cloud/bigtable/row_data.py
index 78179db25c4e5..0849e681b7e65 100644
--- a/bigtable/google/cloud/bigtable/row_data.py
+++ b/bigtable/google/cloud/bigtable/row_data.py
@@ -274,6 +274,9 @@ def consume_next(self):
 
             self._validate_chunk(chunk)
 
+            if hasattr(self._response_iterator, 'set_start_key'):
+                self._response_iterator.set_start_key(chunk.row_key)
+
             if chunk.reset_row:
                 row = self._row = None
                 cell = self._cell = self._previous_cell = None
diff --git a/bigtable/google/cloud/bigtable/table.py b/bigtable/google/cloud/bigtable/table.py
index 8dbf8c1ce6fbf..3ed2d20ea9754 100644
--- a/bigtable/google/cloud/bigtable/table.py
+++ b/bigtable/google/cloud/bigtable/table.py
@@ -17,7 +17,6 @@
 
 import six
 
-from google.cloud._helpers import _to_bytes
 from google.cloud.bigtable._generated import (
     bigtable_pb2 as data_messages_v2_pb2)
 from google.cloud.bigtable._generated import (
@@ -30,6 +29,26 @@
 from google.cloud.bigtable.row import ConditionalRow
 from google.cloud.bigtable.row import DirectRow
 from google.cloud.bigtable.row_data import PartialRowsData
+from google.gax import RetryOptions, BackoffSettings
+from google.cloud.bigtable.retry import ReadRowsIterator, _create_row_request
+from grpc import StatusCode
+
+BACKOFF_SETTINGS = BackoffSettings(
+    initial_retry_delay_millis=10,
+    retry_delay_multiplier=1.3,
+    max_retry_delay_millis=30000,
+    initial_rpc_timeout_millis=25 * 60 * 1000,
+    rpc_timeout_multiplier=1.0,
+    max_rpc_timeout_millis=25 * 60 * 1000,
+    total_timeout_millis=30 * 60 * 1000
+)
+
+RETRY_CODES = [
+    StatusCode.DEADLINE_EXCEEDED,
+    StatusCode.ABORTED,
+    StatusCode.INTERNAL,
+    StatusCode.UNAVAILABLE
+]
 
 
 # Maximum number of mutations in bulk (MutateRowsRequest message):
@@ -257,7 +276,7 @@ def read_row(self, row_key, filter_=None):
         return rows_data.rows[row_key]
 
     def read_rows(self, start_key=None, end_key=None, limit=None,
-                  filter_=None):
+                  filter_=None, backoff_settings=None):
         """Read rows from this table.
 
         :type start_key: bytes
@@ -284,13 +303,18 @@ def read_rows(self, start_key=None, end_key=None, limit=None,
         :returns: A :class:`.PartialRowsData` convenience wrapper for consuming
                   the streamed results.
         """
-        request_pb = _create_row_request(
-            self.name, start_key=start_key, end_key=end_key, filter_=filter_,
-            limit=limit)
         client = self._instance._client
-        response_iterator = client._data_stub.ReadRows(request_pb)
-        # We expect an iterator of `data_messages_v2_pb2.ReadRowsResponse`
-        return PartialRowsData(response_iterator)
+        if backoff_settings is None:
+            backoff_settings = BACKOFF_SETTINGS
+        RETRY_OPTIONS = RetryOptions(
+            retry_codes=RETRY_CODES,
+            backoff_settings=backoff_settings
+        )
+
+        retrying_iterator = ReadRowsIterator(client, self.name, start_key,
+                                             end_key, filter_, limit,
+                                             RETRY_OPTIONS)
+        return PartialRowsData(retrying_iterator)
 
     def mutate_rows(self, rows):
         """Mutates multiple rows in bulk.
@@ -359,67 +383,6 @@ def sample_row_keys(self):
         return response_iterator
 
 
-def _create_row_request(table_name, row_key=None, start_key=None, end_key=None,
-                        filter_=None, limit=None):
-    """Creates a request to read rows in a table.
-
-    :type table_name: str
-    :param table_name: The name of the table to read from.
-
-    :type row_key: bytes
-    :param row_key: (Optional) The key of a specific row to read from.
-
-    :type start_key: bytes
-    :param start_key: (Optional) The beginning of a range of row keys to
-                      read from. The range will include ``start_key``. If
-                      left empty, will be interpreted as the empty string.
-
-    :type end_key: bytes
-    :param end_key: (Optional) The end of a range of row keys to read from.
-                    The range will not include ``end_key``. If left empty,
-                    will be interpreted as an infinite string.
-
-    :type filter_: :class:`.RowFilter`
-    :param filter_: (Optional) The filter to apply to the contents of the
-                    specified row(s). If unset, reads the entire table.
-
-    :type limit: int
-    :param limit: (Optional) The read will terminate after committing to N
-                  rows' worth of results. The default (zero) is to return
-                  all results.
-
-    :rtype: :class:`data_messages_v2_pb2.ReadRowsRequest`
-    :returns: The ``ReadRowsRequest`` protobuf corresponding to the inputs.
-    :raises: :class:`ValueError <exceptions.ValueError>` if both
-             ``row_key`` and one of ``start_key`` and ``end_key`` are set
-    """
-    request_kwargs = {'table_name': table_name}
-    if (row_key is not None and
-            (start_key is not None or end_key is not None)):
-        raise ValueError('Row key and row range cannot be '
-                         'set simultaneously')
-    range_kwargs = {}
-    if start_key is not None or end_key is not None:
-        if start_key is not None:
-            range_kwargs['start_key_closed'] = _to_bytes(start_key)
-        if end_key is not None:
-            range_kwargs['end_key_open'] = _to_bytes(end_key)
-    if filter_ is not None:
-        request_kwargs['filter'] = filter_.to_pb()
-    if limit is not None:
-        request_kwargs['rows_limit'] = limit
-
-    message = data_messages_v2_pb2.ReadRowsRequest(**request_kwargs)
-
-    if row_key is not None:
-        message.rows.row_keys.append(_to_bytes(row_key))
-
-    if range_kwargs:
-        message.rows.row_ranges.add(**range_kwargs)
-
-    return message
-
-
 def _mutate_rows_request(table_name, rows):
     """Creates a request to mutate rows in a table.
 
diff --git a/bigtable/tests/retry_test_script.txt b/bigtable/tests/retry_test_script.txt
new file mode 100644
index 0000000000000..863662e897ba0
--- /dev/null
+++ b/bigtable/tests/retry_test_script.txt
@@ -0,0 +1,38 @@
+# This retry script is processed by the retry server and the client under test.
+# Client tests should parse any command beginning with "CLIENT:", send the corresponding RPC
+# to the retry server and expect a valid response.
+# "EXPECT" commands indicate the call the server is expecting the client to send.
+#
+# The retry server has one table named "table" that should be used for testing.
+# There are three types of commands supported:
+# READ <comma-separated list of row ids to read>
+#     Expect the corresponding rows to be returned with arbitrary values.
+# SCAN <range>... <comma separated list of row ids to expect>
+#     Ranges are expressed as an interval with either open or closed start and end,
+#     such as [1,3) for "1,2" or (1, 3] for "2,3".
+# WRITE <comma-separated list of row ids to write>
+#     All writes should succeed eventually. Value payload is ignored.
+# The server writes PASS or FAIL on a line by itself to STDOUT depending on the result of the test.
+# All other server output should be ignored.
+
+# Echo same scan back after immediate error
+CLIENT: SCAN [r1,r3) r1,r2
+EXPECT: SCAN [r1,r3)
+SERVER: ERROR Unavailable
+EXPECT: SCAN [r1,r3)
+SERVER: READ_RESPONSE r1,r2
+
+# Retry scans with open interval starting at the least read row key.
+# Instead of using open intervals for retry ranges, '\x00' can be
+# appended to the last received row key and sent in a closed interval.
+CLIENT: SCAN [r1,r9) r1,r2,r3,r4,r5,r6,r7,r8
+EXPECT: SCAN [r1,r9)
+SERVER: READ_RESPONSE r1,r2,r3,r4
+SERVER: ERROR Unavailable
+EXPECT: SCAN (r4,r9)
+SERVER: ERROR Unavailable
+EXPECT: SCAN (r4,r9)
+SERVER: READ_RESPONSE r5,r6,r7
+SERVER: ERROR Unavailable
+EXPECT: SCAN (r7,r9)
+SERVER: READ_RESPONSE r8
diff --git a/bigtable/tests/system.py b/bigtable/tests/system.py
index 1fcda808db397..5a5b4324cbbeb 100644
--- a/bigtable/tests/system.py
+++ b/bigtable/tests/system.py
@@ -295,6 +295,84 @@ def test_delete_column_family(self):
         # Make sure we have successfully deleted it.
         self.assertEqual(temp_table.list_column_families(), {})
 
+    def test_retry(self):
+        import subprocess, os, stat, platform
+        from google.cloud.bigtable.client import Client
+        from google.cloud.bigtable.instance import Instance
+        from google.cloud.bigtable.table import Table
+
+        # import for urlopen based on version
+        try:
+            # python 3
+            from urllib.request import urlopen
+        except ImportError:
+            # python 2
+            from urllib2 import urlopen
+
+
+        TEST_SCRIPT = 'tests/retry_test_script.txt'
+        SERVER_NAME = 'retry_server'
+        SERVER_ZIP = SERVER_NAME + ".tar.gz"
+
+        def process_scan(table, range, ids):
+            range_chunks = range.split(",")
+            range_open = range_chunks[0].lstrip("[")
+            range_close = range_chunks[1].rstrip(")")
+            rows = table.read_rows(range_open, range_close)
+            rows.consume_all()
+
+        # Download server
+        MOCK_SERVER_URLS = {
+            'Linux': 'https://storage.googleapis.com/cloud-bigtable-test/retries/retry_server_linux.tar.gz',
+            'Darwin': 'https://storage.googleapis.com/cloud-bigtable-test/retries/retry_server_mac.tar.gz',
+        }
+
+        test_platform = platform.system()
+        if test_platform not in MOCK_SERVER_URLS:
+            self.skip('Retry server not available for platform {0}.'.format(test_platform))
+
+        mock_server_download = urlopen(MOCK_SERVER_URLS[test_platform]).read()
+        mock_server_file = open(SERVER_ZIP, 'wb')
+        mock_server_file.write(mock_server_download)
+
+        # Unzip server
+        subprocess.call(['tar', 'zxvf', SERVER_ZIP, '-C', '.'])
+
+        # Connect to server
+        server = subprocess.Popen(
+            ['./' + SERVER_NAME, '--script=' + TEST_SCRIPT],
+            stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
+
+        (endpoint, port) = server.stdout.readline().rstrip("\n").split(":")
+        os.environ["BIGTABLE_EMULATOR_HOST"] = endpoint + ":" + port
+        client = Client(project="client", admin=True)
+        instance = Instance("instance", client)
+        table = instance.table("table")
+
+        # Run test, line by line
+        with open(TEST_SCRIPT, 'r') as script:
+            for line in script.readlines():
+                if line.startswith("CLIENT:"):
+                    chunks = line.split(" ")
+                    op = chunks[1]
+                    process_scan(table, chunks[2], chunks[3])
+
+        # Check that the test passed
+        server.kill()
+        server_stdout_lines = []
+        while True:
+            line = server.stdout.readline()
+            if line != '':
+                server_stdout_lines.append(line)
+            else:
+                break
+        self.assertEqual(server_stdout_lines[-1], "PASS\n")
+
+        # Clean up
+        os.remove(SERVER_ZIP)
+        os.remove(SERVER_NAME)
 
 class TestDataAPI(unittest.TestCase):
 
diff --git a/bigtable/tests/unit/_testing.py b/bigtable/tests/unit/_testing.py
index e67af6a1498c3..7587c66c133be 100644
--- a/bigtable/tests/unit/_testing.py
+++ b/bigtable/tests/unit/_testing.py
@@ -14,7 +14,6 @@
 
 """Mocks used to emulate gRPC generated objects."""
 
-
 class _FakeStub(object):
     """Acts as a gPRC stub."""
 
@@ -27,6 +26,16 @@ def __getattr__(self, name):
         # since __getattribute__ will handle them.
         return _MethodMock(name, self)
 
+class _CustomFakeStub(object):
+    """Acts as a gRPC stub.  Generates a result using an injected callable."""
+    def __init__(self, result_callable):
+        self.result_callable = result_callable
+        self.method_calls = []
+
+    def __getattr__(self, name):
+        # We need not worry about attributes set in constructor
+        # since __getattribute__ will handle them.
+        return _CustomMethodMock(name, self)
 
 class _MethodMock(object):
     """Mock for API method attached to a gRPC stub.
@@ -42,5 +51,19 @@ def __call__(self, *args, **kwargs):
         """Sync method meant to mock a gRPC stub request."""
         self._stub.method_calls.append((self._name, args, kwargs))
         curr_result, self._stub.results = (self._stub.results[0],
-                                           self._stub.results[1:])
+                                       self._stub.results[1:])
         return curr_result
+
+class _CustomMethodMock(object):
+    """
+    Same as _MethodMock, but backed by an injected callable.
+    """
+
+    def __init__(self, name, stub):
+        self._name = name
+        self._stub = stub
+
+    def __call__(self, *args, **kwargs):
+        """Sync method meant to mock a gRPC stub request."""
+        self._stub.method_calls.append((self._name, args, kwargs))
+        return self._stub.result_callable()
diff --git a/bigtable/tests/unit/test_table.py b/bigtable/tests/unit/test_table.py
index 5867e76aff733..d985f7eb2f0f7 100644
--- a/bigtable/tests/unit/test_table.py
+++ b/bigtable/tests/unit/test_table.py
@@ -493,7 +493,8 @@ def test_read_rows(self):
         from google.cloud._testing import _Monkey
         from tests.unit._testing import _FakeStub
         from google.cloud.bigtable.row_data import PartialRowsData
-        from google.cloud.bigtable import table as MUT
+        from google.cloud.bigtable import retry as MUT
+        from google.cloud.bigtable.retry import ReadRowsIterator
 
         client = _Client()
         instance = _Instance(self.INSTANCE_NAME, client=client)
@@ -513,20 +514,18 @@ def mock_create_row_request(table_name, **kwargs):
         # Patch the stub used by the API method.
         client._data_stub = stub = _FakeStub(response_iterator)
 
-        # Create expected_result.
-        expected_result = PartialRowsData(response_iterator)
-
-        # Perform the method and check the result.
         start_key = b'start-key'
         end_key = b'end-key'
         filter_obj = object()
         limit = 22
         with _Monkey(MUT, _create_row_request=mock_create_row_request):
+            # Perform the method and check the result.
             result = table.read_rows(
                 start_key=start_key, end_key=end_key, filter_=filter_obj,
                 limit=limit)
 
-        self.assertEqual(result, expected_result)
+        self.assertIsInstance(result._response_iterator, ReadRowsIterator)
+        self.assertEqual(result._response_iterator.client, client)
         self.assertEqual(stub.method_calls, [(
             'ReadRows',
             (request_pb,),
@@ -537,9 +536,166 @@ def mock_create_row_request(table_name, **kwargs):
             'end_key': end_key,
             'filter_': filter_obj,
             'limit': limit,
+            'start_key_closed': True,
         }
         self.assertEqual(mock_created, [(table.name, created_kwargs)])
 
+    def test_read_rows_one_chunk(self):
+        from google.cloud._testing import _Monkey
+        from tests.unit._testing import _FakeStub
+        from google.cloud.bigtable import retry as MUT
+        from google.cloud.bigtable.retry import ReadRowsIterator
+        from google.cloud.bigtable.row_data import Cell
+        from google.cloud.bigtable.row_data import PartialRowsData
+
+        client = _Client()
+        instance = _Instance(self.INSTANCE_NAME, client=client)
+        table = self._make_one(self.TABLE_ID, instance)
+
+        # Create request_pb
+        request_pb = object()  # Returned by our mock.
+        mock_created = []
+
+        def mock_create_row_request(table_name, **kwargs):
+            mock_created.append((table_name, kwargs))
+            return request_pb
+
+        # Create response_iterator
+        chunk = _ReadRowsResponseCellChunkPB(
+            row_key=self.ROW_KEY,
+            family_name=self.FAMILY_NAME,
+            qualifier=self.QUALIFIER,
+            timestamp_micros=self.TIMESTAMP_MICROS,
+            value=self.VALUE,
+            commit_row=True,
+        )
+        response_pb = _ReadRowsResponsePB(chunks=[chunk])
+        response_iterator = iter([response_pb])
+
+        # Patch the stub used by the API method.
+        client._data_stub = stub = _FakeStub(response_iterator)
+
+        start_key = b'start-key'
+        end_key = b'end-key'
+        filter_obj = object()
+        limit = 22
+        with _Monkey(MUT, _create_row_request=mock_create_row_request):
+            # Perform the method and check the result.
+            result = table.read_rows(
+                start_key=start_key, end_key=end_key, filter_=filter_obj,
+                limit=limit)
+            result.consume_all()
+
+    def test_read_rows_retry_timeout(self):
+        from google.cloud._testing import _Monkey
+        from tests.unit._testing import _CustomFakeStub
+        from google.cloud.bigtable.row_data import PartialRowsData
+        from google.cloud.bigtable import retry as MUT
+        from google.cloud.bigtable.retry import ReadRowsIterator
+        from google.gax import BackoffSettings
+        from google.gax.errors import RetryError
+        from grpc import StatusCode, RpcError
+        import time
+
+        client = _Client()
+        instance = _Instance(self.INSTANCE_NAME, client=client)
+        table = self._make_one(self.TABLE_ID, instance)
+
+        # Create request_pb
+        request_pb = object()  # Returned by our mock.
+        mock_created = []
+
+        def mock_create_row_request(table_name, **kwargs):
+            mock_created.append((table_name, kwargs))
+            return request_pb
+
+        # Create a slow response iterator to cause a timeout
+        class MockTimeoutError(RpcError):
+            def code(self):
+                return StatusCode.DEADLINE_EXCEEDED
+
+        def _wait_then_raise():
+            time.sleep(0.1)
+            raise MockTimeoutError()
+
+        # Patch the stub used by the API method.  The stub should create a new
+        # slow_iterator every time its queried.
+        def make_slow_iterator():
+            return (_wait_then_raise() for i in range(10))
+        client._data_stub = stub = _CustomFakeStub(make_slow_iterator)
+
+        # Set to timeout before RPC completes
+        test_backoff_settings = BackoffSettings(
+            initial_retry_delay_millis=10,
+            retry_delay_multiplier=0.3,
+            max_retry_delay_millis=30000,
+            initial_rpc_timeout_millis=1000,
+            rpc_timeout_multiplier=1.0,
+            max_rpc_timeout_millis=25 * 60 * 1000,
+            total_timeout_millis=1000
+        )
+
+        start_key = b'start-key'
+        end_key = b'end-key'
+        filter_obj = object()
+        limit = 22
+        with _Monkey(MUT, _create_row_request=mock_create_row_request):
+            # Verify that a RetryError is thrown on read.
+            result = table.read_rows(
+                start_key=start_key, end_key=end_key, filter_=filter_obj,
+                limit=limit, backoff_settings=test_backoff_settings)
+            with self.assertRaises(RetryError):
+                result.consume_next()
+
+    def test_read_rows_non_idempotent_error_throws(self):
+        from google.cloud._testing import _Monkey
+        from tests.unit._testing import _CustomFakeStub
+        from google.cloud.bigtable.row_data import PartialRowsData
+        from google.cloud.bigtable import retry as MUT
+        from google.cloud.bigtable.retry import ReadRowsIterator
+        from google.gax import BackoffSettings
+        from google.gax.errors import RetryError
+        from grpc import StatusCode, RpcError
+        import time
+
+        client = _Client()
+        instance = _Instance(self.INSTANCE_NAME, client=client)
+        table = self._make_one(self.TABLE_ID, instance)
+
+        # Create request_pb
+        request_pb = object()  # Returned by our mock.
+        mock_created = []
+
+        def mock_create_row_request(table_name, **kwargs):
+            mock_created.append((table_name, kwargs))
+            return request_pb
+
+        # Create response iterator that raises a non-idempotent exception
+        class MockNonIdempotentError(RpcError):
+            def code(self):
+                return StatusCode.RESOURCE_EXHAUSTED
+
+        def _raise():
+            raise MockNonIdempotentError()
+
+        # Patch the stub used by the API method.  The stub should create a new
+        # slow_iterator every time its queried.
+        def make_raising_iterator():
+            return (_raise() for i in range(10))
+        client._data_stub = stub = _CustomFakeStub(make_raising_iterator)
+
+        start_key = b'start-key'
+        end_key = b'end-key'
+        filter_obj = object()
+        limit = 22
+        with _Monkey(MUT, _create_row_request=mock_create_row_request):
+            # Verify that a RetryError is thrown on read.
+            result = table.read_rows(
+                start_key=start_key, end_key=end_key, filter_=filter_obj,
+                limit=limit)
+            with self.assertRaises(MockNonIdempotentError):
+                result.consume_next()
+
     def test_sample_row_keys(self):
         from tests.unit._testing import _FakeStub
 
@@ -572,12 +728,12 @@ def test_sample_row_keys(self):
 class Test__create_row_request(unittest.TestCase):
 
     def _call_fut(self, table_name, row_key=None, start_key=None, end_key=None,
-                  filter_=None, limit=None):
-        from google.cloud.bigtable.table import _create_row_request
+                  start_key_closed=True, filter_=None, limit=None):
+        from google.cloud.bigtable.retry import _create_row_request
 
         return _create_row_request(
             table_name, row_key=row_key, start_key=start_key, end_key=end_key,
-            filter_=filter_, limit=limit)
+            start_key_closed=start_key_closed, filter_=filter_, limit=limit)
 
     def test_table_name_only(self):
         table_name = 'table_name'
@@ -600,7 +756,7 @@ def test_row_key(self):
         expected_result.rows.row_keys.append(row_key)
         self.assertEqual(result, expected_result)
 
-    def test_row_range_start_key(self):
+    def test_row_range_start_key_closed(self):
         table_name = 'table_name'
         start_key = b'start_key'
         result = self._call_fut(table_name, start_key=start_key)
@@ -608,6 +764,15 @@ def test_row_range_start_key(self):
         expected_result.rows.row_ranges.add(start_key_closed=start_key)
         self.assertEqual(result, expected_result)
 
+    def test_row_range_start_key_open(self):
+        table_name = 'table_name'
+        start_key = b'start_key'
+        result = self._call_fut(table_name, start_key=start_key,
+            start_key_closed=False)
+        expected_result = _ReadRowsRequestPB(table_name=table_name)
+        expected_result.rows.row_ranges.add(start_key_open=start_key)
+        self.assertEqual(result, expected_result)
+
     def test_row_range_end_key(self):
         table_name = 'table_name'
         end_key = b'end_key'

From 46f519aad0bf1a034dcb01e81189ae297c020ee9 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Mon, 17 Jul 2017 10:03:33 -0700
Subject: [PATCH 081/211] Using `CopyFrom` to set protobuf message fields
 (instead of `MergeFrom`). (#3612)

Fixes #3571.
---
 bigtable/google/cloud/bigtable/table.py | 2 +-
 bigtable/tests/unit/test_table.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bigtable/google/cloud/bigtable/table.py b/bigtable/google/cloud/bigtable/table.py
index 3ed2d20ea9754..ad6fab88dcf9c 100644
--- a/bigtable/google/cloud/bigtable/table.py
+++ b/bigtable/google/cloud/bigtable/table.py
@@ -200,7 +200,7 @@ def create(self, initial_split_keys=None, column_families=()):
             table_pb = table_v2_pb2.Table()
             for col_fam in column_families:
                 curr_id = col_fam.column_family_id
-                table_pb.column_families[curr_id].MergeFrom(col_fam.to_pb())
+                table_pb.column_families[curr_id].CopyFrom(col_fam.to_pb())
 
         request_pb = table_admin_messages_v2_pb2.CreateTableRequest(
             initial_splits=initial_split_keys or [],
diff --git a/bigtable/tests/unit/test_table.py b/bigtable/tests/unit/test_table.py
index d985f7eb2f0f7..c59667d6a8211 100644
--- a/bigtable/tests/unit/test_table.py
+++ b/bigtable/tests/unit/test_table.py
@@ -255,7 +255,7 @@ def _create_test_helper(self, initial_split_keys, column_families=()):
             for cf in column_families:
                 cf_pb = table_pb.column_families[cf.column_family_id]
                 if cf.gc_rule is not None:
-                    cf_pb.gc_rule.MergeFrom(cf.gc_rule.to_pb())
+                    cf_pb.gc_rule.CopyFrom(cf.gc_rule.to_pb())
         request_pb = _CreateTableRequestPB(
             initial_splits=splits_pb,
             parent=self.INSTANCE_NAME,

From 59fd1e4ff50827a868986deee938a26b5d50dc0f Mon Sep 17 00:00:00 2001
From: Argyris Zymnis <argyris@zymnis.org>
Date: Mon, 17 Jul 2017 10:54:45 -0700
Subject: [PATCH 082/211] Add a __hash__ implementation to SchemaField (#3601)

* Add a __hash__ implementation to SchemaField
* Modify default list of subfields to be the empty tuple
* Making SchemaField immutable.
* Adding SchemaField.__ne__.
---
 bigquery/google/cloud/bigquery/schema.py |  92 ++++++++++++---
 bigquery/google/cloud/bigquery/table.py  |   4 +-
 bigquery/tests/unit/test_query.py        |   6 +-
 bigquery/tests/unit/test_schema.py       | 136 +++++++++++++++++------
 4 files changed, 186 insertions(+), 52 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/schema.py b/bigquery/google/cloud/bigquery/schema.py
index 6d4a437a809f9..faec69f616dac 100644
--- a/bigquery/google/cloud/bigquery/schema.py
+++ b/bigquery/google/cloud/bigquery/schema.py
@@ -26,27 +26,89 @@ class SchemaField(object):
                        'FLOAT', 'BOOLEAN', 'TIMESTAMP' or 'RECORD').
 
     :type mode: str
-    :param mode: the type of the field (one of 'NULLABLE', 'REQUIRED',
+    :param mode: the mode of the field (one of 'NULLABLE', 'REQUIRED',
                  or 'REPEATED').
 
     :type description: str
     :param description: optional description for the field.
 
-    :type fields: list of :class:`SchemaField`, or None
+    :type fields: tuple of :class:`SchemaField`
     :param fields: subfields (requires ``field_type`` of 'RECORD').
     """
-    def __init__(self, name, field_type, mode='NULLABLE', description=None,
-                 fields=None):
-        self.name = name
-        self.field_type = field_type
-        self.mode = mode
-        self.description = description
-        self.fields = fields
+    def __init__(self, name, field_type, mode='NULLABLE',
+                 description=None, fields=()):
+        self._name = name
+        self._field_type = field_type
+        self._mode = mode
+        self._description = description
+        self._fields = tuple(fields)
 
-    def __eq__(self, other):
+    @property
+    def name(self):
+        """str: The name of the field."""
+        return self._name
+
+    @property
+    def field_type(self):
+        """str: The type of the field.
+
+        Will be one of 'STRING', 'INTEGER', 'FLOAT', 'BOOLEAN',
+        'TIMESTAMP' or 'RECORD'.
+        """
+        return self._field_type
+
+    @property
+    def mode(self):
+        """str: The mode of the field.
+
+        Will be one of 'NULLABLE', 'REQUIRED', or 'REPEATED'.
+        """
+        return self._mode
+
+    @property
+    def description(self):
+        """Optional[str]: Description for the field."""
+        return self._description
+
+    @property
+    def fields(self):
+        """tuple: Subfields contained in this field.
+
+        If ``field_type`` is not 'RECORD', this property must be
+        empty / unset.
+        """
+        return self._fields
+
+    def _key(self):
+        """A tuple key that unique-ly describes this field.
+
+        Used to compute this instance's hashcode and evaluate equality.
+
+        Returns:
+            tuple: The contents of this :class:`SchemaField`.
+        """
         return (
-            self.name == other.name and
-            self.field_type.lower() == other.field_type.lower() and
-            self.mode == other.mode and
-            self.description == other.description and
-            self.fields == other.fields)
+            self._name,
+            self._field_type.lower(),
+            self._mode,
+            self._description,
+            self._fields,
+        )
+
+    def __eq__(self, other):
+        if isinstance(other, SchemaField):
+            return self._key() == other._key()
+        else:
+            return NotImplemented
+
+    def __ne__(self, other):
+        if isinstance(other, SchemaField):
+            return self._key() != other._key()
+        else:
+            return NotImplemented
+
+    def __hash__(self):
+        return hash(self._key())
+
+    def __repr__(self):
+        return 'SchemaField{}'.format(self._key())
diff --git a/bigquery/google/cloud/bigquery/table.py b/bigquery/google/cloud/bigquery/table.py
index 37dc1159cc8e0..2c4064e83e8f7 100644
--- a/bigquery/google/cloud/bigquery/table.py
+++ b/bigquery/google/cloud/bigquery/table.py
@@ -1079,7 +1079,7 @@ def _parse_schema_resource(info):
                 present in ``info``.
     """
     if 'fields' not in info:
-        return None
+        return ()
 
     schema = []
     for r_field in info['fields']:
@@ -1109,7 +1109,7 @@ def _build_schema_resource(fields):
                 'mode': field.mode}
         if field.description is not None:
             info['description'] = field.description
-        if field.fields is not None:
+        if field.fields:
             info['fields'] = _build_schema_resource(field.fields)
         infos.append(info)
     return infos
diff --git a/bigquery/tests/unit/test_query.py b/bigquery/tests/unit/test_query.py
index d7977a4e7d0c3..76d5057f64505 100644
--- a/bigquery/tests/unit/test_query.py
+++ b/bigquery/tests/unit/test_query.py
@@ -88,9 +88,9 @@ def _verifySchema(self, query, resource):
                 self.assertEqual(found.mode, expected['mode'])
                 self.assertEqual(found.description,
                                  expected.get('description'))
-                self.assertEqual(found.fields, expected.get('fields'))
+                self.assertEqual(found.fields, expected.get('fields', ()))
         else:
-            self.assertIsNone(query.schema)
+            self.assertEqual(query.schema, ())
 
     def _verifyRows(self, query, resource):
         expected = resource.get('rows')
@@ -166,7 +166,7 @@ def test_ctor_defaults(self):
         self.assertIsNone(query.page_token)
         self.assertEqual(query.query_parameters, [])
         self.assertEqual(query.rows, [])
-        self.assertIsNone(query.schema)
+        self.assertEqual(query.schema, ())
         self.assertIsNone(query.total_rows)
         self.assertIsNone(query.total_bytes_processed)
         self.assertEqual(query.udf_resources, [])
diff --git a/bigquery/tests/unit/test_schema.py b/bigquery/tests/unit/test_schema.py
index 8081fcd6f4e05..018736d31bc16 100644
--- a/bigquery/tests/unit/test_schema.py
+++ b/bigquery/tests/unit/test_schema.py
@@ -26,43 +26,72 @@ def _get_target_class():
     def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
-    def test_ctor_defaults(self):
+    def test_constructor_defaults(self):
         field = self._make_one('test', 'STRING')
-        self.assertEqual(field.name, 'test')
-        self.assertEqual(field.field_type, 'STRING')
-        self.assertEqual(field.mode, 'NULLABLE')
-        self.assertIsNone(field.description)
-        self.assertIsNone(field.fields)
+        self.assertEqual(field._name, 'test')
+        self.assertEqual(field._field_type, 'STRING')
+        self.assertEqual(field._mode, 'NULLABLE')
+        self.assertIsNone(field._description)
+        self.assertEqual(field._fields, ())
 
-    def test_ctor_explicit(self):
+    def test_constructor_explicit(self):
         field = self._make_one('test', 'STRING', mode='REQUIRED',
                                description='Testing')
-        self.assertEqual(field.name, 'test')
-        self.assertEqual(field.field_type, 'STRING')
-        self.assertEqual(field.mode, 'REQUIRED')
-        self.assertEqual(field.description, 'Testing')
-        self.assertIsNone(field.fields)
-
-    def test_ctor_subfields(self):
+        self.assertEqual(field._name, 'test')
+        self.assertEqual(field._field_type, 'STRING')
+        self.assertEqual(field._mode, 'REQUIRED')
+        self.assertEqual(field._description, 'Testing')
+        self.assertEqual(field._fields, ())
+
+    def test_constructor_subfields(self):
+        sub_field1 = self._make_one('area_code', 'STRING')
+        sub_field2 = self._make_one('local_number', 'STRING')
         field = self._make_one(
-            'phone_number', 'RECORD',
-            fields=[self._make_one('area_code', 'STRING'),
-                    self._make_one('local_number', 'STRING')])
-        self.assertEqual(field.name, 'phone_number')
-        self.assertEqual(field.field_type, 'RECORD')
-        self.assertEqual(field.mode, 'NULLABLE')
-        self.assertIsNone(field.description)
-        self.assertEqual(len(field.fields), 2)
-        self.assertEqual(field.fields[0].name, 'area_code')
-        self.assertEqual(field.fields[0].field_type, 'STRING')
-        self.assertEqual(field.fields[0].mode, 'NULLABLE')
-        self.assertIsNone(field.fields[0].description)
-        self.assertIsNone(field.fields[0].fields)
-        self.assertEqual(field.fields[1].name, 'local_number')
-        self.assertEqual(field.fields[1].field_type, 'STRING')
-        self.assertEqual(field.fields[1].mode, 'NULLABLE')
-        self.assertIsNone(field.fields[1].description)
-        self.assertIsNone(field.fields[1].fields)
+            'phone_number',
+            'RECORD',
+            fields=[sub_field1, sub_field2],
+        )
+        self.assertEqual(field._name, 'phone_number')
+        self.assertEqual(field._field_type, 'RECORD')
+        self.assertEqual(field._mode, 'NULLABLE')
+        self.assertIsNone(field._description)
+        self.assertEqual(len(field._fields), 2)
+        self.assertIs(field._fields[0], sub_field1)
+        self.assertIs(field._fields[1], sub_field2)
+
+    def test_name_property(self):
+        name = 'lemon-ness'
+        schema_field = self._make_one(name, 'INTEGER')
+        self.assertIs(schema_field.name, name)
+
+    def test_field_type_property(self):
+        field_type = 'BOOLEAN'
+        schema_field = self._make_one('whether', field_type)
+        self.assertIs(schema_field.field_type, field_type)
+
+    def test_mode_property(self):
+        mode = 'REPEATED'
+        schema_field = self._make_one('again', 'FLOAT', mode=mode)
+        self.assertIs(schema_field.mode, mode)
+
+    def test_description_property(self):
+        description = 'It holds some data.'
+        schema_field = self._make_one(
+            'do', 'TIMESTAMP', description=description)
+        self.assertIs(schema_field.description, description)
+
+    def test_fields_property(self):
+        sub_field1 = self._make_one('one', 'STRING')
+        sub_field2 = self._make_one('fish', 'INTEGER')
+        fields = (sub_field1, sub_field2)
+        schema_field = self._make_one('boat', 'RECORD', fields=fields)
+        self.assertIs(schema_field.fields, fields)
+
+    def test___eq___wrong_type(self):
+        field = self._make_one('test', 'STRING')
+        other = object()
+        self.assertNotEqual(field, other)
+        self.assertIs(field.__eq__(other), NotImplemented)
 
     def test___eq___name_mismatch(self):
         field = self._make_one('test', 'STRING')
@@ -111,3 +140,46 @@ def test___eq___hit_w_fields(self):
         field = self._make_one('test', 'RECORD', fields=[sub1, sub2])
         other = self._make_one('test', 'RECORD', fields=[sub1, sub2])
         self.assertEqual(field, other)
+
+    def test___ne___wrong_type(self):
+        field = self._make_one('toast', 'INTEGER')
+        other = object()
+        self.assertNotEqual(field, other)
+        self.assertIs(field.__ne__(other), NotImplemented)
+
+    def test___ne___same_value(self):
+        field1 = self._make_one('test', 'TIMESTAMP', mode='REPEATED')
+        field2 = self._make_one('test', 'TIMESTAMP', mode='REPEATED')
+        # unittest ``assertEqual`` uses ``==`` not ``!=``.
+        comparison_val = (field1 != field2)
+        self.assertFalse(comparison_val)
+
+    def test___ne___different_values(self):
+        field1 = self._make_one(
+            'test1', 'FLOAT', mode='REPEATED', description='Not same')
+        field2 = self._make_one(
+            'test2', 'FLOAT', mode='NULLABLE', description='Knot saym')
+        self.assertNotEqual(field1, field2)
+
+    def test___hash__set_equality(self):
+        sub1 = self._make_one('sub1', 'STRING')
+        sub2 = self._make_one('sub2', 'STRING')
+        field1 = self._make_one('test', 'RECORD', fields=[sub1])
+        field2 = self._make_one('test', 'RECORD', fields=[sub2])
+        set_one = {field1, field2}
+        set_two = {field1, field2}
+        self.assertEqual(set_one, set_two)
+
+    def test___hash__not_equals(self):
+        sub1 = self._make_one('sub1', 'STRING')
+        sub2 = self._make_one('sub2', 'STRING')
+        field1 = self._make_one('test', 'RECORD', fields=[sub1])
+        field2 = self._make_one('test', 'RECORD', fields=[sub2])
+        set_one = {field1}
+        set_two = {field2}
+        self.assertNotEqual(set_one, set_two)
+
+    def test___repr__(self):
+        field1 = self._make_one('field1', 'STRING')
+        expected = "SchemaField('field1', 'string', 'NULLABLE', None, ())"
+        self.assertEqual(repr(field1), expected)

From df4b8eba2b89f9143339981153bae23ec0a14cc1 Mon Sep 17 00:00:00 2001
From: Evawere Ogbe <eoogbe@gmail.com>
Date: Mon, 17 Jul 2017 12:29:46 -0700
Subject: [PATCH 083/211] Add bigquery jobid to table (#3605)

---
 bigquery/google/cloud/bigquery/table.py | 15 ++++++++++++---
 bigquery/tests/unit/test_table.py       | 16 ++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/table.py b/bigquery/google/cloud/bigquery/table.py
index 2c4064e83e8f7..7e21e35d1fb09 100644
--- a/bigquery/google/cloud/bigquery/table.py
+++ b/bigquery/google/cloud/bigquery/table.py
@@ -842,7 +842,8 @@ def upload_from_file(self,
                          quote_character=None,
                          skip_leading_rows=None,
                          write_disposition=None,
-                         client=None):
+                         client=None,
+                         job_name=None):
         """Upload the contents of this table from a file-like object.
 
         The content type of the upload will either be
@@ -915,6 +916,10 @@ def upload_from_file(self,
         :param client: Optional. The client to use.  If not passed, falls back
                        to the ``client`` stored on the current dataset.
 
+        :type job_name: str
+        :param job_name: Optional. The id of the job. Generated if not
+                         explicitly passed in.
+
         :rtype: :class:`google.cloud.bigquery.jobs.LoadTableFromStorageJob`
         :returns: the job instance used to load the data (e.g., for
                   querying status). Note that the job is already started:
@@ -977,7 +982,7 @@ def upload_from_file(self,
                                 encoding, field_delimiter,
                                 ignore_unknown_values, max_bad_records,
                                 quote_character, skip_leading_rows,
-                                write_disposition)
+                                write_disposition, job_name)
 
         upload = Upload(file_obj, content_type, total_bytes,
                         auto_transfer=False)
@@ -1033,7 +1038,8 @@ def _configure_job_metadata(metadata,  # pylint: disable=too-many-arguments
                             max_bad_records,
                             quote_character,
                             skip_leading_rows,
-                            write_disposition):
+                            write_disposition,
+                            job_name):
     """Helper for :meth:`Table.upload_from_file`."""
     load_config = metadata['configuration']['load']
 
@@ -1067,6 +1073,9 @@ def _configure_job_metadata(metadata,  # pylint: disable=too-many-arguments
     if write_disposition is not None:
         load_config['writeDisposition'] = write_disposition
 
+    if job_name is not None:
+        load_config['jobReference'] = {'jobId': job_name}
+
 
 def _parse_schema_resource(info):
     """Parse a resource fragment into a schema field.
diff --git a/bigquery/tests/unit/test_table.py b/bigquery/tests/unit/test_table.py
index b27736fb896e3..f535e87996288 100644
--- a/bigquery/tests/unit/test_table.py
+++ b/bigquery/tests/unit/test_table.py
@@ -1844,6 +1844,22 @@ class _UploadConfig(object):
         self.assertEqual(req['body'], BODY)
     # pylint: enable=too-many-statements
 
+    def test_upload_from_file_w_jobid(self):
+        import json
+        from google.cloud._helpers import _to_bytes
+
+        requested, PATH, BODY = self._upload_from_file_helper(job_name='foo')
+        parse_chunk = _email_chunk_parser()
+        req = requested[0]
+        ctype, boundary = [x.strip()
+                           for x in req['headers']['content-type'].split(';')]
+        divider = b'--' + _to_bytes(boundary[len('boundary="'):-1])
+        chunks = req['body'].split(divider)[1:-1]  # discard prolog / epilog
+        text_msg = parse_chunk(chunks[0].strip())
+        metadata = json.loads(text_msg._payload)
+        load_config = metadata['configuration']['load']
+        self.assertEqual(load_config['jobReference'], {'jobId': 'foo'})
+
 
 class Test_parse_schema_resource(unittest.TestCase, _SchemaBase):
 

From 9c06b3549f29ba1211e31610cee95e66098fac68 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Mon, 17 Jul 2017 14:27:51 -0700
Subject: [PATCH 084/211] Add base future package to google.cloud (#3616)

---
 core/.coveragerc                        |   3 +
 core/google/cloud/_helpers.py           |  23 ++++
 core/google/cloud/future/__init__.py    |  21 +++
 core/google/cloud/future/_helpers.py    |  39 ++++++
 core/google/cloud/future/base.py        | 175 ++++++++++++++++++++++++
 core/tests/unit/future/__init__.py      |   0
 core/tests/unit/future/test__helpers.py |  37 +++++
 core/tests/unit/future/test_base.py     | 145 ++++++++++++++++++++
 core/tests/unit/test__helpers.py        |  29 ++++
 9 files changed, 472 insertions(+)
 create mode 100644 core/google/cloud/future/__init__.py
 create mode 100644 core/google/cloud/future/_helpers.py
 create mode 100644 core/google/cloud/future/base.py
 create mode 100644 core/tests/unit/future/__init__.py
 create mode 100644 core/tests/unit/future/test__helpers.py
 create mode 100644 core/tests/unit/future/test_base.py

diff --git a/core/.coveragerc b/core/.coveragerc
index 9d89b1db56663..ce75f605a508b 100644
--- a/core/.coveragerc
+++ b/core/.coveragerc
@@ -13,3 +13,6 @@ exclude_lines =
     pragma: NO COVER
     # Ignore debug-only repr
     def __repr__
+    # Ignore abstract methods
+    raise NotImplementedError
+    raise NotImplementedError()
diff --git a/core/google/cloud/_helpers.py b/core/google/cloud/_helpers.py
index 2c2f08dcfb458..72918e0645071 100644
--- a/core/google/cloud/_helpers.py
+++ b/core/google/cloud/_helpers.py
@@ -379,6 +379,29 @@ def _bytes_to_unicode(value):
         raise ValueError('%r could not be converted to unicode' % (value,))
 
 
+def _from_any_pb(pb_type, any_pb):
+    """Converts an Any protobuf to the specified message type
+
+    Args:
+        pb_type (type): the type of the message that any_pb stores an instance
+            of.
+        any_pb (google.protobuf.any_pb2.Any): the object to be converted.
+
+    Returns:
+        pb_type: An instance of the pb_type message.
+
+    Raises:
+        TypeError: if the message could not be converted.
+    """
+    msg = pb_type()
+    if not any_pb.Unpack(msg):
+        raise TypeError(
+            'Could not convert {} to {}'.format(
+                any_pb.__class__.__name__, pb_type.__name__))
+
+    return msg
+
+
 def _pb_timestamp_to_datetime(timestamp_pb):
     """Convert a Timestamp protobuf to a datetime object.
 
diff --git a/core/google/cloud/future/__init__.py b/core/google/cloud/future/__init__.py
new file mode 100644
index 0000000000000..e5cf2b20ce7ed
--- /dev/null
+++ b/core/google/cloud/future/__init__.py
@@ -0,0 +1,21 @@
+# Copyright 2017, Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Futures for dealing with asynchronous operations."""
+
+from google.cloud.future.base import Future
+
+__all__ = [
+    'Future',
+]
diff --git a/core/google/cloud/future/_helpers.py b/core/google/cloud/future/_helpers.py
new file mode 100644
index 0000000000000..933d0b8b2d44d
--- /dev/null
+++ b/core/google/cloud/future/_helpers.py
@@ -0,0 +1,39 @@
+# Copyright 2017, Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Private helpers for futures."""
+
+import logging
+import threading
+
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def start_daemon_thread(*args, **kwargs):
+    """Starts a thread and marks it as a daemon thread."""
+    thread = threading.Thread(*args, **kwargs)
+    thread.daemon = True
+    thread.start()
+    return thread
+
+
+def safe_invoke_callback(callback, *args, **kwargs):
+    """Invoke a callback, swallowing and logging any exceptions."""
+    # pylint: disable=bare-except
+    # We intentionally want to swallow all exceptions.
+    try:
+        return callback(*args, **kwargs)
+    except:
+        _LOGGER.exception('Error while executing Future callback.')
diff --git a/core/google/cloud/future/base.py b/core/google/cloud/future/base.py
new file mode 100644
index 0000000000000..928269506b65a
--- /dev/null
+++ b/core/google/cloud/future/base.py
@@ -0,0 +1,175 @@
+# Copyright 2017, Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Abstract and helper bases for Future implementations."""
+
+import abc
+
+import six
+
+from google.cloud.future import _helpers
+
+
+@six.add_metaclass(abc.ABCMeta)
+class Future(object):
+    # pylint: disable=missing-docstring
+    # We inherit the interfaces here from concurrent.futures.
+
+    """Future interface.
+
+    This interface is based on :class:`concurrent.futures.Future`.
+    """
+
+    @abc.abstractmethod
+    def cancel(self):
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def cancelled(self):
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def running(self):
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def done(self):
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def result(self, timeout=None):
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def exception(self, timeout=None):
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def add_done_callback(self, fn):
+        # pylint: disable=invalid-name
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def set_result(self, result):
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def set_exception(self, exception):
+        raise NotImplementedError()
+
+
+class PollingFuture(Future):
+    """A Future that needs to poll some service to check its status.
+
+    The private :meth:`_blocking_poll` method should be implemented by
+    subclasses.
+
+    .. note: Privacy here is intended to prevent the final class from
+    overexposing, not to prevent subclasses from accessing methods.
+    """
+    def __init__(self):
+        super(PollingFuture, self).__init__()
+        self._result = None
+        self._exception = None
+        self._result_set = False
+        """bool: Set to True when the result has been set via set_result or
+        set_exception."""
+        self._polling_thread = None
+        self._done_callbacks = []
+
+    @abc.abstractmethod
+    def _blocking_poll(self, timeout=None):
+        """Poll and wait for the Future to be resolved.
+
+        Args:
+            timeout (int): How long to wait for the operation to complete.
+                If None, wait indefinitely.
+        """
+        # pylint: disable=missing-raises
+        raise NotImplementedError()
+
+    def result(self, timeout=None):
+        """Get the result of the operation, blocking if necessary.
+
+        Args:
+            timeout (int): How long to wait for the operation to complete.
+                If None, wait indefinitely.
+
+        Returns:
+            google.protobuf.Message: The Operation's result.
+
+        Raises:
+            google.gax.GaxError: If the operation errors or if the timeout is
+                reached before the operation completes.
+        """
+        self._blocking_poll()
+
+        if self._exception is not None:
+            # pylint: disable=raising-bad-type
+            # Pylint doesn't recognize that this is valid in this case.
+            raise self._exception
+
+        return self._result
+
+    def exception(self, timeout=None):
+        """Get the exception from the operation, blocking if necessary.
+
+        Args:
+            timeout (int): How long to wait for the operation to complete.
+                If None, wait indefinitely.
+
+        Returns:
+            Optional[google.gax.GaxError]: The operation's error.
+        """
+        self._blocking_poll()
+        return self._exception
+
+    def add_done_callback(self, fn):
+        """Add a callback to be executed when the operation is complete.
+
+        If the operation is not already complete, this will start a helper
+        thread to poll for the status of the operation in the background.
+
+        Args:
+            fn (Callable[Future]): The callback to execute when the operation
+                is complete.
+        """
+        if self._result_set:
+            _helpers.safe_invoke_callback(fn, self)
+            return
+
+        self._done_callbacks.append(fn)
+
+        if self._polling_thread is None:
+            # The polling thread will exit on its own as soon as the operation
+            # is done.
+            self._polling_thread = _helpers.start_daemon_thread(
+                target=self._blocking_poll)
+
+    def _invoke_callbacks(self, *args, **kwargs):
+        """Invoke all done callbacks."""
+        for callback in self._done_callbacks:
+            _helpers.safe_invoke_callback(callback, *args, **kwargs)
+
+    def set_result(self, result):
+        """Set the Future's result."""
+        self._result = result
+        self._result_set = True
+        self._invoke_callbacks(self)
+
+    def set_exception(self, exception):
+        """Set the Future's exception."""
+        self._exception = exception
+        self._result_set = True
+        self._invoke_callbacks(self)
diff --git a/core/tests/unit/future/__init__.py b/core/tests/unit/future/__init__.py
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/core/tests/unit/future/test__helpers.py b/core/tests/unit/future/test__helpers.py
new file mode 100644
index 0000000000000..cbca5ba4d4df8
--- /dev/null
+++ b/core/tests/unit/future/test__helpers.py
@@ -0,0 +1,37 @@
+# Copyright 2017, Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import mock
+
+from google.cloud.future import _helpers
+
+
+@mock.patch('threading.Thread', autospec=True)
+def test_start_deamon_thread(unused_thread):
+    deamon_thread = _helpers.start_daemon_thread(target=mock.sentinel.target)
+    assert deamon_thread.daemon is True
+
+
+def test_safe_invoke_callback():
+    callback = mock.Mock(spec=['__call__'], return_value=42)
+    result = _helpers.safe_invoke_callback(callback, 'a', b='c')
+    assert result == 42
+    callback.assert_called_once_with('a', b='c')
+
+
+def test_safe_invoke_callback_exception():
+    callback = mock.Mock(spec=['__call__'], side_effect=ValueError())
+    result = _helpers.safe_invoke_callback(callback, 'a', b='c')
+    assert result is None
+    callback.assert_called_once_with('a', b='c')
diff --git a/core/tests/unit/future/test_base.py b/core/tests/unit/future/test_base.py
new file mode 100644
index 0000000000000..f10c10b24fb46
--- /dev/null
+++ b/core/tests/unit/future/test_base.py
@@ -0,0 +1,145 @@
+# Copyright 2017, Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import threading
+
+import mock
+import pytest
+
+from google.cloud.future import base
+
+
+class PollingFutureImpl(base.PollingFuture):
+    def _blocking_poll(self, timeout=None):  # pragma: NO COVER
+        pass
+
+    def cancel(self):
+        return True
+
+    def cancelled(self):
+        return False
+
+    def done(self):
+        return False
+
+    def running(self):
+        return True
+
+
+def test_polling_future_constructor():
+    future = PollingFutureImpl()
+    assert not future.done()
+    assert not future.cancelled()
+    assert future.running()
+    assert future.cancel()
+
+
+def test_set_result():
+    future = PollingFutureImpl()
+    callback = mock.Mock()
+
+    future.set_result(1)
+
+    assert future.result() == 1
+    future.add_done_callback(callback)
+    callback.assert_called_once_with(future)
+
+
+def test_set_exception():
+    future = PollingFutureImpl()
+    exception = ValueError('meep')
+
+    future.set_exception(exception)
+
+    assert future.exception() == exception
+    with pytest.raises(ValueError):
+        future.result()
+
+    callback = mock.Mock()
+    future.add_done_callback(callback)
+    callback.assert_called_once_with(future)
+
+
+def test_invoke_callback_exception():
+    future = PollingFutureImplWithPoll()
+    future.set_result(42)
+
+    # This should not raise, despite the callback causing an exception.
+    callback = mock.Mock(side_effect=ValueError)
+    future.add_done_callback(callback)
+    callback.assert_called_once_with(future)
+
+
+class PollingFutureImplWithPoll(PollingFutureImpl):
+    def __init__(self):
+        super(PollingFutureImplWithPoll, self).__init__()
+        self.poll_count = 0
+        self.event = threading.Event()
+
+    def _blocking_poll(self, timeout=None):
+        if self._result_set:
+            return
+
+        self.poll_count += 1
+        self.event.wait()
+        self.set_result(42)
+
+
+def test_result_with_polling():
+    future = PollingFutureImplWithPoll()
+
+    future.event.set()
+    result = future.result()
+
+    assert result == 42
+    assert future.poll_count == 1
+    # Repeated calls should not cause additional polling
+    assert future.result() == result
+    assert future.poll_count == 1
+
+
+def test_callback_background_thread():
+    future = PollingFutureImplWithPoll()
+    callback = mock.Mock()
+
+    future.add_done_callback(callback)
+
+    assert future._polling_thread is not None
+    assert future.poll_count == 1
+
+    future.event.set()
+    future._polling_thread.join()
+
+    callback.assert_called_once_with(future)
+
+
+def test_double_callback_background_thread():
+    future = PollingFutureImplWithPoll()
+    callback = mock.Mock()
+    callback2 = mock.Mock()
+
+    future.add_done_callback(callback)
+    current_thread = future._polling_thread
+    assert current_thread is not None
+
+    # only one polling thread should be created.
+    future.add_done_callback(callback2)
+    assert future._polling_thread is current_thread
+
+    future.event.set()
+    future._polling_thread.join()
+
+    assert future.poll_count == 1
+    callback.assert_called_once_with(future)
+    callback2.assert_called_once_with(future)
diff --git a/core/tests/unit/test__helpers.py b/core/tests/unit/test__helpers.py
index fcd47f7535bc4..f7ba1b2c109fe 100644
--- a/core/tests/unit/test__helpers.py
+++ b/core/tests/unit/test__helpers.py
@@ -554,6 +554,35 @@ def test_it(self):
         self.assertEqual(self._call_fut(timestamp), dt_stamp)
 
 
+class Test__from_any_pb(unittest.TestCase):
+
+    def _call_fut(self, pb_type, any_pb):
+        from google.cloud._helpers import _from_any_pb
+
+        return _from_any_pb(pb_type, any_pb)
+
+    def test_success(self):
+        from google.protobuf import any_pb2
+        from google.type import date_pb2
+
+        in_message = date_pb2.Date(year=1990)
+        in_message_any = any_pb2.Any()
+        in_message_any.Pack(in_message)
+        out_message = self._call_fut(date_pb2.Date, in_message_any)
+        self.assertEqual(in_message, out_message)
+
+    def test_failure(self, ):
+        from google.protobuf import any_pb2
+        from google.type import date_pb2
+        from google.type import timeofday_pb2
+
+        in_message = any_pb2.Any()
+        in_message.Pack(date_pb2.Date(year=1990))
+
+        with self.assertRaises(TypeError):
+            self._call_fut(timeofday_pb2.TimeOfDay, in_message)
+
+
 class Test__pb_timestamp_to_rfc3339(unittest.TestCase):
 
     def _call_fut(self, timestamp):

From ce3046ed3d1261fb37969816d948d675ba6df4ea Mon Sep 17 00:00:00 2001
From: Maerig <maerig@gmail.com>
Date: Tue, 18 Jul 2017 23:28:54 +0900
Subject: [PATCH 085/211] Fix a typo in BigQuery usage documentation (#3621)

---
 docs/bigquery/usage.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/bigquery/usage.rst b/docs/bigquery/usage.rst
index aaa63e91b679c..77252e210ccd8 100644
--- a/docs/bigquery/usage.rst
+++ b/docs/bigquery/usage.rst
@@ -307,7 +307,7 @@ Retrieve the results:
 .. code-block:: python
 
    >>> results = job.results()
-   >>> rows, total_count, token = query.fetch_data()  # API requet
+   >>> rows, total_count, token = query.fetch_data()  # API request
    >>> while True:
    ...     do_something_with(rows)
    ...     if token is None:

From d07365feda335e0e03bfa6ef9ffec16fa89d7145 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Tue, 18 Jul 2017 11:46:05 -0700
Subject: [PATCH 086/211] Using assertEqual instead of assertEquals. (#3619)

`assertEquals` is deprecated (but still is a synonym).
---
 bigquery/tests/unit/test_dbapi_cursor.py     | 70 ++++++++++----------
 logging/tests/unit/handlers/test__helpers.py |  2 +-
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/bigquery/tests/unit/test_dbapi_cursor.py b/bigquery/tests/unit/test_dbapi_cursor.py
index 901d2f176785f..9671a27b8f8f7 100644
--- a/bigquery/tests/unit/test_dbapi_cursor.py
+++ b/bigquery/tests/unit/test_dbapi_cursor.py
@@ -90,7 +90,7 @@ def test_fetchone_w_row(self):
         cursor = connection.cursor()
         cursor.execute('SELECT 1;')
         row = cursor.fetchone()
-        self.assertEquals(row, (1,))
+        self.assertEqual(row, (1,))
         self.assertIsNone(cursor.fetchone())
 
     def test_fetchmany_wo_execute_raises_error(self):
@@ -106,8 +106,8 @@ def test_fetchmany_w_row(self):
         cursor = connection.cursor()
         cursor.execute('SELECT 1;')
         rows = cursor.fetchmany()
-        self.assertEquals(len(rows), 1)
-        self.assertEquals(rows[0], (1,))
+        self.assertEqual(len(rows), 1)
+        self.assertEqual(rows[0], (1,))
 
     def test_fetchmany_w_size(self):
         from google.cloud.bigquery import dbapi
@@ -121,14 +121,14 @@ def test_fetchmany_w_size(self):
         cursor = connection.cursor()
         cursor.execute('SELECT a, b, c;')
         rows = cursor.fetchmany(size=2)
-        self.assertEquals(len(rows), 2)
-        self.assertEquals(rows[0], (1, 2, 3))
-        self.assertEquals(rows[1], (4, 5, 6))
+        self.assertEqual(len(rows), 2)
+        self.assertEqual(rows[0], (1, 2, 3))
+        self.assertEqual(rows[1], (4, 5, 6))
         second_page = cursor.fetchmany(size=2)
-        self.assertEquals(len(second_page), 1)
-        self.assertEquals(second_page[0], (7, 8, 9))
+        self.assertEqual(len(second_page), 1)
+        self.assertEqual(second_page[0], (7, 8, 9))
         third_page = cursor.fetchmany(size=2)
-        self.assertEquals(third_page, [])
+        self.assertEqual(third_page, [])
 
     def test_fetchmany_w_arraysize(self):
         from google.cloud.bigquery import dbapi
@@ -143,14 +143,14 @@ def test_fetchmany_w_arraysize(self):
         cursor.arraysize = 2
         cursor.execute('SELECT a, b, c;')
         rows = cursor.fetchmany()
-        self.assertEquals(len(rows), 2)
-        self.assertEquals(rows[0], (1, 2, 3))
-        self.assertEquals(rows[1], (4, 5, 6))
+        self.assertEqual(len(rows), 2)
+        self.assertEqual(rows[0], (1, 2, 3))
+        self.assertEqual(rows[1], (4, 5, 6))
         second_page = cursor.fetchmany()
-        self.assertEquals(len(second_page), 1)
-        self.assertEquals(second_page[0], (7, 8, 9))
+        self.assertEqual(len(second_page), 1)
+        self.assertEqual(second_page[0], (7, 8, 9))
         third_page = cursor.fetchmany()
-        self.assertEquals(third_page, [])
+        self.assertEqual(third_page, [])
 
     def test_fetchall_wo_execute_raises_error(self):
         from google.cloud.bigquery import dbapi
@@ -165,10 +165,10 @@ def test_fetchall_w_row(self):
         cursor = connection.cursor()
         cursor.execute('SELECT 1;')
         self.assertIsNone(cursor.description)
-        self.assertEquals(cursor.rowcount, 1)
+        self.assertEqual(cursor.rowcount, 1)
         rows = cursor.fetchall()
-        self.assertEquals(len(rows), 1)
-        self.assertEquals(rows[0], (1,))
+        self.assertEqual(len(rows), 1)
+        self.assertEqual(rows[0], (1,))
 
     def test_execute_w_dml(self):
         from google.cloud.bigquery.dbapi import connect
@@ -177,7 +177,7 @@ def test_execute_w_dml(self):
         cursor = connection.cursor()
         cursor.execute('DELETE FROM UserSessions WHERE user_id = \'test\';')
         self.assertIsNone(cursor.description)
-        self.assertEquals(cursor.rowcount, 12)
+        self.assertEqual(cursor.rowcount, 12)
 
     def test_execute_w_query(self):
         from google.cloud.bigquery.schema import SchemaField
@@ -193,29 +193,29 @@ def test_execute_w_query(self):
         cursor.execute('SELECT a, b, c FROM hello_world WHERE d > 3;')
 
         # Verify the description.
-        self.assertEquals(len(cursor.description), 3)
+        self.assertEqual(len(cursor.description), 3)
         a_name, a_type, _, _, _, _, a_null_ok = cursor.description[0]
-        self.assertEquals(a_name, 'a')
-        self.assertEquals(a_type, 'STRING')
-        self.assertEquals(a_type, dbapi.STRING)
+        self.assertEqual(a_name, 'a')
+        self.assertEqual(a_type, 'STRING')
+        self.assertEqual(a_type, dbapi.STRING)
         self.assertTrue(a_null_ok)
         b_name, b_type, _, _, _, _, b_null_ok = cursor.description[1]
-        self.assertEquals(b_name, 'b')
-        self.assertEquals(b_type, 'STRING')
-        self.assertEquals(b_type, dbapi.STRING)
+        self.assertEqual(b_name, 'b')
+        self.assertEqual(b_type, 'STRING')
+        self.assertEqual(b_type, dbapi.STRING)
         self.assertFalse(b_null_ok)
         c_name, c_type, _, _, _, _, c_null_ok = cursor.description[2]
-        self.assertEquals(c_name, 'c')
-        self.assertEquals(c_type, 'INTEGER')
-        self.assertEquals(c_type, dbapi.NUMBER)
+        self.assertEqual(c_name, 'c')
+        self.assertEqual(c_type, 'INTEGER')
+        self.assertEqual(c_type, dbapi.NUMBER)
         self.assertTrue(c_null_ok)
 
         # Verify the results.
-        self.assertEquals(cursor.rowcount, 2)
+        self.assertEqual(cursor.rowcount, 2)
         row = cursor.fetchone()
-        self.assertEquals(row, ('hello', 'world', 1))
+        self.assertEqual(row, ('hello', 'world', 1))
         row = cursor.fetchone()
-        self.assertEquals(row, ('howdy', 'y\'all', 2))
+        self.assertEqual(row, ('howdy', 'y\'all', 2))
         row = cursor.fetchone()
         self.assertIsNone(row)
 
@@ -228,7 +228,7 @@ def test_executemany_w_dml(self):
             'DELETE FROM UserSessions WHERE user_id = %s;',
             (('test',), ('anothertest',)))
         self.assertIsNone(cursor.description)
-        self.assertEquals(cursor.rowcount, 12)
+        self.assertEqual(cursor.rowcount, 12)
 
     def test__format_operation_w_dict(self):
         from google.cloud.bigquery.dbapi import cursor
@@ -238,7 +238,7 @@ def test__format_operation_w_dict(self):
                 'somevalue': 'hi',
                 'a `weird` one': 'world',
             })
-        self.assertEquals(
+        self.assertEqual(
             formatted_operation, 'SELECT @`somevalue`, @`a \\`weird\\` one`;')
 
     def test__format_operation_w_wrong_dict(self):
@@ -257,7 +257,7 @@ def test__format_operation_w_sequence(self):
         from google.cloud.bigquery.dbapi import cursor
         formatted_operation = cursor._format_operation(
             'SELECT %s, %s;', ('hello', 'world'))
-        self.assertEquals(formatted_operation, 'SELECT ?, ?;')
+        self.assertEqual(formatted_operation, 'SELECT ?, ?;')
 
     def test__format_operation_w_too_short_sequence(self):
         from google.cloud.bigquery import dbapi
diff --git a/logging/tests/unit/handlers/test__helpers.py b/logging/tests/unit/handlers/test__helpers.py
index 516cd93fc2d53..f721881eea115 100644
--- a/logging/tests/unit/handlers/test__helpers.py
+++ b/logging/tests/unit/handlers/test__helpers.py
@@ -101,7 +101,7 @@ def test_no_context_header(self):
         response = req.get_response(self.create_app())
         trace_id = json.loads(response.body)
 
-        self.assertEquals(None, trace_id)
+        self.assertEqual(None, trace_id)
 
     def test_valid_context_header(self):
         import webob

From 86c77ef37320c129e96be54864701aea4ed1d371 Mon Sep 17 00:00:00 2001
From: Son CHU <sonlac@users.noreply.github.com>
Date: Tue, 18 Jul 2017 23:16:30 +0200
Subject: [PATCH 087/211] Add `is_nullable` method to check for `NULLABLE` mode
 (#3620)

Resolves: #3548
---
 bigquery/google/cloud/bigquery/dbapi/cursor.py |  2 +-
 bigquery/google/cloud/bigquery/schema.py       |  5 +++++
 bigquery/tests/unit/test_schema.py             | 10 ++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/bigquery/google/cloud/bigquery/dbapi/cursor.py b/bigquery/google/cloud/bigquery/dbapi/cursor.py
index 4398eec20b88c..bcbb19cfd0660 100644
--- a/bigquery/google/cloud/bigquery/dbapi/cursor.py
+++ b/bigquery/google/cloud/bigquery/dbapi/cursor.py
@@ -76,7 +76,7 @@ def _set_description(self, schema):
                 internal_size=None,
                 precision=None,
                 scale=None,
-                null_ok=field.mode == 'NULLABLE')
+                null_ok=field.is_nullable)
             for field in schema])
 
     def _set_rowcount(self, query_results):
diff --git a/bigquery/google/cloud/bigquery/schema.py b/bigquery/google/cloud/bigquery/schema.py
index faec69f616dac..edd8dd68f3bdf 100644
--- a/bigquery/google/cloud/bigquery/schema.py
+++ b/bigquery/google/cloud/bigquery/schema.py
@@ -65,6 +65,11 @@ def mode(self):
         """
         return self._mode
 
+    @property
+    def is_nullable(self):
+        """Check whether 'mode' is 'nullable'."""
+        return self._mode == 'NULLABLE'
+
     @property
     def description(self):
         """Optional[str]: Description for the field."""
diff --git a/bigquery/tests/unit/test_schema.py b/bigquery/tests/unit/test_schema.py
index 018736d31bc16..bf3cf2e025d1c 100644
--- a/bigquery/tests/unit/test_schema.py
+++ b/bigquery/tests/unit/test_schema.py
@@ -74,6 +74,16 @@ def test_mode_property(self):
         schema_field = self._make_one('again', 'FLOAT', mode=mode)
         self.assertIs(schema_field.mode, mode)
 
+    def test_is_nullable(self):
+        mode = 'NULLABLE'
+        schema_field = self._make_one('test', 'FLOAT', mode=mode)
+        self.assertTrue(schema_field.is_nullable)
+
+    def test_is_not_nullable(self):
+        mode = 'REPEATED'
+        schema_field = self._make_one('test', 'FLOAT', mode=mode)
+        self.assertFalse(schema_field.is_nullable)
+
     def test_description_property(self):
         description = 'It holds some data.'
         schema_field = self._make_one(

From 2767aa27b6a2622a8e9e88e83f40106928d2162b Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Tue, 18 Jul 2017 16:43:53 -0700
Subject: [PATCH 088/211] Fix "bad" storage unit tests. (#3627)

These were "broken" by the release of google-resumable-media==0.2.0,
but it just revealed that mocked response content was unicode when
it should have been `bytes`.
---
 storage/tests/unit/test_blob.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/storage/tests/unit/test_blob.py b/storage/tests/unit/test_blob.py
index a5d49bc4bacb6..250a05bd28f41 100644
--- a/storage/tests/unit/test_blob.py
+++ b/storage/tests/unit/test_blob.py
@@ -954,7 +954,8 @@ def _make_resumable_transport(self, headers1, headers2,
             resumable_media.PERMANENT_REDIRECT, headers2)
         json_body = '{{"size": "{:d}"}}'.format(total_bytes)
         fake_response3 = self._mock_requests_response(
-            http_client.OK, headers3, content=json_body)
+            http_client.OK, headers3,
+            content=json_body.encode('utf-8'))
 
         responses = [fake_response1, fake_response2, fake_response3]
         fake_transport.request.side_effect = responses
@@ -1161,7 +1162,7 @@ def test_upload_from_file_failure(self):
         from google.resumable_media import InvalidResponse
         from google.cloud import exceptions
 
-        message = u'Someone is already in this spot.'
+        message = b'Someone is already in this spot.'
         response = mock.Mock(
             content=message, status_code=http_client.CONFLICT,
             spec=[u'content', u'status_code'])
@@ -1170,7 +1171,7 @@ def test_upload_from_file_failure(self):
         with self.assertRaises(exceptions.Conflict) as exc_info:
             self._upload_from_file_helper(side_effect=side_effect)
 
-        self.assertEqual(exc_info.exception.message, message)
+        self.assertEqual(exc_info.exception.message, message.decode('utf-8'))
         self.assertEqual(exc_info.exception.errors, [])
 
     def _do_upload_mock_call_helper(self, blob, client, content_type, size):
@@ -1307,7 +1308,7 @@ def test_create_resumable_upload_session_with_failure(self):
         from google.resumable_media import InvalidResponse
         from google.cloud import exceptions
 
-        message = u'5-oh-3 woe is me.'
+        message = b'5-oh-3 woe is me.'
         response = mock.Mock(
             content=message, status_code=http_client.SERVICE_UNAVAILABLE,
             spec=[u'content', u'status_code'])
@@ -1317,7 +1318,7 @@ def test_create_resumable_upload_session_with_failure(self):
             self._create_resumable_upload_session_helper(
                 side_effect=side_effect)
 
-        self.assertEqual(exc_info.exception.message, message)
+        self.assertEqual(exc_info.exception.message, message.decode('utf-8'))
         self.assertEqual(exc_info.exception.errors, [])
 
     def test_get_iam_policy(self):
@@ -2238,17 +2239,18 @@ def _helper(self, message, **kwargs):
         return exc_info
 
     def test_default(self):
-        message = u'Failure'
+        message = b'Failure'
         exc_info = self._helper(message)
-        self.assertEqual(exc_info.exception.message, message)
+        self.assertEqual(exc_info.exception.message, message.decode('utf-8'))
         self.assertEqual(exc_info.exception.errors, [])
 
     def test_with_error_info(self):
-        message = u'Eeek bad.'
+        message = b'Eeek bad.'
         error_info = 'http://test.invalid'
         exc_info = self._helper(message, error_info=error_info)
 
-        full_message = u'{} ({})'.format(message, error_info)
+        message_str = message.decode('utf-8')
+        full_message = u'{} ({})'.format(message_str, error_info)
         self.assertEqual(exc_info.exception.message, full_message)
         self.assertEqual(exc_info.exception.errors, [])
 

From c5658010e564900c76a6ec83cc0ec47aea857dd4 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Wed, 19 Jul 2017 09:41:18 -0700
Subject: [PATCH 089/211] Add operation future (#3618)

---
 core/google/cloud/future/base.py         |  51 ++++-
 core/google/cloud/future/operation.py    | 247 +++++++++++++++++++++++
 core/setup.py                            |   1 +
 core/tests/unit/future/test_base.py      |  30 ++-
 core/tests/unit/future/test_operation.py | 207 +++++++++++++++++++
 5 files changed, 522 insertions(+), 14 deletions(-)
 create mode 100644 core/google/cloud/future/operation.py
 create mode 100644 core/tests/unit/future/test_operation.py

diff --git a/core/google/cloud/future/base.py b/core/google/cloud/future/base.py
index 928269506b65a..aed1dfd80e5d6 100644
--- a/core/google/cloud/future/base.py
+++ b/core/google/cloud/future/base.py
@@ -15,8 +15,12 @@
 """Abstract and helper bases for Future implementations."""
 
 import abc
+import concurrent.futures
+import functools
+import operator
 
 import six
+import tenacity
 
 from google.cloud.future import _helpers
 
@@ -72,8 +76,8 @@ def set_exception(self, exception):
 class PollingFuture(Future):
     """A Future that needs to poll some service to check its status.
 
-    The private :meth:`_blocking_poll` method should be implemented by
-    subclasses.
+    The :meth:`done` method should be implemented by subclasses. The polling
+    behavior will repeatedly call ``done`` until it returns True.
 
     .. note: Privacy here is intended to prevent the final class from
     overexposing, not to prevent subclasses from accessing methods.
@@ -89,6 +93,19 @@ def __init__(self):
         self._done_callbacks = []
 
     @abc.abstractmethod
+    def done(self):
+        """Checks to see if the operation is complete.
+
+        Returns:
+            bool: True if the operation is complete, False otherwise.
+        """
+        # pylint: disable=redundant-returns-doc, missing-raises-doc
+        raise NotImplementedError()
+
+    def running(self):
+        """True if the operation is currently running."""
+        return not self.done()
+
     def _blocking_poll(self, timeout=None):
         """Poll and wait for the Future to be resolved.
 
@@ -96,8 +113,32 @@ def _blocking_poll(self, timeout=None):
             timeout (int): How long to wait for the operation to complete.
                 If None, wait indefinitely.
         """
-        # pylint: disable=missing-raises
-        raise NotImplementedError()
+        if self._result_set:
+            return
+
+        retry_on = tenacity.retry_if_result(
+            functools.partial(operator.is_not, True))
+        # Use exponential backoff with jitter.
+        wait_on = (
+            tenacity.wait_exponential(multiplier=1, max=10) +
+            tenacity.wait_random(0, 1))
+
+        if timeout is None:
+            retry = tenacity.retry(retry=retry_on, wait=wait_on)
+        else:
+            retry = tenacity.retry(
+                retry=retry_on,
+                wait=wait_on,
+                stop=tenacity.stop_after_delay(timeout))
+
+        try:
+            retry(self.done)()
+        except tenacity.RetryError as exc:
+            six.raise_from(
+                concurrent.futures.TimeoutError(
+                    'Operation did not complete within the designated '
+                    'timeout.'),
+                exc)
 
     def result(self, timeout=None):
         """Get the result of the operation, blocking if necessary.
@@ -113,7 +154,7 @@ def result(self, timeout=None):
             google.gax.GaxError: If the operation errors or if the timeout is
                 reached before the operation completes.
         """
-        self._blocking_poll()
+        self._blocking_poll(timeout=timeout)
 
         if self._exception is not None:
             # pylint: disable=raising-bad-type
diff --git a/core/google/cloud/future/operation.py b/core/google/cloud/future/operation.py
new file mode 100644
index 0000000000000..5bbfda1a8f0b3
--- /dev/null
+++ b/core/google/cloud/future/operation.py
@@ -0,0 +1,247 @@
+# Copyright 2016 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Futures for long-running operations returned from Google Cloud APIs."""
+
+import functools
+import threading
+
+from google.longrunning import operations_pb2
+from google.protobuf import json_format
+from google.rpc import code_pb2
+
+from google.cloud import _helpers
+from google.cloud import exceptions
+from google.cloud.future import base
+
+
+class Operation(base.PollingFuture):
+    """A Future for interacting with a Google API Long-Running Operation.
+
+    Args:
+        operation (google.longrunning.operations_pb2.Operation): The
+            initial operation.
+        refresh (Callable[[], Operation]): A callable that returns the
+            latest state of the operation.
+        cancel (Callable[[], None]), A callable that tries to cancel
+            the operation.
+        result_type (type): The protobuf type for the operation's result.
+        metadata_type (type): The protobuf type for the operation's
+            metadata.
+    """
+
+    def __init__(
+            self, operation, refresh, cancel,
+            result_type, metadata_type=None):
+        super(Operation, self).__init__()
+        self._operation = operation
+        self._refresh = refresh
+        self._cancel = cancel
+        self._result_type = result_type
+        self._metadata_type = metadata_type
+        self._completion_lock = threading.Lock()
+        # Invoke this in case the operation came back already complete.
+        self._set_result_from_operation()
+
+    @property
+    def operation(self):
+        """google.longrunning.Operation: The current long-running operation."""
+        return self._operation
+
+    @property
+    def metadata(self):
+        """google.protobuf.Message: the current operation metadata."""
+        if not self._operation.HasField('metadata'):
+            return None
+
+        return _helpers._from_any_pb(
+            self._metadata_type, self._operation.metadata)
+
+    def _set_result_from_operation(self):
+        """Set the result or exception from the operation if it is complete."""
+        # This must be done in a lock to prevent the polling thread
+        # and main thread from both executing the completion logic
+        # at the same time.
+        with self._completion_lock:
+            # If the operation isn't complete or if the result has already been
+            # set, do not call set_result/set_exception again.
+            # Note: self._result_set is set to True in set_result and
+            # set_exception, in case those methods are invoked directly.
+            if not self._operation.done or self._result_set:
+                return
+
+            if self._operation.HasField('response'):
+                response = _helpers._from_any_pb(
+                    self._result_type, self._operation.response)
+                self.set_result(response)
+            elif self._operation.HasField('error'):
+                exception = exceptions.GoogleCloudError(
+                    self._operation.error.message,
+                    errors=(self._operation.error))
+                self.set_exception(exception)
+            else:
+                exception = exceptions.GoogleCloudError(
+                    'Unexpected state: Long-running operation had neither '
+                    'response nor error set.')
+                self.set_exception(exception)
+
+    def _refresh_and_update(self):
+        """Refresh the operation and update the result if needed."""
+        # If the currently cached operation is done, no need to make another
+        # RPC as it will not change once done.
+        if not self._operation.done:
+            self._operation = self._refresh()
+            self._set_result_from_operation()
+
+    def done(self):
+        """Checks to see if the operation is complete.
+
+        Returns:
+            bool: True if the operation is complete, False otherwise.
+        """
+        self._refresh_and_update()
+        return self._operation.done
+
+    def cancel(self):
+        """Attempt to cancel the operation.
+
+        Returns:
+            bool: True if the cancel RPC was made, False if the operation is
+                already complete.
+        """
+        if self.done():
+            return False
+
+        self._cancel()
+        return True
+
+    def cancelled(self):
+        """True if the operation was cancelled."""
+        self._refresh_and_update()
+        return (self._operation.HasField('error') and
+                self._operation.error.code == code_pb2.CANCELLED)
+
+
+def _refresh_http(api_request, operation_name):
+    """Refresh an operation using a JSON/HTTP client.
+
+    Args:
+        api_request (Callable): A callable used to make an API request. This
+            should generally be
+            :meth:`google.cloud._http.Connection.api_request`.
+        operation_name (str): The name of the operation.
+
+    Returns:
+        google.longrunning.operations_pb2.Operation: The operation.
+    """
+    path = 'operations/{}'.format(operation_name)
+    api_response = api_request(method='GET', path=path)
+    return json_format.ParseDict(
+        api_response, operations_pb2.Operation())
+
+
+def _cancel_http(api_request, operation_name):
+    """Cancel an operation using a JSON/HTTP client.
+
+    Args:
+        api_request (Callable): A callable used to make an API request. This
+            should generally be
+            :meth:`google.cloud._http.Connection.api_request`.
+        operation_name (str): The name of the operation.
+    """
+    path = 'operations/{}:cancel'.format(operation_name)
+    api_request(method='POST', path=path)
+
+
+def from_http_json(operation, api_request, result_type, **kwargs):
+    """Create an operation future from using a HTTP/JSON client.
+
+    This interacts with the long-running operations `service`_ (specific
+    to a given API) vis `HTTP/JSON`_.
+
+    .. _HTTP/JSON: https://cloud.google.com/speech/reference/rest/\
+            v1beta1/operations#Operation
+
+    Args:
+        operation (dict): Operation as a dictionary.
+        api_request (Callable): A callable used to make an API request. This
+            should generally be
+            :meth:`google.cloud._http.Connection.api_request`.
+        result_type (type): The protobuf result type.
+        kwargs: Keyword args passed into the :class:`Operation` constructor.
+
+    Returns:
+        Operation: The operation future to track the given operation.
+    """
+    operation_proto = json_format.ParseDict(
+        operation, operations_pb2.Operation())
+    refresh = functools.partial(
+        _refresh_http, api_request, operation_proto.name)
+    cancel = functools.partial(
+        _cancel_http, api_request, operation_proto.name)
+    return Operation(operation_proto, refresh, cancel, result_type, **kwargs)
+
+
+def _refresh_grpc(operations_stub, operation_name):
+    """Refresh an operation using a gRPC client.
+
+    Args:
+        operations_stub (google.longrunning.operations_pb2.OperationsStub):
+            The gRPC operations stub.
+        operation_name (str): The name of the operation.
+
+    Returns:
+        google.longrunning.operations_pb2.Operation: The operation.
+    """
+    request_pb = operations_pb2.GetOperationRequest(name=operation_name)
+    return operations_stub.GetOperation(request_pb)
+
+
+def _cancel_grpc(operations_stub, operation_name):
+    """Cancel an operation using a gRPC client.
+
+    Args:
+        operations_stub (google.longrunning.operations_pb2.OperationsStub):
+            The gRPC operations stub.
+        operation_name (str): The name of the operation.
+    """
+    request_pb = operations_pb2.CancelOperationRequest(name=operation_name)
+    operations_stub.CancelOperation(request_pb)
+
+
+def from_grpc(operation, operations_stub, result_type, **kwargs):
+    """Create an operation future from using a gRPC client.
+
+    This interacts with the long-running operations `service`_ (specific
+    to a given API) via gRPC.
+
+    .. _service: https://github.com/googleapis/googleapis/blob/\
+                 050400df0fdb16f63b63e9dee53819044bffc857/\
+                 google/longrunning/operations.proto#L38
+
+    Args:
+        operation (google.longrunning.operations_pb2.Operation): The operation.
+        operations_stub (google.longrunning.operations_pb2.OperationsStub):
+            The operations stub.
+        result_type (type): The protobuf result type.
+        kwargs: Keyword args passed into the :class:`Operation` constructor.
+
+    Returns:
+        Operation: The operation future to track the given operation.
+    """
+    refresh = functools.partial(
+        _refresh_grpc, operations_stub, operation.name)
+    cancel = functools.partial(
+        _cancel_grpc, operations_stub, operation.name)
+    return Operation(operation, refresh, cancel, result_type, **kwargs)
diff --git a/core/setup.py b/core/setup.py
index cd461c5f2526d..ba84f2347d188 100644
--- a/core/setup.py
+++ b/core/setup.py
@@ -57,6 +57,7 @@
     'google-auth >= 0.4.0, < 2.0.0dev',
     'google-auth-httplib2',
     'six',
+    'tenacity >= 4.0.0, <5.0.0dev'
 ]
 
 setup(
diff --git a/core/tests/unit/future/test_base.py b/core/tests/unit/future/test_base.py
index f10c10b24fb46..69a0348e68d95 100644
--- a/core/tests/unit/future/test_base.py
+++ b/core/tests/unit/future/test_base.py
@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import concurrent.futures
 import threading
+import time
 
 import mock
 import pytest
@@ -21,8 +23,8 @@
 
 
 class PollingFutureImpl(base.PollingFuture):
-    def _blocking_poll(self, timeout=None):  # pragma: NO COVER
-        pass
+    def done(self):
+        return False
 
     def cancel(self):
         return True
@@ -30,9 +32,6 @@ def cancel(self):
     def cancelled(self):
         return False
 
-    def done(self):
-        return False
-
     def running(self):
         return True
 
@@ -87,13 +86,11 @@ def __init__(self):
         self.poll_count = 0
         self.event = threading.Event()
 
-    def _blocking_poll(self, timeout=None):
-        if self._result_set:
-            return
-
+    def done(self):
         self.poll_count += 1
         self.event.wait()
         self.set_result(42)
+        return True
 
 
 def test_result_with_polling():
@@ -109,6 +106,18 @@ def test_result_with_polling():
     assert future.poll_count == 1
 
 
+class PollingFutureImplTimeout(PollingFutureImplWithPoll):
+    def done(self):
+        time.sleep(1)
+        return False
+
+
+def test_result_timeout():
+    future = PollingFutureImplTimeout()
+    with pytest.raises(concurrent.futures.TimeoutError):
+        future.result(timeout=1)
+
+
 def test_callback_background_thread():
     future = PollingFutureImplWithPoll()
     callback = mock.Mock()
@@ -116,6 +125,9 @@ def test_callback_background_thread():
     future.add_done_callback(callback)
 
     assert future._polling_thread is not None
+
+    # Give the thread a second to poll
+    time.sleep(1)
     assert future.poll_count == 1
 
     future.event.set()
diff --git a/core/tests/unit/future/test_operation.py b/core/tests/unit/future/test_operation.py
new file mode 100644
index 0000000000000..0e29aa687ee6c
--- /dev/null
+++ b/core/tests/unit/future/test_operation.py
@@ -0,0 +1,207 @@
+# Copyright 2017, Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import mock
+
+from google.cloud.future import operation
+from google.longrunning import operations_pb2
+from google.protobuf import struct_pb2
+from google.rpc import code_pb2
+from google.rpc import status_pb2
+
+TEST_OPERATION_NAME = 'test/operation'
+
+
+def make_operation_proto(
+        name=TEST_OPERATION_NAME, metadata=None, response=None,
+        error=None, **kwargs):
+    operation_proto = operations_pb2.Operation(
+        name=name, **kwargs)
+
+    if metadata is not None:
+        operation_proto.metadata.Pack(metadata)
+
+    if response is not None:
+        operation_proto.response.Pack(response)
+
+    if error is not None:
+        operation_proto.error.CopyFrom(error)
+
+    return operation_proto
+
+
+def make_operation_future(client_operations_responses=None):
+    if client_operations_responses is None:
+        client_operations_responses = [make_operation_proto()]
+
+    refresh = mock.Mock(
+        spec=['__call__'], side_effect=client_operations_responses)
+    refresh.responses = client_operations_responses
+    cancel = mock.Mock(spec=['__call__'])
+    operation_future = operation.Operation(
+        client_operations_responses[0],
+        refresh,
+        cancel,
+        result_type=struct_pb2.Struct,
+        metadata_type=struct_pb2.Struct)
+
+    return operation_future, refresh, cancel
+
+
+def test_constructor():
+    future, refresh, cancel = make_operation_future()
+
+    assert future.operation == refresh.responses[0]
+    assert future.operation.done is False
+    assert future.operation.name == TEST_OPERATION_NAME
+    assert future.metadata is None
+    assert future.running()
+
+
+def test_metadata():
+    expected_metadata = struct_pb2.Struct()
+    future, _, _ = make_operation_future(
+        [make_operation_proto(metadata=expected_metadata)])
+
+    assert future.metadata == expected_metadata
+
+
+def test_cancellation():
+    responses = [
+        make_operation_proto(),
+        # Second response indicates that the operation was cancelled.
+        make_operation_proto(
+            done=True,
+            error=status_pb2.Status(code=code_pb2.CANCELLED))]
+    future, _, cancel = make_operation_future(responses)
+
+    assert future.cancel()
+    assert future.cancelled()
+    cancel.assert_called_once_with()
+
+    # Cancelling twice should have no effect.
+    assert not future.cancel()
+    cancel.assert_called_once_with()
+
+
+def test_result():
+    expected_result = struct_pb2.Struct()
+    responses = [
+        make_operation_proto(),
+        # Second operation response includes the result.
+        make_operation_proto(done=True, response=expected_result)]
+    future, _, _ = make_operation_future(responses)
+
+    result = future.result()
+
+    assert result == expected_result
+    assert future.done()
+
+
+def test_exception():
+    expected_exception = status_pb2.Status(message='meep')
+    responses = [
+        make_operation_proto(),
+        # Second operation response includes the error.
+        make_operation_proto(done=True, error=expected_exception)]
+    future, _, _ = make_operation_future(responses)
+
+    exception = future.exception()
+
+    assert expected_exception.message in '{!r}'.format(exception)
+
+
+def test_unexpected_result():
+    responses = [
+        make_operation_proto(),
+        # Second operation response is done, but has not error or response.
+        make_operation_proto(done=True)]
+    future, _, _ = make_operation_future(responses)
+
+    exception = future.exception()
+
+    assert 'Unexpected state' in '{!r}'.format(exception)
+
+
+def test__refresh_http():
+    api_request = mock.Mock(
+        return_value={'name': TEST_OPERATION_NAME, 'done': True})
+
+    result = operation._refresh_http(api_request, TEST_OPERATION_NAME)
+
+    assert result.name == TEST_OPERATION_NAME
+    assert result.done is True
+    api_request.assert_called_once_with(
+        method='GET', path='operations/{}'.format(TEST_OPERATION_NAME))
+
+
+def test__cancel_http():
+    api_request = mock.Mock()
+
+    operation._cancel_http(api_request, TEST_OPERATION_NAME)
+
+    api_request.assert_called_once_with(
+        method='POST', path='operations/{}:cancel'.format(TEST_OPERATION_NAME))
+
+
+def test_from_http_json():
+    operation_json = {'name': TEST_OPERATION_NAME, 'done': True}
+    api_request = mock.sentinel.api_request
+
+    future = operation.from_http_json(
+        operation_json, api_request, struct_pb2.Struct,
+        metadata_type=struct_pb2.Struct)
+
+    assert future._result_type == struct_pb2.Struct
+    assert future._metadata_type == struct_pb2.Struct
+    assert future.operation.name == TEST_OPERATION_NAME
+    assert future.done
+
+
+def test__refresh_grpc():
+    operations_stub = mock.Mock(spec=['GetOperation'])
+    expected_result = make_operation_proto(done=True)
+    operations_stub.GetOperation.return_value = expected_result
+
+    result = operation._refresh_grpc(operations_stub, TEST_OPERATION_NAME)
+
+    assert result == expected_result
+    expected_request = operations_pb2.GetOperationRequest(
+        name=TEST_OPERATION_NAME)
+    operations_stub.GetOperation.assert_called_once_with(expected_request)
+
+
+def test__cancel_grpc():
+    operations_stub = mock.Mock(spec=['CancelOperation'])
+
+    operation._cancel_grpc(operations_stub, TEST_OPERATION_NAME)
+
+    expected_request = operations_pb2.CancelOperationRequest(
+        name=TEST_OPERATION_NAME)
+    operations_stub.CancelOperation.assert_called_once_with(expected_request)
+
+
+def test_from_grpc():
+    operation_proto = make_operation_proto(done=True)
+    operations_stub = mock.sentinel.operations_stub
+
+    future = operation.from_grpc(
+        operation_proto, operations_stub, struct_pb2.Struct,
+        metadata_type=struct_pb2.Struct)
+
+    assert future._result_type == struct_pb2.Struct
+    assert future._metadata_type == struct_pb2.Struct
+    assert future.operation.name == TEST_OPERATION_NAME
+    assert future.done

From 827b41a0071e8c4d19761d212531697337b43a23 Mon Sep 17 00:00:00 2001
From: florencep <florenceperot@google.com>
Date: Wed, 19 Jul 2017 10:34:54 -0700
Subject: [PATCH 090/211] update the documentation link (#3630)

due to the change of the Python Client library doc link
---
 translate/README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/translate/README.rst b/translate/README.rst
index a85374ff52981..47ecc3b553d27 100644
--- a/translate/README.rst
+++ b/translate/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Translation
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/translate-usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/translate/usage.html
 
 Quick Start
 -----------

From 34bf003053425e3baa7865bdb46f86bb4404a5d0 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Wed, 19 Jul 2017 14:44:52 -0700
Subject: [PATCH 091/211] Using assertIs in unit tests where appropriate.
 (#3629)

* Using assertIs in unit tests where appropriate.

Any usage of `self.assertTrue(a is b)` has become
`self.assertIs(a, b)`.

* Converting some assertFalse(a is b) to assertIsNot(a, b).
---
 spanner/tests/unit/test__helpers.py    |  2 +-
 spanner/tests/unit/test_batch.py       |  4 +--
 spanner/tests/unit/test_client.py      | 16 ++++++------
 spanner/tests/unit/test_database.py    | 36 +++++++++++++-------------
 spanner/tests/unit/test_instance.py    | 16 ++++++------
 spanner/tests/unit/test_session.py     | 14 +++++-----
 spanner/tests/unit/test_snapshot.py    | 12 ++++-----
 spanner/tests/unit/test_streamed.py    |  8 +++---
 spanner/tests/unit/test_transaction.py |  2 +-
 speech/tests/unit/test_client.py       |  4 +--
 10 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/spanner/tests/unit/test__helpers.py b/spanner/tests/unit/test__helpers.py
index 172c3343cba0b..beb5ed7b6bace 100644
--- a/spanner/tests/unit/test__helpers.py
+++ b/spanner/tests/unit/test__helpers.py
@@ -512,7 +512,7 @@ def _make_one(self, session):
     def test_ctor(self):
         session = object()
         base = self._make_one(session)
-        self.assertTrue(base._session is session)
+        self.assertIs(base._session, session)
 
 
 class Test_options_with_prefix(unittest.TestCase):
diff --git a/spanner/tests/unit/test_batch.py b/spanner/tests/unit/test_batch.py
index ad4cbc872a1ea..cf65fdd7e4f52 100644
--- a/spanner/tests/unit/test_batch.py
+++ b/spanner/tests/unit/test_batch.py
@@ -65,7 +65,7 @@ def _compare_values(self, result, source):
     def test_ctor(self):
         session = _Session()
         base = self._make_one(session)
-        self.assertTrue(base._session is session)
+        self.assertIs(base._session, session)
         self.assertEqual(len(base._mutations), 0)
 
     def test__check_state_virtual(self):
@@ -177,7 +177,7 @@ def _getTargetClass(self):
     def test_ctor(self):
         session = _Session()
         batch = self._make_one(session)
-        self.assertTrue(batch._session is session)
+        self.assertIs(batch._session, session)
 
     def test_commit_already_committed(self):
         from google.cloud.spanner.keyset import KeySet
diff --git a/spanner/tests/unit/test_client.py b/spanner/tests/unit/test_client.py
index 98e916d8927df..c71429c225352 100644
--- a/spanner/tests/unit/test_client.py
+++ b/spanner/tests/unit/test_client.py
@@ -60,7 +60,7 @@ def _constructor_test_helper(self, expected_scopes, creds,
         expected_creds = expected_creds or creds.with_scopes.return_value
         self.assertIs(client._credentials, expected_creds)
 
-        self.assertTrue(client._credentials is expected_creds)
+        self.assertIs(client._credentials, expected_creds)
         if expected_scopes is not None:
             creds.with_scopes.assert_called_once_with(expected_scopes)
 
@@ -162,7 +162,7 @@ def __init__(self, *args, **kwargs):
 
         self.assertTrue(isinstance(api, _Client))
         again = client.instance_admin_api
-        self.assertTrue(again is api)
+        self.assertIs(again, api)
         self.assertEqual(api.kwargs['lib_name'], 'gccl')
         self.assertIs(api.kwargs['credentials'], client.credentials)
 
@@ -183,7 +183,7 @@ def __init__(self, *args, **kwargs):
 
         self.assertTrue(isinstance(api, _Client))
         again = client.database_admin_api
-        self.assertTrue(again is api)
+        self.assertIs(again, api)
         self.assertEqual(api.kwargs['lib_name'], 'gccl')
         self.assertIs(api.kwargs['credentials'], client.credentials)
 
@@ -202,7 +202,7 @@ def test_copy(self):
     def test_credentials_property(self):
         credentials = _Credentials()
         client = self._make_one(project=self.PROJECT, credentials=credentials)
-        self.assertTrue(client.credentials is credentials)
+        self.assertIs(client.credentials, credentials)
 
     def test_project_name_property(self):
         credentials = _Credentials()
@@ -236,7 +236,7 @@ def test_list_instance_configs_wo_paging(self):
         project, page_size, options = api._listed_instance_configs
         self.assertEqual(project, self.PATH)
         self.assertEqual(page_size, None)
-        self.assertTrue(options.page_token is INITIAL_PAGE)
+        self.assertIs(options.page_token, INITIAL_PAGE)
         self.assertEqual(
             options.kwargs['metadata'],
             [('google-cloud-resource-prefix', client.project_name)])
@@ -292,7 +292,7 @@ def test_instance_factory_defaults(self):
         self.assertIsNone(instance.configuration_name)
         self.assertEqual(instance.display_name, self.INSTANCE_ID)
         self.assertEqual(instance.node_count, DEFAULT_NODE_COUNT)
-        self.assertTrue(instance._client is client)
+        self.assertIs(instance._client, client)
 
     def test_instance_factory_explicit(self):
         from google.cloud.spanner.instance import Instance
@@ -309,7 +309,7 @@ def test_instance_factory_explicit(self):
         self.assertEqual(instance.configuration_name, self.CONFIGURATION_NAME)
         self.assertEqual(instance.display_name, self.DISPLAY_NAME)
         self.assertEqual(instance.node_count, self.NODE_COUNT)
-        self.assertTrue(instance._client is client)
+        self.assertIs(instance._client, client)
 
     def test_list_instances_wo_paging(self):
         from google.cloud._testing import _GAXPageIterator
@@ -342,7 +342,7 @@ def test_list_instances_wo_paging(self):
         self.assertEqual(project, self.PATH)
         self.assertEqual(filter_, 'name:TEST')
         self.assertEqual(page_size, None)
-        self.assertTrue(options.page_token is INITIAL_PAGE)
+        self.assertIs(options.page_token, INITIAL_PAGE)
         self.assertEqual(
             options.kwargs['metadata'],
             [('google-cloud-resource-prefix', client.project_name)])
diff --git a/spanner/tests/unit/test_database.py b/spanner/tests/unit/test_database.py
index 5369a6f2c0d19..5200a0ab7d1b0 100644
--- a/spanner/tests/unit/test_database.py
+++ b/spanner/tests/unit/test_database.py
@@ -50,7 +50,7 @@ def test_ctor_defaults(self):
         database = self._make_one(self.DATABASE_ID, instance)
 
         self.assertEqual(database.database_id, self.DATABASE_ID)
-        self.assertTrue(database._instance is instance)
+        self.assertIs(database._instance, instance)
         self.assertEqual(list(database.ddl_statements), [])
         self.assertIsInstance(database._pool, BurstyPool)
         # BurstyPool does not create sessions during 'bind()'.
@@ -61,7 +61,7 @@ def test_ctor_w_explicit_pool(self):
         pool = _Pool()
         database = self._make_one(self.DATABASE_ID, instance, pool=pool)
         self.assertEqual(database.database_id, self.DATABASE_ID)
-        self.assertTrue(database._instance is instance)
+        self.assertIs(database._instance, instance)
         self.assertEqual(list(database.ddl_statements), [])
         self.assertIs(database._pool, pool)
         self.assertIs(pool._bound, database)
@@ -89,7 +89,7 @@ def test_ctor_w_ddl_statements_ok(self):
             self.DATABASE_ID, instance, ddl_statements=DDL_STATEMENTS,
             pool=pool)
         self.assertEqual(database.database_id, self.DATABASE_ID)
-        self.assertTrue(database._instance is instance)
+        self.assertIs(database._instance, instance)
         self.assertEqual(list(database.ddl_statements), DDL_STATEMENTS)
 
     def test_from_pb_bad_database_name(self):
@@ -196,10 +196,10 @@ def _mock_spanner_client(*args, **kwargs):
 
         with _Monkey(MUT, SpannerClient=_mock_spanner_client):
             api = database.spanner_api
-            self.assertTrue(api is _client)
+            self.assertIs(api,  _client)
             # API instance is cached
             again = database.spanner_api
-            self.assertTrue(again is api)
+            self.assertIs(again, api)
 
     def test___eq__(self):
         instance = _Instance(self.INSTANCE_NAME)
@@ -567,8 +567,8 @@ def test_session_factory(self):
         session = database.session()
 
         self.assertTrue(isinstance(session, Session))
-        self.assertTrue(session.session_id is None)
-        self.assertTrue(session._database is database)
+        self.assertIs(session.session_id, None)
+        self.assertIs(session._database, database)
 
     def test_execute_sql_defaults(self):
         QUERY = 'SELECT * FROM employees'
@@ -671,7 +671,7 @@ def test_batch(self):
 
         checkout = database.batch()
         self.assertIsInstance(checkout, BatchCheckout)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
 
     def test_snapshot_defaults(self):
         from google.cloud.spanner.database import SnapshotCheckout
@@ -685,7 +685,7 @@ def test_snapshot_defaults(self):
 
         checkout = database.snapshot()
         self.assertIsInstance(checkout, SnapshotCheckout)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertIsNone(checkout._read_timestamp)
         self.assertIsNone(checkout._min_read_timestamp)
         self.assertIsNone(checkout._max_staleness)
@@ -707,7 +707,7 @@ def test_snapshot_w_read_timestamp(self):
         checkout = database.snapshot(read_timestamp=now)
 
         self.assertIsInstance(checkout, SnapshotCheckout)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertEqual(checkout._read_timestamp, now)
         self.assertIsNone(checkout._min_read_timestamp)
         self.assertIsNone(checkout._max_staleness)
@@ -729,7 +729,7 @@ def test_snapshot_w_min_read_timestamp(self):
         checkout = database.snapshot(min_read_timestamp=now)
 
         self.assertIsInstance(checkout, SnapshotCheckout)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertIsNone(checkout._read_timestamp)
         self.assertEqual(checkout._min_read_timestamp, now)
         self.assertIsNone(checkout._max_staleness)
@@ -750,7 +750,7 @@ def test_snapshot_w_max_staleness(self):
         checkout = database.snapshot(max_staleness=staleness)
 
         self.assertIsInstance(checkout, SnapshotCheckout)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertIsNone(checkout._read_timestamp)
         self.assertIsNone(checkout._min_read_timestamp)
         self.assertEqual(checkout._max_staleness, staleness)
@@ -771,7 +771,7 @@ def test_snapshot_w_exact_staleness(self):
         checkout = database.snapshot(exact_staleness=staleness)
 
         self.assertIsInstance(checkout, SnapshotCheckout)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertIsNone(checkout._read_timestamp)
         self.assertIsNone(checkout._min_read_timestamp)
         self.assertIsNone(checkout._max_staleness)
@@ -788,7 +788,7 @@ def _getTargetClass(self):
     def test_ctor(self):
         database = _Database(self.DATABASE_NAME)
         checkout = self._make_one(database)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
 
     def test_context_mgr_success(self):
         import datetime
@@ -865,7 +865,7 @@ def test_ctor_defaults(self):
         pool.put(session)
 
         checkout = self._make_one(database)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertIsNone(checkout._read_timestamp)
         self.assertIsNone(checkout._min_read_timestamp)
         self.assertIsNone(checkout._max_staleness)
@@ -891,7 +891,7 @@ def test_ctor_w_read_timestamp(self):
         pool.put(session)
 
         checkout = self._make_one(database, read_timestamp=now)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertEqual(checkout._read_timestamp, now)
         self.assertIsNone(checkout._min_read_timestamp)
         self.assertIsNone(checkout._max_staleness)
@@ -918,7 +918,7 @@ def test_ctor_w_min_read_timestamp(self):
         pool.put(session)
 
         checkout = self._make_one(database, min_read_timestamp=now)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertIsNone(checkout._read_timestamp)
         self.assertEqual(checkout._min_read_timestamp, now)
         self.assertIsNone(checkout._max_staleness)
@@ -944,7 +944,7 @@ def test_ctor_w_max_staleness(self):
         pool.put(session)
 
         checkout = self._make_one(database, max_staleness=staleness)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertIsNone(checkout._read_timestamp)
         self.assertIsNone(checkout._min_read_timestamp)
         self.assertEqual(checkout._max_staleness, staleness)
diff --git a/spanner/tests/unit/test_instance.py b/spanner/tests/unit/test_instance.py
index b556a0396f015..d86c611b3ccba 100644
--- a/spanner/tests/unit/test_instance.py
+++ b/spanner/tests/unit/test_instance.py
@@ -50,8 +50,8 @@ def test_constructor_defaults(self):
         client = object()
         instance = self._make_one(self.INSTANCE_ID, client)
         self.assertEqual(instance.instance_id, self.INSTANCE_ID)
-        self.assertTrue(instance._client is client)
-        self.assertTrue(instance.configuration_name is None)
+        self.assertIs(instance._client, client)
+        self.assertIs(instance.configuration_name, None)
         self.assertEqual(instance.node_count, DEFAULT_NODE_COUNT)
         self.assertEqual(instance.display_name, self.INSTANCE_ID)
 
@@ -64,7 +64,7 @@ def test_constructor_non_default(self):
                                   node_count=self.NODE_COUNT,
                                   display_name=DISPLAY_NAME)
         self.assertEqual(instance.instance_id, self.INSTANCE_ID)
-        self.assertTrue(instance._client is client)
+        self.assertIs(instance._client, client)
         self.assertEqual(instance.configuration_name, self.CONFIG_NAME)
         self.assertEqual(instance.node_count, self.NODE_COUNT)
         self.assertEqual(instance.display_name, DISPLAY_NAME)
@@ -78,10 +78,10 @@ def test_copy(self):
         new_instance = instance.copy()
 
         # Make sure the client copy succeeded.
-        self.assertFalse(new_instance._client is client)
+        self.assertIsNot(new_instance._client, client)
         self.assertEqual(new_instance._client, client)
         # Make sure the client got copied to a new instance.
-        self.assertFalse(instance is new_instance)
+        self.assertIsNot(instance, new_instance)
         self.assertEqual(instance, new_instance)
 
     def test__update_from_pb_success(self):
@@ -496,7 +496,7 @@ def test_database_factory_defaults(self):
 
         self.assertTrue(isinstance(database, Database))
         self.assertEqual(database.database_id, DATABASE_ID)
-        self.assertTrue(database._instance is instance)
+        self.assertIs(database._instance, instance)
         self.assertEqual(list(database.ddl_statements), [])
         self.assertIsInstance(database._pool, BurstyPool)
         pool = database._pool
@@ -516,7 +516,7 @@ def test_database_factory_explicit(self):
 
         self.assertTrue(isinstance(database, Database))
         self.assertEqual(database.database_id, DATABASE_ID)
-        self.assertTrue(database._instance is instance)
+        self.assertIs(database._instance, instance)
         self.assertEqual(list(database.ddl_statements), DDL_STATEMENTS)
         self.assertIs(database._pool, pool)
         self.assertIs(pool._bound, database)
@@ -547,7 +547,7 @@ def test_list_databases_wo_paging(self):
         instance_name, page_size, options = api._listed_databases
         self.assertEqual(instance_name, self.INSTANCE_NAME)
         self.assertEqual(page_size, None)
-        self.assertTrue(options.page_token is INITIAL_PAGE)
+        self.assertIs(options.page_token, INITIAL_PAGE)
         self.assertEqual(options.kwargs['metadata'],
                          [('google-cloud-resource-prefix', instance.name)])
 
diff --git a/spanner/tests/unit/test_session.py b/spanner/tests/unit/test_session.py
index 5f75d471a7cf9..ce9f81eccc7a5 100644
--- a/spanner/tests/unit/test_session.py
+++ b/spanner/tests/unit/test_session.py
@@ -39,8 +39,8 @@ def _make_one(self, *args, **kwargs):
     def test_constructor(self):
         database = _Database(self.DATABASE_NAME)
         session = self._make_one(database)
-        self.assertTrue(session.session_id is None)
-        self.assertTrue(session._database is database)
+        self.assertIs(session.session_id, None)
+        self.assertIs(session._database, database)
 
     def test___lt___(self):
         database = _Database(self.DATABASE_NAME)
@@ -223,7 +223,7 @@ def test_snapshot_created(self):
         snapshot = session.snapshot()
 
         self.assertIsInstance(snapshot, Snapshot)
-        self.assertTrue(snapshot._session is session)
+        self.assertIs(snapshot._session, session)
         self.assertTrue(snapshot._strong)
 
     def test_read_not_created(self):
@@ -352,7 +352,7 @@ def test_batch_created(self):
         batch = session.batch()
 
         self.assertIsInstance(batch, Batch)
-        self.assertTrue(batch._session is session)
+        self.assertIs(batch._session, session)
 
     def test_transaction_not_created(self):
         database = _Database(self.DATABASE_NAME)
@@ -371,8 +371,8 @@ def test_transaction_created(self):
         transaction = session.transaction()
 
         self.assertIsInstance(transaction, Transaction)
-        self.assertTrue(transaction._session is session)
-        self.assertTrue(session._transaction is transaction)
+        self.assertIs(transaction._session, session)
+        self.assertIs(session._transaction, transaction)
 
     def test_transaction_w_existing_txn(self):
         database = _Database(self.DATABASE_NAME)
@@ -382,7 +382,7 @@ def test_transaction_w_existing_txn(self):
         existing = session.transaction()
         another = session.transaction()  # invalidates existing txn
 
-        self.assertTrue(session._transaction is another)
+        self.assertIs(session._transaction, another)
         self.assertTrue(existing._rolled_back)
 
     def test_retry_transaction_w_commit_error_txn_already_begun(self):
diff --git a/spanner/tests/unit/test_snapshot.py b/spanner/tests/unit/test_snapshot.py
index cf1abce94f45f..c5213dbd6cdad 100644
--- a/spanner/tests/unit/test_snapshot.py
+++ b/spanner/tests/unit/test_snapshot.py
@@ -66,7 +66,7 @@ def _make_txn_selector(self):
     def test_ctor(self):
         session = _Session()
         base = self._make_one(session)
-        self.assertTrue(base._session is session)
+        self.assertIs(base._session, session)
 
     def test__make_txn_selector_virtual(self):
         session = _Session()
@@ -320,7 +320,7 @@ def _makeDuration(self, seconds=1, microseconds=0):
     def test_ctor_defaults(self):
         session = _Session()
         snapshot = self._make_one(session)
-        self.assertTrue(snapshot._session is session)
+        self.assertIs(snapshot._session, session)
         self.assertTrue(snapshot._strong)
         self.assertIsNone(snapshot._read_timestamp)
         self.assertIsNone(snapshot._min_read_timestamp)
@@ -340,7 +340,7 @@ def test_ctor_w_read_timestamp(self):
         timestamp = self._makeTimestamp()
         session = _Session()
         snapshot = self._make_one(session, read_timestamp=timestamp)
-        self.assertTrue(snapshot._session is session)
+        self.assertIs(snapshot._session, session)
         self.assertFalse(snapshot._strong)
         self.assertEqual(snapshot._read_timestamp, timestamp)
         self.assertIsNone(snapshot._min_read_timestamp)
@@ -351,7 +351,7 @@ def test_ctor_w_min_read_timestamp(self):
         timestamp = self._makeTimestamp()
         session = _Session()
         snapshot = self._make_one(session, min_read_timestamp=timestamp)
-        self.assertTrue(snapshot._session is session)
+        self.assertIs(snapshot._session, session)
         self.assertFalse(snapshot._strong)
         self.assertIsNone(snapshot._read_timestamp)
         self.assertEqual(snapshot._min_read_timestamp, timestamp)
@@ -362,7 +362,7 @@ def test_ctor_w_max_staleness(self):
         duration = self._makeDuration()
         session = _Session()
         snapshot = self._make_one(session, max_staleness=duration)
-        self.assertTrue(snapshot._session is session)
+        self.assertIs(snapshot._session, session)
         self.assertFalse(snapshot._strong)
         self.assertIsNone(snapshot._read_timestamp)
         self.assertIsNone(snapshot._min_read_timestamp)
@@ -373,7 +373,7 @@ def test_ctor_w_exact_staleness(self):
         duration = self._makeDuration()
         session = _Session()
         snapshot = self._make_one(session, exact_staleness=duration)
-        self.assertTrue(snapshot._session is session)
+        self.assertIs(snapshot._session, session)
         self.assertFalse(snapshot._strong)
         self.assertIsNone(snapshot._read_timestamp)
         self.assertIsNone(snapshot._min_read_timestamp)
diff --git a/spanner/tests/unit/test_streamed.py b/spanner/tests/unit/test_streamed.py
index 3300e4048cc7d..edcace273f660 100644
--- a/spanner/tests/unit/test_streamed.py
+++ b/spanner/tests/unit/test_streamed.py
@@ -561,7 +561,7 @@ def test_consume_next_first_set_partial(self):
         streamed.consume_next()
         self.assertEqual(streamed.rows, [])
         self.assertEqual(streamed._current_row, BARE)
-        self.assertTrue(streamed.metadata is metadata)
+        self.assertIs(streamed.metadata, metadata)
         self.assertEqual(streamed.resume_token, result_set.resume_token)
 
     def test_consume_next_w_partial_result(self):
@@ -630,7 +630,7 @@ def test_consume_next_last_set(self):
         streamed.consume_next()
         self.assertEqual(streamed.rows, [BARE])
         self.assertEqual(streamed._current_row, [])
-        self.assertTrue(streamed._stats is stats)
+        self.assertIs(streamed._stats, stats)
         self.assertEqual(streamed.resume_token, result_set.resume_token)
 
     def test_consume_all_empty(self):
@@ -653,7 +653,7 @@ def test_consume_all_one_result_set_partial(self):
         streamed.consume_all()
         self.assertEqual(streamed.rows, [])
         self.assertEqual(streamed._current_row, BARE)
-        self.assertTrue(streamed.metadata is metadata)
+        self.assertIs(streamed.metadata, metadata)
 
     def test_consume_all_multiple_result_sets_filled(self):
         FIELDS = [
@@ -703,7 +703,7 @@ def test___iter___one_result_set_partial(self):
         self.assertEqual(found, [])
         self.assertEqual(streamed.rows, [])
         self.assertEqual(streamed._current_row, BARE)
-        self.assertTrue(streamed.metadata is metadata)
+        self.assertIs(streamed.metadata, metadata)
 
     def test___iter___multiple_result_sets_filled(self):
         FIELDS = [
diff --git a/spanner/tests/unit/test_transaction.py b/spanner/tests/unit/test_transaction.py
index bdb8d20b8f017..997f4d5153c84 100644
--- a/spanner/tests/unit/test_transaction.py
+++ b/spanner/tests/unit/test_transaction.py
@@ -48,7 +48,7 @@ def _make_one(self, *args, **kwargs):
     def test_ctor_defaults(self):
         session = _Session()
         transaction = self._make_one(session)
-        self.assertTrue(transaction._session is session)
+        self.assertIs(transaction._session, session)
         self.assertIsNone(transaction._id)
         self.assertIsNone(transaction.committed)
         self.assertEqual(transaction._rolled_back, False)
diff --git a/speech/tests/unit/test_client.py b/speech/tests/unit/test_client.py
index 259df66b0a3d2..b66d3080e0663 100644
--- a/speech/tests/unit/test_client.py
+++ b/speech/tests/unit/test_client.py
@@ -88,8 +88,8 @@ def test_ctor(self):
         creds = _make_credentials()
         http = object()
         client = self._make_one(credentials=creds, _http=http)
-        self.assertTrue(client._credentials is creds)
-        self.assertTrue(client._http is http)
+        self.assertIs(client._credentials, creds)
+        self.assertIs(client._http, http)
 
     def test_ctor_use_grpc_preset(self):
         creds = _make_credentials()

From ada1cc30cf3a8bd043cb1d1e9d71855047f38dbc Mon Sep 17 00:00:00 2001
From: florencep <florenceperot@google.com>
Date: Wed, 19 Jul 2017 14:58:03 -0700
Subject: [PATCH 092/211] update documentation link (#3633)

since it moved to a new URL https://googlecloudplatform.github.io/google-cloud-python/stable/speech/usage.html
---
 speech/README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/speech/README.rst b/speech/README.rst
index aeec14e484a37..663555b52db37 100644
--- a/speech/README.rst
+++ b/speech/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Speech
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/speech-usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/speech/usage.html
 
 Quick Start
 -----------

From 3d9461b91963fcc6e6a864f6f0eacad3d92bbf2d Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Wed, 19 Jul 2017 14:58:17 -0700
Subject: [PATCH 093/211] Fixing references to "dead" docs links. (#3631)

* Fixing references to "dead" docs links.

Done via:

$ git grep -l 'google-cloud-auth.html' | \
> xargs sed -i s/'google-cloud-auth.html'/'core\/auth.html'/g
$ git grep -l 'http\:\/\/google-cloud-python.readthedocs.io' | \
> xargs sed -i s/'http\:\/\/google-cloud-python.readthedocs.io'/\
> 'https\:\/\/google-cloud-python.readthedocs.io'/g

Fixes #3531.

* Fixing up other docs that were moved in #3459.
---
 bigquery/README.rst                    | 4 ++--
 bigtable/README.rst                    | 4 ++--
 core/README.rst                        | 2 +-
 core/google/cloud/credentials.py       | 2 +-
 datastore/README.rst                   | 6 +++---
 dns/README.rst                         | 4 ++--
 error_reporting/README.rst             | 4 ++--
 language/README.rst                    | 4 ++--
 logging/README.rst                     | 6 +++---
 monitoring/README.rst                  | 6 +++---
 pubsub/README.rst                      | 6 +++---
 resource_manager/README.rst            | 6 +++---
 runtimeconfig/README.rst               | 2 +-
 spanner/README.rst                     | 2 +-
 speech/README.rst                      | 4 ++--
 storage/README.rst                     | 6 +++---
 storage/google/cloud/storage/bucket.py | 2 +-
 translate/README.rst                   | 2 +-
 videointelligence/README.rst           | 6 +-----
 vision/README.rst                      | 4 ++--
 20 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/bigquery/README.rst b/bigquery/README.rst
index 97a94366a49a7..bf5bc55f1fa43 100644
--- a/bigquery/README.rst
+++ b/bigquery/README.rst
@@ -26,7 +26,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API
@@ -86,7 +86,7 @@ Perform a synchronous query
 See the ``google-cloud-python`` API `BigQuery documentation`_ to learn how
 to connect to BigQuery using this Client Library.
 
-.. _BigQuery documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/bigquery-usage.html
+.. _BigQuery documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/bigquery/usage.html
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-bigquery.svg
    :target: https://pypi.python.org/pypi/google-cloud-bigquery
diff --git a/bigtable/README.rst b/bigtable/README.rst
index 3b37f5ec6880e..3385b882c28ff 100644
--- a/bigtable/README.rst
+++ b/bigtable/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Bigtable
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/bigtable-usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/bigtable/usage.html
 
 Quick Start
 -----------
@@ -26,7 +26,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API
diff --git a/core/README.rst b/core/README.rst
index 5088505addc7a..e9e7e19278ced 100644
--- a/core/README.rst
+++ b/core/README.rst
@@ -9,7 +9,7 @@ used by all of the ``google-cloud-*``.
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/google-cloud-api.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/core/modules.html
 
 Quick Start
 -----------
diff --git a/core/google/cloud/credentials.py b/core/google/cloud/credentials.py
index 6a1bf512f7a99..e5fe30245ea59 100644
--- a/core/google/cloud/credentials.py
+++ b/core/google/cloud/credentials.py
@@ -60,7 +60,7 @@ def _get_signed_query_params(credentials, expiration, string_to_sign):
               signed payload.
     """
     if not isinstance(credentials, google.auth.credentials.Signing):
-        auth_uri = ('http://google-cloud-python.readthedocs.io/en/latest/'
+        auth_uri = ('https://google-cloud-python.readthedocs.io/en/latest/'
                     'core/auth.html?highlight=authentication#setting-up-'
                     'a-service-account')
         raise AttributeError('you need a private key to sign credentials.'
diff --git a/datastore/README.rst b/datastore/README.rst
index d913abc7821f9..dbfc252564ead 100644
--- a/datastore/README.rst
+++ b/datastore/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Datastore
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/datastore-client.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/datastore/client.html
 
 Quick Start
 -----------
@@ -26,7 +26,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API
@@ -44,7 +44,7 @@ queries, and eventual consistency for all other queries.
 See the ``google-cloud-python`` API `datastore documentation`_ to learn how to
 interact with the Cloud Datastore using this Client Library.
 
-.. _datastore documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/datastore-client.html
+.. _datastore documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/datastore/client.html
 
 See the `official Google Cloud Datastore documentation`_ for more details on
 how to activate Cloud Datastore for your project.
diff --git a/dns/README.rst b/dns/README.rst
index 2e290780b3edb..7f46dce1d617c 100644
--- a/dns/README.rst
+++ b/dns/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud DNS
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/dns-usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/dns/usage.html
 
 Quick Start
 -----------
@@ -26,7 +26,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API
diff --git a/error_reporting/README.rst b/error_reporting/README.rst
index e968d42754bfe..69308b1ce0e2b 100644
--- a/error_reporting/README.rst
+++ b/error_reporting/README.rst
@@ -9,7 +9,7 @@ Python Client for Stackdriver Error Reporting
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/error-reporting-usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/error-reporting/usage.html
 
 Quick Start
 -----------
@@ -26,7 +26,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API
diff --git a/language/README.rst b/language/README.rst
index 5d09b6de0dc6a..8685c89253131 100644
--- a/language/README.rst
+++ b/language/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Natural Language
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/language-usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/language/usage.html
 
 Quick Start
 -----------
@@ -28,7 +28,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API
diff --git a/logging/README.rst b/logging/README.rst
index 5df19dd1f79a4..a706b50079acf 100644
--- a/logging/README.rst
+++ b/logging/README.rst
@@ -9,7 +9,7 @@ Python Client for Stackdriver Logging
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/logging-usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/logging/usage.html
 
 Quick Start
 -----------
@@ -26,7 +26,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API
@@ -54,7 +54,7 @@ Example of fetching entries:
 See the ``google-cloud-python`` API `logging documentation`_ to learn how to
 connect to Stackdriver Logging using this Client Library.
 
-.. _logging documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/logging-usage.html
+.. _logging documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/logging/usage.html
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-logging.svg
    :target: https://pypi.python.org/pypi/google-cloud-logging
diff --git a/monitoring/README.rst b/monitoring/README.rst
index 6c4889fb39251..4debab64a3eab 100644
--- a/monitoring/README.rst
+++ b/monitoring/README.rst
@@ -9,7 +9,7 @@ Python Client for Stackdriver Monitoring
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/monitoring-usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/monitoring/usage.html
 
 Quick Start
 -----------
@@ -26,7 +26,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API
@@ -64,7 +64,7 @@ Display CPU utilization across your GCE instances during the last five minutes:
 See the ``google-cloud-python`` API `monitoring documentation`_ to learn how
 to connect to Stackdriver Monitoring using this Client Library.
 
-.. _monitoring documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/monitoring-usage.html
+.. _monitoring documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/monitoring/usage.html
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-monitoring.svg
    :target: https://pypi.python.org/pypi/google-cloud-monitoring
diff --git a/pubsub/README.rst b/pubsub/README.rst
index 6bf9d77ee82e5..472b74eb1bf05 100644
--- a/pubsub/README.rst
+++ b/pubsub/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Pub / Sub
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/pubsub-usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/pubsub/usage.html
 
 Quick Start
 -----------
@@ -26,7 +26,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API
@@ -45,7 +45,7 @@ independently written applications.
 See the ``google-cloud-python`` API `Pub/Sub documentation`_ to learn how to connect
 to Cloud Pub/Sub using this Client Library.
 
-.. _Pub/Sub documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/pubsub-usage.html
+.. _Pub/Sub documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/pubsub/usage.html
 
 To get started with this API, you'll need to create
 
diff --git a/resource_manager/README.rst b/resource_manager/README.rst
index 6d74826902735..f0e67ca4750ef 100644
--- a/resource_manager/README.rst
+++ b/resource_manager/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Resource Manager
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/resource-manager-api.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/resource-manager/api.html
 
 Quick Start
 -----------
@@ -26,7 +26,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API
@@ -42,7 +42,7 @@ Google Cloud Platform.
 See the ``google-cloud-python`` API `Resource Manager documentation`_ to learn
 how to manage projects using this Client Library.
 
-.. _Resource Manager documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/resource-manager-api.html
+.. _Resource Manager documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/resource-manager/api.html
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-resource-manager.svg
    :target: https://pypi.python.org/pypi/google-cloud-resource-manager
diff --git a/runtimeconfig/README.rst b/runtimeconfig/README.rst
index dcf71476fd41b..b8d79b3fd3d35 100644
--- a/runtimeconfig/README.rst
+++ b/runtimeconfig/README.rst
@@ -30,7 +30,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API
diff --git a/spanner/README.rst b/spanner/README.rst
index fedabfb50fef3..1580c27a71a0f 100644
--- a/spanner/README.rst
+++ b/spanner/README.rst
@@ -3,7 +3,7 @@ Python Client for Cloud Spanner
 
     Python idiomatic client for `Cloud Spanner`_.
 
-.. _Cloud Spanner: https://googlecloudplatform.github.io/google-cloud-python/latest/spanner-usage.html
+.. _Cloud Spanner: https://googlecloudplatform.github.io/google-cloud-python/latest/spanner/usage.html
 
 
 Quick Start
diff --git a/speech/README.rst b/speech/README.rst
index 663555b52db37..ce67559f09e7a 100644
--- a/speech/README.rst
+++ b/speech/README.rst
@@ -26,7 +26,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API
@@ -41,7 +41,7 @@ and receive a text transcription from the Cloud Speech API service.
 See the ``google-cloud-python`` API `speech documentation`_ to learn how to
 connect to the Google Cloud Speech API using this Client Library.
 
-.. _speech documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/speech-usage.html
+.. _speech documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/speech/usage.html
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-speech.svg
    :target: https://pypi.python.org/pypi/google-cloud-speech
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-speech.svg
diff --git a/storage/README.rst b/storage/README.rst
index 6d55686be9d04..553c377a2be3b 100644
--- a/storage/README.rst
+++ b/storage/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Storage
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/storage-client.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/storage/client.html
 
 Quick Start
 -----------
@@ -26,7 +26,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API
@@ -43,7 +43,7 @@ via direct download.
 See the ``google-cloud-python`` API `storage documentation`_ to learn how to
 connect to Cloud Storage using this Client Library.
 
-.. _storage documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/storage-client.html
+.. _storage documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/storage/client.html
 
 You need to create a Google Cloud Storage bucket to use this client library.
 Follow along with the `official Google Cloud Storage documentation`_ to learn
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index 895a6e38473fe..02fa076e9e60c 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -1015,7 +1015,7 @@ def generate_upload_policy(
         credentials = client._base_connection.credentials
 
         if not isinstance(credentials, google.auth.credentials.Signing):
-            auth_uri = ('http://google-cloud-python.readthedocs.io/en/latest/'
+            auth_uri = ('https://google-cloud-python.readthedocs.io/en/latest/'
                         'core/auth.html?highlight=authentication#setting-up-'
                         'a-service-account')
             raise AttributeError(
diff --git a/translate/README.rst b/translate/README.rst
index 47ecc3b553d27..7e56d081cf467 100644
--- a/translate/README.rst
+++ b/translate/README.rst
@@ -26,7 +26,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API
diff --git a/videointelligence/README.rst b/videointelligence/README.rst
index d3741cd88fc1f..e294919b77bef 100644
--- a/videointelligence/README.rst
+++ b/videointelligence/README.rst
@@ -7,10 +7,6 @@ Python Client for Google Cloud Video Intelligence
 
 |pypi| |versions|
 
--  `Documentation`_
-
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/video-intelligence-usage.html
-
 Quick Start
 -----------
 
@@ -26,7 +22,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API
diff --git a/vision/README.rst b/vision/README.rst
index f8b5adc2a0b9c..0056d714dd5c7 100644
--- a/vision/README.rst
+++ b/vision/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Vision
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/vision-usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/vision/usage.html
 
 Quick Start
 -----------
@@ -26,7 +26,7 @@ possible. Check out the `Authentication section`_ in our documentation to
 learn more. You may also find the `authentication document`_ shared by all
 the ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Using the API

From ffd7cca2c1bbcf71b753913eab4d95ec0ca04f8a Mon Sep 17 00:00:00 2001
From: Till Hoffmann <tillahoffmann@gmail.com>
Date: Thu, 20 Jul 2017 00:23:45 +0100
Subject: [PATCH 094/211] Add keyword arguments to
 google.cloud.storage.Bucket.get_blob. (#3613)

---
 storage/google/cloud/storage/blob.py   |  2 +-
 storage/google/cloud/storage/bucket.py | 20 +++++++++++++++++---
 storage/tests/unit/test_bucket.py      | 23 +++++++++++++++++++++++
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index de59fdf1f2bde..7d967a3e4901d 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -113,7 +113,7 @@ class Blob(_PropertyMixin):
     :type encryption_key: bytes
     :param encryption_key:
         Optional 32 byte encryption key for customer-supplied encryption.
-        See https://cloud.google.com/storage/docs/encryption#customer-supplied
+        See https://cloud.google.com/storage/docs/encryption#customer-supplied.
     """
 
     _chunk_size = None  # Default value for each instance.
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index 02fa076e9e60c..35ba593374902 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -34,6 +34,7 @@
 from google.cloud.storage.acl import BucketACL
 from google.cloud.storage.acl import DefaultObjectACL
 from google.cloud.storage.blob import Blob
+from google.cloud.storage.blob import _get_encryption_headers
 
 
 def _blobs_page_start(iterator, page, response):
@@ -228,7 +229,7 @@ def path(self):
 
         return self.path_helper(self.name)
 
-    def get_blob(self, blob_name, client=None):
+    def get_blob(self, blob_name, client=None, encryption_key=None, **kwargs):
         """Get a blob object by name.
 
         This will return None if the blob doesn't exist:
@@ -245,14 +246,27 @@ def get_blob(self, blob_name, client=None):
         :param client: Optional. The client to use.  If not passed, falls back
                        to the ``client`` stored on the current bucket.
 
+        :type encryption_key: bytes
+        :param encryption_key:
+            Optional 32 byte encryption key for customer-supplied encryption.
+            See
+            https://cloud.google.com/storage/docs/encryption#customer-supplied.
+
+        :type kwargs: dict
+        :param kwargs: Keyword arguments to pass to the
+                       :class:`~google.cloud.storage.blob.Blob` constructor.
+
         :rtype: :class:`google.cloud.storage.blob.Blob` or None
         :returns: The blob object if it exists, otherwise None.
         """
         client = self._require_client(client)
-        blob = Blob(bucket=self, name=blob_name)
+        blob = Blob(bucket=self, name=blob_name, encryption_key=encryption_key,
+                    **kwargs)
         try:
+            headers = _get_encryption_headers(encryption_key)
             response = client._connection.api_request(
-                method='GET', path=blob.path, _target_object=blob)
+                method='GET', path=blob.path, _target_object=blob,
+                headers=headers)
             # NOTE: We assume response.get('name') matches `blob_name`.
             blob._set_properties(response)
             # NOTE: This will not fail immediately in a batch. However, when
diff --git a/storage/tests/unit/test_bucket.py b/storage/tests/unit/test_bucket.py
index 5e4a915751977..0df94dc5db3de 100644
--- a/storage/tests/unit/test_bucket.py
+++ b/storage/tests/unit/test_bucket.py
@@ -245,6 +245,29 @@ def test_get_blob_hit(self):
         self.assertEqual(kw['method'], 'GET')
         self.assertEqual(kw['path'], '/b/%s/o/%s' % (NAME, BLOB_NAME))
 
+    def test_get_blob_hit_with_kwargs(self):
+        from google.cloud.storage.blob import _get_encryption_headers
+
+        NAME = 'name'
+        BLOB_NAME = 'blob-name'
+        CHUNK_SIZE = 1024 * 1024
+        KEY = b'01234567890123456789012345678901'  # 32 bytes
+
+        connection = _Connection({'name': BLOB_NAME})
+        client = _Client(connection)
+        bucket = self._make_one(name=NAME)
+        blob = bucket.get_blob(
+            BLOB_NAME, client=client, encryption_key=KEY, chunk_size=CHUNK_SIZE
+        )
+        self.assertIs(blob.bucket, bucket)
+        self.assertEqual(blob.name, BLOB_NAME)
+        kw, = connection._requested
+        self.assertEqual(kw['method'], 'GET')
+        self.assertEqual(kw['path'], '/b/%s/o/%s' % (NAME, BLOB_NAME))
+        self.assertEqual(kw['headers'], _get_encryption_headers(KEY))
+        self.assertEqual(blob.chunk_size, CHUNK_SIZE)
+        self.assertEqual(blob._encryption_key, KEY)
+
     def test_list_blobs_defaults(self):
         NAME = 'name'
         connection = _Connection({'items': []})

From c262dbb709b67075236cc927b796ab4930e73ee7 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Thu, 20 Jul 2017 09:07:02 -0700
Subject: [PATCH 095/211] Removing JSON docs and unused images. (#3640)

---
 docs/_static/images/gcp-logo-32x32.png | Bin 1977 -> 0 bytes
 docs/_static/images/gcp-logo.png       | Bin 2334 -> 0 bytes
 docs/json/json/home.html               | 127 -------
 docs/json/json/master/index.json       |  10 -
 docs/json/json/master/overview.html    |  46 ---
 docs/json/json/master/toc.json         | 451 -------------------------
 docs/json/manifest.json                |  20 --
 7 files changed, 654 deletions(-)
 delete mode 100644 docs/_static/images/gcp-logo-32x32.png
 delete mode 100644 docs/_static/images/gcp-logo.png
 delete mode 100644 docs/json/json/home.html
 delete mode 100644 docs/json/json/master/index.json
 delete mode 100644 docs/json/json/master/overview.html
 delete mode 100644 docs/json/json/master/toc.json
 delete mode 100644 docs/json/manifest.json

diff --git a/docs/_static/images/gcp-logo-32x32.png b/docs/_static/images/gcp-logo-32x32.png
deleted file mode 100644
index 1dcafb042990c31f255a7a5a0cfdcdd388ed0e3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1977
zcmZ8hc}$yS7=ODX%uTaQ6K6D<88vYx&MBj%lny8@J%A22%-m+w;g!Wd=CycV)2Ykb
z`+#<ovqoSC$QXse1{+5Q1qPKBD0JMEjoMOrfnZmk_v@y{U-I>Rj^A^>-`A5_V*Udg
zAKi!$dO#@P?uBz3c{Z#?h!$&X%tC05D=Q<1*HUHj{kf7Y^-ovCMY`#2@jINCg&u#n
z?%BueT*eJvoZIcrz&?k=@oN5JxR>Ygc)~rL0WKZv)>OKM%buK^tljyvd(j)Q3hwmr
zTrOAhUeUtB!j0rukb%Ey;bok>4d~~@&Cky-o4Nay9)AZP0^5>fs~ftjdGvwA_-RXL
z*C$6qE%b25v#y0d=UhH3gI-5}Zlz;qpphPIOZA!$&5yUw*?v8E?DU9$74GKQIP`Eg
z-|2LAC%t6l(xKdvnPX0+AJj~?vSVj2iMGE!SlhV}n>#pXzkWGkSKQ&Axv9ySp}r;#
zW1{`aK#9Kn$l?A2ycIj!W%;C!vCCBvXED7ptKMaQH*UWw0Aq?Ji&?V38~OgftclC*
zN%r)lRf}kJbhMrQ{C=4SmT*wzoo|f0CS<+z-i%8B^Y0VB*{R{ds!ESF<yJ55#>Z2S
zTy^$x8_pdW{XTZ+#}}?-Z~soBG#ZcPDEz|DhSR^B3U_fbesCU8`<FVB_sRaq#@=Of
z()jqeO`HtdgH7&{1ta~UNG~tam$pw4%m%ejFr3Cr$3a^fGg}eNkc1XI?twI>chPGX
zBo1-o?c8{=B;*hzMy_+bzThCAWlc*6_!h?J{PQ#RNPp(dH0Iler7VdzSHHCA^F^%u
zP!p>!Eulxi5=mEr!JyCYTWCtU#!u|wGHpBtU*cYFVcUd>{y;$d(;pcpZi|jPg<nrM
zWoAZf!c}up;38{Oz`9+-?B_AZjP%ZwxIp+$C=_~G84{oLge@uV3+yprq9c`I<;L1i
zz1U3Oz7q0go^S<B3AfHNQ+^1heR}h+&g8|~gdEih`{+<)fVa}dp5n9GQW;G<wh1K5
zcUHZT5w>~I$Na)GGT~tyn@j$5#!*q)cxb;>wEN4-fV#o|j?Vq<udc%STkhGJdB@0D
zeeHl&Zawi$9XGYSMOO{q0PW+w;(aLDIs6V$a?|--^z-`11)$vbzTm(|2yJ?ZJT!F5
z@CX=VJ{D&3VkXwbY-T)sQ}7jhKkN8HZc0x47Fy!EwpE03&j3q_8_{NrbO^~ywFp&$
z?J@>UiY$7RT-pT`q)<wVG;kieaTei$VuVyIjBuSAOfuPEeIemgR-Pg0kRwki$tS|4
z8yIhejO8sDAzT0%6Hb9(szAF{_$iAHTu9C;Ej5ueZ^|w*3?vHBt$-8~Nj{YY^wW8o
zqWt`PO+!Ni<+t1BFvhhQcQqD3FGyN0!cYRCv$(6eZvwiLmSYU7Kp4MJUB&@HE-!%)
zjCI*YE%|35eakvJhSsjv8=jzagi1<ETB{Bi3h(JK5t->s?p;4}C=^O)jM@ZcQ$!mr
z($qvLYx1a0HJ9%;ifpHcsj{@jMwlO=qs=`tROfg@0c9w^d7En8f@!}MPat$v`qd1!
z5Guw~Mi@>?MuFQPhJD6@jp#|K^c5;(6UKFVvO1MYig6R#hVh3+Z4wwZ%jF+XWp$HU
zLLlSIV@d%zdi8^pVT(*w0@JTG8=?eiAM&=*U53Ia0ii7=CA}AS8r0O~QbF+ZngWog
zBx?W^<!kQ0=ZT(&iJuTCKOtxi|Cez;tSC<*DT4dd5Y*JvOi%wO$MH+2*C-X~Gr!zL
zm&<Gg-0KN_)6#6~(cGe@i~i^W;(~&LGIq4e?%6#p&6m=N>-<v)rC31F1?zxOKsE#0
zE1wm$ED}F?KLDGEy!2ajUvcr<usSJV)(NIl)Y1uq%CW;_)E8Gkm8*pDVhk|O6DPr0
zP`WmljM}mZqF#jyk<v>^4x%D-9z@z!lU}QBj~alXQc*eJWgyX5N84c1m#HhFeuU1!
zjmhbx3V}|iqiwC$Yyb5lG)5Tfc3uPg4)|idS*up}--{>b7`);#nf$_q3)im?eWumd
z8w&r)ALX5+7_!!?w!wq-^>Eey^CR@uNNel(Mex7cIoa9SNj@bCWzVQSFMRlljVMB%
Km|Mkp<M`js(~a@~

diff --git a/docs/_static/images/gcp-logo.png b/docs/_static/images/gcp-logo.png
deleted file mode 100644
index eb7f9d405fdce799c05f73ec81f6610ee2348392..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2334
zcmV+(3E}pMP)<h;3K|Lk000e1NJLTq002Dz001@!0{{R3LwjKu0008+P)t-s0002L
zuD0^|`caMZ<ES<N%QnL}F6O;S?(_Y%C>z;CH`GNn?d|PMi}Kvu++3IO{mn)0?(Y4}
zLeoSx?d|Q+LpI7pJ>lWuvoIv>@$moANdC`7>+9>jQcCad@6<pu>+9?8?(X}_MNEn5
z>FMdvLN)5@>iEV)SCQ`X#Yf@c;ln^Puei&vMK;qsIOEF5$#-w|zc&5FDC_U}=j-y(
zH#W64D*DAR^tv|n!$a`KTk7A$=hdcKb*kD(JN?T=)j~G?%SYzs=F2}a(L^@u>+AQ%
zLdHWjT9o0!Ju~IJN-1B~v&io=V%F!`&b>M`HDS!>;^E}i&$~i5;Kabwpqa#JVbEDc
z`q@3}%6HE<H0!7}%C=bLlQh|9HCK}K(?m8-jPX#8^kA3s{Lwu4#6Q_fKl{o`+uPg3
zJuO#`?(OaET9WYUx;4j1J2GqJl9`Co;PU0-*w(J8?$JT$&5O&6f<tM+=FLR7t!dkX
zGuMVMz)>lIjFF?GbySe^NqN{yf#UtiLQI6_S(Eek#XwVz>`{yG_{Klq-`~|vK<@7D
z@9*zVj`jc0O8?D8|IbEKko8fH_5aUE*hV=^i}lq;IZ=@HOpNyL?(Ne?Iq>oD*+@Ls
zL^#<*I8KcA+(<nC&O-3=_0~r_(MCG-^6%g0^XlZ;|Ikg{Mmc4i_fU-RVwv~x^78-D
zNA|lr&qg}TNIOc6`t|ko^7HcVyFbTAJj_Hn)kQZ)jP3ZpJ=IA(^YrvihwMy+=}Lm;
zNq*zIO-=vRN&Ch>^tn6RNIU7VInYHp-lI0iK{fRK{`U6vRgv~iiSGT%LG83X-bp;%
zLpRYxGufIkzBVcP_V7)G>-4rd=&U(Gg!M*v-TcTv@v}NqlKMSw*Z<Q+`olfqM?1qq
zH@hw%NR0UY`|$tTJ;v7ZIeYHf;O;kd=RkPm+^C_tTUXIaK76V4leqI{nC*b3>z%jg
z?d9a^+}hr^v(uH2(S?7tL_@e=+Y$f(0E~1}PE!B|{{H^{{V4tY_U-58EGO;a-?g+_
zJUIUR`}Xzq^WV;(m64B&cU@LIBqR+C{`~y>{QLX+`}+C#_xAPj=ElXju%K>RNGuo^
z4F3K6`}_I$`1tqt_xJbq^z!lV?cdSJuC1!2oNZM}NJTps{QLX*_xJYo_4D%Z@bK^M
z?(OQ*(7BR?cy)DXNFF&_A-n(p1ye~xK~zY`g_UPm(_j>ZBOneG#l835d+)vX-h1!8
z_ZBOKwn77HEh>lwYN4Q1MFf$lD2k{c0`9%_pC`$eq<j{9fAa7?=jNW9l%Xg!_d*^n
zS~Is4Qy`6ICZ13#l_!9^yZbRKJU!KF&yq_Dl1t6ZP$nulVDm`!sZ;PTl`JTIUq)i0
zXv?x}dtR!Wzr1W`hA7*%G5fOo<U(^YAj&pm+E!nhQz*Zc*(X}bwrx*!Bir(z*%<}P
zun|6ckWKr5z2qu^y8vZ_gEreL>27~QK#6|_o}$2K^5o{`+HS3`eL#SqE7fXZi>Pze
z*Dg!gXl+T!fTRF>cc4_CSl#X%#hVX*ZirN`K+DbcCS6TJIA^C1dvTT~{(VmDJwkZd
z=5$-v9$w{iPQDPrx>9%<EFT;rd^xmQt#5g%t=-o+9pSKFJ)mXib}cIzBRDh~jrXj<
zc~=&B{W^4nE7LzcK=i-Fx2p6pB0|rjs&6e9+4WA;)#-0YG#&n<!^n@`9D2QXkAYSP
zK5x~^$B}~l`tu9PU_&fcD~SJ9Y(>Or*x>X6`P>IoS=T+2*OSr%DxW2)#pG4OrJ8Gk
zfrMMUs;8QX9#i~?C=coB_j2>7$B~iOA6|Vuj6}00mwJnwohu&hQzL=s@jr9SW^X~i
z+e>V1p`V}Mr0&DH@Yi3?vVzR^aVC$osFsQR&8}6d+30;Y2AsazkF2Z=?5Js@xY^&5
zwpc^GW{gOaS_x!vBVa>64W9RC%5c<)Qb2#XeQ0Ln+plEbrgD%aDwYT#i~F5pGzJrW
z0RtLW4OA!;eo>n?W@f%SN204$WUOgmVEJ&<_v|=hu%M?DuYkwu9R(Ts%N@gqej_VO
z=tBx2IF~R8v*X-h`$9)}*+NXiDv0L5;vR>bB|SHwzIf$Kt~>_IL`T@X?(bioDGix~
zPZJNE_3F>$rFMdJ?v7!wwK1?$dPp|(!d;90-yW9=8}FGnY$r^v5YcsMXCP(gJ9*{m
z#MY=Vxv(`7-lkhov9SEMHollS41;U*dJVQl8YAJIN1qWQYEX@lm&G!=gQGFlR|{L?
zgU0x4@$e9zd~#bM++zD$>{=l@n2W~XeaWRl2hcq_c0EI$yq-M!(OM?y`;r~ztJOo+
z#MEp`-jYCthk&AR7ZT1IYBwSBQph}P<q4_gV69e<WR<F)^oAmw=pDtyu@;wlOPe%t
z?q9ox)Ye+e&5w<_@rDuxR8@$2a_4H8ohQUp!^Ne9YXVDTOSQ47VX;Vt98-L;T<82K
zH!-};`l77-WeUOTL1Ztx4TvUlV`VZ$N(Z_Lc<5TMLAZ=8kLiGwX@E)<<1~=5V!xY+
z0<E$Cx?Zk!6LQS4T3%M2tj}1pd=J729dYioi|BEcvV-{x#oW}d0nS~Ty)Zd<*##^P
z+~~`@KC0s7nY;|?{Y(nSxu2oIfn(pWA^YQ3kfL#EIlS|T^E6||;=scN*$D?uQwQOq
z-rC_d;XYxTB&$-eG8&wF;BgUM)-9e#4v!qbZHKLnvDmkd4=0lYr#Pf@lXSNyq2La<
z^$0jPwZOW=A)h>Xk{me2@}AF*%X)IC?BCkbUZV{cWdB}LTU2XR-K_NESAwELqeGv9
zsZK34qD-}A{X<N`NjmiCw6v#BJI!dXfeRTnK1VWiYgT&lP3Z80rcMcm&C66<RBMv0
z(<MK7l6560C_0UcCdn!OR9jSQ&vXRXH*dmDYdw7mT*%;g&4Ek-3@9VIoSbz9dZ&pk
zR6ahOo03v<F)dK(^RuAwB1|kTX!^*wxa>HdzVw~^1*Og>30nkO{r~^~07*qoM6N<$
Ef*892)&Kwi

diff --git a/docs/json/json/home.html b/docs/json/json/home.html
deleted file mode 100644
index 7626254683404..0000000000000
--- a/docs/json/json/home.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<section class="hero-banner">
-  <div class="container clearfix">
-    <div class="quote-box">
-      <h1>google-cloud-python</h1>
-      <p>Google Cloud Client Library for Python
-      - an idiomatic, intuitive, and natural way for Python developers to
-      integrate with Google Cloud Platform services, like Cloud Datastore
-      and Cloud Storage.</p>
-    </div>
-
-    <div class="quote-box--supplementary">
-      <pre class="skip-highlight"><code class="subtle--blue">$</code> pip install <code class="subtle--blue">--upgrade</code> <strong>google-cloud</strong></pre>
-      <h4 class="latest-release subtle" ng-if="home.latestRelease">
-        Latest Release <a ng-href="{{home.latestRelease.link}}" class="latest-release--link white">{{home.latestRelease.name}}</a>
-        {{home.latestRelease.date|date}}
-      </h4>
-    </div>
-  </div><!-- end of .container -->
-</section><!-- end of .hero-banner -->
-
-<section class="block featuring">
-  <div class="container">
-    <ul class="featuring-links">
-      <li>
-        <a href="#/docs/{{home.latestRelease.name}}/google-cloud" title="google-cloud-python docs" class="btn btn-docs">
-          <img src="src/images/icon-lang-python-gray.svg" alt="Python icon" />
-          Read the Docs
-        </a>
-      </li>
-      <li>
-        <a href="/GoogleCloudPlatform/google-cloud-python" title="google-cloud-python on GitHub" class="ext-link">
-          <img src="src/images/icon-link-github.svg" alt="GitHub icon" />
-          GitHub
-        </a>
-      </li>
-      <li>
-        <a href="/GoogleCloudPlatform/google-cloud-python/issues" title="google-cloud-python issues on Github" class="ext-link">
-          <img src="src/images/icon-link-github.svg" alt="GitHub icon" />
-          Issues
-        </a>
-      </li>
-      <li>
-        <a href="http://stackoverflow.com/questions/tagged/google-cloud-python" title="google-cloud-python on StackOverflow" class="ext-link">
-          <img src="src/images/icon-link-stackoverflow.svg" alt="StackOverflow icon" />
-          StackOverflow
-        </a>
-      </li>
-      <li>
-        <a href="https://pypi.python.org/pypi/google-cloud" title="google-cloud-python on pypi" class="ext-link">
-          <img src="src/images/icon-link-package-manager.svg" alt="pypi icon" />
-          PyPI
-        </a>
-      </li>
-    </ul>
-  </div><!-- end of .container -->
-</section><!-- end of .featuring -->
-
-<section class="block about">
-  <div class="container clearfix">
-    <div class="quote-box">
-      <h3 class="block-title">What is it?</h3>
-
-      <p><code>google-cloud-python</code> is a client library for accessing Google
-      Cloud Platform services that significantly reduces the boilerplate
-      code you have to write. The library provides high-level API
-      abstractions so they're easier to understand. It embraces
-      idioms of Python, works well with the standard library, and
-      integrates better with your codebase.
-      All this means you spend more time creating code that matters
-      to you.</p>
-
-      <p><code>google-cloud-python</code> is configured to access Google Cloud Platform
-      services and authorize (OAuth 2.0) automatically on your behalf.
-      With a one-line install and a private key, you are up and ready
-      to go. Better yet, if you are running on a Google Compute Engine
-      instance, the one-line install is enough!</p>
-
-    </div>
-
-    <div class="quote-box--supplementary">
-      <h4>Retrieve Datastore Entities</h4>
-      <pre><code class="hljs python">from google.cloud import datastore
-
-client = datastore.Client()
-product_key = client.key('Product', 123)
-print(client.get(product_key))</code></pre>
-    </div>
-  </div><!-- end of .container -->
-</section><!-- end of .featuring -->
-
-<section class="block examples">
-  <div class="container clearfix">
-    <h3 class="block-title">Examples</h3>
-
-    <ul>
-      <li>
-        <a href="/GoogleCloudPlatform/google-cloud-python-expenses-demo"><code>google-cloud-python-expenses-demo</code></a> - Use google-cloud-python with the Datastore and Cloud Storage to manage expenses
-      </li>
-    </ul>
-  </div>
-</section>
-
- <section class="block">
-    <div class="container clearfix">
-    <h3 class="block-title">FAQ</h3>
-
-    <h4>What is the relationship between the <code>google-cloud-python</code> package
-    and the <code>google-cloud</code> command-line tool?</h4>
-    <p>Both the <code>google-cloud</code> command-line tool and
-    <code>google-cloud-python</code> package are a part of the Google Cloud SDK: a collection
-    of tools and libraries that enable you to easily create and manage
-    resources on the Google Cloud Platform. The <code>google-cloud</code> command-line
-    tool can be used to manage both your development workflow and your
-    Google Cloud Platform resources while the <code>google-cloud-python</code> package is the
-    Google Cloud Client Library for Python.</p>
-
-    <h4>What is the relationship between <code>google-cloud-python</code>
-    and the Google APIs Python Client?</h4>
-    <p>The <a href="/google/google-api-python-client">
-    Google APIs Python Client</a> is a client library for
-    using the broad set of Google APIs.
-    <code>google-cloud-python</code> is built specifically for the Google Cloud Platform
-    and is the recommended way to integrate Google Cloud APIs into your
-    Python applications. If your application requires both Google Cloud Platform and
-    other Google APIs, the 2 libraries may be used by your application.</p>
-    </div>
-</section> <!-- end of FAQ -->
diff --git a/docs/json/json/master/index.json b/docs/json/json/master/index.json
deleted file mode 100644
index 1526595856f18..0000000000000
--- a/docs/json/json/master/index.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "description": "<div class=\"section\"><h2><code>google-cloud-python</code></h2><p>Google Cloud API access in idiomatic Python.</p></div>",
-  "examples": [
-    "import google.cloud"
-  ],
-  "id": "google.cloud.__init__",
-  "methods": [],
-  "name": "__Init__",
-  "source": "/google/cloud/__init__.py"
-}
diff --git a/docs/json/json/master/overview.html b/docs/json/json/master/overview.html
deleted file mode 100644
index 08d4b32fabe7a..0000000000000
--- a/docs/json/json/master/overview.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<h2>Getting started</h2>
-
-<p>
-The <code>google-cloud</code> library is <code>pip</code> install-able:
-</p>
-
-<div hljs>
-    $ pip install google-cloud
-</div>
-
-<hr>
-
-<h3>Cloud Datastore</h3>
-
-<p>
-<a href="https://developers.google.com/datastore/">Google Cloud Datastore</a> is a fully managed,
- schemaless database for storing non-relational data.
-</p>
-
-<div hljs>
-
-  from google.cloud import datastore
-
-  client = datastore.Client()
-  key = client.key('Person')
-
-  entity = datastore.Entity(key=key)
-  entity['name'] = 'Your name'
-  entity['age'] = 25
-  client.put(entity)
-</div>
-
-<h3>Cloud Storage</h3>
-
-<p>
-<a href="https://developers.google.com/storage/">Google Cloud Storage</a> allows you to store data on Google infrastructure.
-</p>
-
-<div hljs>
-  from google.cloud import storage
-
-  client = storage.Client()
-  bucket = client.get_bucket('<your-bucket-name>')
-  blob = bucket.blob('my-test-file.txt')
-  blob.upload_from_string('this is test content!')
-</div>
diff --git a/docs/json/json/master/toc.json b/docs/json/json/master/toc.json
deleted file mode 100644
index 2292459a133df..0000000000000
--- a/docs/json/json/master/toc.json
+++ /dev/null
@@ -1,451 +0,0 @@
-{
-  "guides": [
-    {
-      "contents": [
-        "https://raw.githubusercontent.com/GoogleCloudPlatform/gcloud-common/master/authentication/readme.md",
-        "authentication.md"
-      ],
-      "edit": "https://github.com/GoogleCloudPlatform/gcloud-common/edit/master/authentication/readme.md",
-      "id": "authentication",
-      "title": "Authentication"
-    },
-    {
-      "contents": "https://raw.githubusercontent.com/GoogleCloudPlatform/gcloud-common/master/faq/readme.md",
-      "edit": "https://github.com/GoogleCloudPlatform/gcloud-common/edit/master/faq/readme.md",
-      "id": "faq",
-      "title": "FAQ"
-    },
-    {
-      "contents": "https://raw.githubusercontent.com/GoogleCloudPlatform/gcloud-common/master/troubleshooting/readme.md",
-      "edit": "https://github.com/GoogleCloudPlatform/gcloud-common/edit/master/troubleshooting/readme.md",
-      "id": "troubleshooting",
-      "title": "Troubleshooting"
-    },
-    {
-      "contents": "https://raw.githubusercontent.com/GoogleCloudPlatform/gcloud-common/master/contributing/readme.md",
-      "edit": "https://github.com/GoogleCloudPlatform/gcloud-common/edit/master/contributing/readme.md",
-      "id": "contributing",
-      "title": "Contributing"
-    }
-  ],
-  "overview": "overview.html",
-  "services": [
-    {
-      "nav": [
-        {
-          "title": "Client",
-          "type": "google/cloud/client/client"
-        },
-        {
-          "title": "Connection",
-          "type": "google/cloud/connection/connection"
-        },
-        {
-          "title": "Credentials",
-          "type": "google/cloud/credentials"
-        },
-        {
-          "title": "Environment Variables",
-          "type": "google/cloud/environment_vars"
-        },
-        {
-          "title": "Iterator",
-          "type": "google/cloud/iterator"
-        }
-      ],
-      "title": "gcloud",
-      "type": "google/cloud/gcloud"
-    },
-    {
-      "implemented": ">=0.7.0",
-      "nav": [
-        {
-          "title": "Client",
-          "type": "google/cloud/bigquery/client/client"
-        },
-        {
-          "title": "Dataset",
-          "type": "google/cloud/bigquery/dataset/dataset"
-        },
-        {
-          "title": "Jobs",
-          "type": "google/cloud/bigquery/job"
-        },
-        {
-          "title": "Table",
-          "type": "google/cloud/bigquery/table/table"
-        },
-        {
-          "title": "Query",
-          "type": "google/cloud/bigquery/query/query"
-        }
-      ],
-      "title": "BigQuery",
-      "type": "google/cloud/bigquery"
-    },
-    {
-      "implemented": ">=0.12.0",
-      "nav": [
-        {
-          "title": "Client",
-          "type": "google/cloud/bigtable/client/client"
-        },
-        {
-          "title": "Cluster",
-          "type": "google/cloud/bigtable/cluster/cluster"
-        },
-        {
-          "title": "Column Families",
-          "type": "google/cloud/bigtable/column_family/columnfamily"
-        },
-        {
-          "title": "Bigtable Row",
-          "type": "google/cloud/bigtable/row/row"
-        },
-        {
-          "title": "Bigtable Row Filter",
-          "type": "google/cloud/bigtable/row_filters/rowfilter"
-        },
-        {
-          "title": "Table",
-          "type": "google/cloud/bigtable/table/table"
-        }
-      ],
-      "title": "BigTable",
-      "type": "google/cloud/bigtable"
-    },
-    {
-      "implemented": ">=0.3.0",
-      "nav": [
-        {
-          "title": "Client",
-          "type": "google/cloud/datastore/client/client"
-        },
-        {
-          "title": "Entity",
-          "type": "google/cloud/datastore/entity/entity"
-        },
-        {
-          "title": "Key",
-          "type": "google/cloud/datastore/key/key"
-        },
-        {
-          "title": "Query",
-          "type": "google/cloud/datastore/query/query"
-        },
-        {
-          "title": "Transaction",
-          "type": "google/cloud/datastore/transaction/transaction"
-        },
-        {
-          "title": "Batch",
-          "type": "google/cloud/datastore/batch/batch"
-        },
-        {
-          "title": "Helpers",
-          "type": "datastore/helpers"
-        }
-      ],
-      "title": "Datastore",
-      "type": "google/cloud/datastore"
-    },
-    {
-      "implemented": ">=0.8.0",
-      "nav": [
-        {
-          "title": "Client",
-          "type": "google/cloud/dns/client/client"
-        },
-        {
-          "title": "Managed Zones",
-          "type": "google/cloud/dns/zone/managedzone"
-        },
-        {
-          "title": "Resource Record Set",
-          "type": "google/cloud/dns/resource_record_set/resourcerecordset"
-        },
-        {
-          "title": "Change Sets",
-          "type": "google/cloud/dns/changes/changes"
-        }
-      ],
-      "title": "DNS",
-      "type": "google/cloud/dns"
-    },
-    {
-      "nav": [
-        {
-          "title": "Client",
-          "type": "google/cloud/error_reporting/client/client"
-        }
-      ],
-      "title": "Error Reporting",
-      "type": "google/cloud/error_reporting"
-    },
-    {
-      "nav": [
-        {
-          "title": "BadRequest",
-          "type": "google/cloud/exceptions/badrequest"
-        },
-        {
-          "title": "ClientError",
-          "type": "google/cloud/exceptions/clienterror"
-        },
-        {
-          "title": "Conflict",
-          "type": "google/cloud/exceptions/conflict"
-        },
-        {
-          "title": "Forbidden",
-          "type": "google/cloud/exceptions/forbidden"
-        },
-        {
-          "title": "GoogleCloudError",
-          "type": "google/cloud/exceptions/gclouderror"
-        },
-        {
-          "title": "InternalServerError",
-          "type": "google/cloud/exceptions/internalservererror"
-        },
-        {
-          "title": "LengthRequired",
-          "type": "google/cloud/exceptions/lengthrequired"
-        },
-        {
-          "title": "MethodNotAllowed",
-          "type": "google/cloud/exceptions/methodnotallowed"
-        },
-        {
-          "title": "MethodNotImplemented",
-          "type": "google/cloud/exceptions/methodnotimplemented"
-        },
-        {
-          "title": "MovedPermanently",
-          "type": "google/cloud/exceptions/movedpermanently"
-        },
-        {
-          "title": "NotFound",
-          "type": "google/cloud/exceptions/notfound"
-        },
-        {
-          "title": "NotModified",
-          "type": "google/cloud/exceptions/notmodified"
-        },
-        {
-          "title": "PreconditionFailed",
-          "type": "google/cloud/exceptions/preconditionfailed"
-        },
-        {
-          "title": "Redirection",
-          "type": "google/cloud/exceptions/redirection"
-        },
-        {
-          "title": "RequestRangeNotSatisfiable",
-          "type": "google/cloud/exceptions/requestrangenotsatisfiable"
-        },
-        {
-          "title": "ResumeIncomplete",
-          "type": "google/cloud/exceptions/resumeincomplete"
-        },
-        {
-          "title": "ServerError",
-          "type": "google/cloud/exceptions/servererror"
-        },
-        {
-          "title": "ServiceUnavailable",
-          "type": "google/cloud/exceptions/serviceunavailable"
-        },
-        {
-          "title": "TemporaryRedirect",
-          "type": "google/cloud/exceptions/temporaryredirect"
-        },
-        {
-          "title": "TooManyRequests",
-          "type": "google/cloud/exceptions/toomanyrequests"
-        },
-        {
-          "title": "Unauthorized",
-          "type": "google/cloud/exceptions/unauthorized"
-        },
-        {
-          "title": "Exceptions",
-          "type": "google/cloud/exceptions"
-        }
-      ],
-      "title": "Exceptions",
-      "type": "google/cloud/exceptions"
-    },
-    {
-      "implemented": ">=0.12.0",
-      "nav": [
-        {
-          "title": "Client",
-          "type": "google/cloud/logging/client/client"
-        },
-        {
-          "title": "Logger",
-          "type": "google/cloud/logging/logger/logger"
-        },
-        {
-          "title": "Entries",
-          "type": "google/cloud/logging/entries"
-        },
-        {
-          "title": "Metric",
-          "type": "google/cloud/logging/metric/metric"
-        },
-        {
-          "title": "Sink",
-          "type": "google/cloud/logging/sink/sink"
-        }
-      ],
-      "title": "Cloud Logging",
-      "type": "google/cloud/logging"
-    },
-    {
-      "implemented": ">=0.12.0",
-      "nav": [
-        {
-          "title": "Client",
-          "type": "google/cloud/monitoring/client/client"
-        },
-        {
-          "title": "Metric Descriptors",
-          "type": "google/cloud/monitoring/metric/metricdescriptor"
-        },
-        {
-          "title": "Label Descriptors",
-          "type": "google/cloud/monitoring/label/labeldescriptor"
-        },
-        {
-          "title": "Monitored Resource Descriptors",
-          "type": "google/cloud/monitoring/resource/resourcedescriptor"
-        },
-        {
-          "title": "Time Series Query",
-          "type": "google/cloud/monitoring/query/query"
-        },
-        {
-          "title": "Time Series",
-          "type": "googe/cloud/monitoring/timeseries/timeseries"
-        }
-      ],
-      "title": "Cloud Monitoring",
-      "type": "google/cloud/monitoring"
-    },
-    {
-      "implemented": ">=0.5.0",
-      "nav": [
-        {
-          "title": "Client",
-          "type": "google/cloud/pubsub/client/client"
-        },
-        {
-          "title": "Topic",
-          "type": "google/cloud/pubsub/topic/topic"
-        },
-        {
-          "title": "Subscription",
-          "type": "google/cloud/pubsub/subscription/subscription"
-        },
-        {
-          "title": "Message",
-          "type": "google/cloud/pubsub/message/message"
-        },
-        {
-          "title": "Policy",
-          "type": "google/cloud/pubsub/iam/policy"
-        }
-      ],
-      "title": "Pub/Sub",
-      "type": "google/cloud/pubsub"
-    },
-    {
-      "implemented": ">=0.8.0",
-      "nav": [
-        {
-          "title": "Client",
-          "type": "google/cloud/resource_manager/client/client"
-        },
-        {
-          "title": "Project",
-          "type": "google/cloud/resource_manager/project/project"
-        }
-      ],
-      "title": "Resource Manager",
-      "type": "google/cloud/resource_manager"
-    },
-    {
-      "implemented": ">=0.3.0",
-      "nav": [
-        {
-          "title": "Client",
-          "type": "google/cloud/storage/client/client"
-        },
-        {
-          "title": "Blob",
-          "type": "google/cloud/storage/blob/blob"
-        },
-        {
-          "title": "Bucket",
-          "type": "google/cloud/storage/bucket/bucket"
-        },
-        {
-          "title": "ACL",
-          "type": "google/cloud/storage/acl/acl"
-        },
-        {
-          "title": "Batch",
-          "type": "google/cloud/storage/batch/batch"
-        }
-      ],
-      "title": "Storage",
-      "type": "google/cloud/storage"
-    },
-    {
-      "nav": [
-        {
-          "title": "Buffered Stream",
-          "type": "google/cloud/streaming/buffered_stream/bufferedstream"
-        },
-        {
-          "title": "Request",
-          "type": "google/cloud/streaming/http_wrapper/request"
-        },
-        {
-          "title": "Response",
-          "type": "google/cloud/streaming/http_wrapper/response"
-        },
-        {
-          "title": "Stream Slice",
-          "type": "google/cloud/streaming/stream_slice/streamslice"
-        },
-        {
-          "title": "Download",
-          "type": "google/cloud/streaming/transfer/download"
-        },
-        {
-          "title": "Upload",
-          "type": "google/cloud/streaming/transfer/upload"
-        },
-        {
-          "title": "Util",
-          "type": "google/cloud/streaming/util"
-        }
-      ],
-      "title": "Streaming",
-      "type": "google/cloud/streaming"
-    },
-    {
-      "nav": [
-        {
-          "title": "Connection",
-          "type": "google/cloud/vision/connection/connection"
-        }
-      ],
-      "title": "Vision",
-      "type": "google/cloud/vision"
-    }
-  ]
-}
diff --git a/docs/json/manifest.json b/docs/json/manifest.json
deleted file mode 100644
index fa41098a95a23..0000000000000
--- a/docs/json/manifest.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "content": "json",
-  "friendlyLang": "Python",
-  "home": "home.html",
-  "lang": "python",
-  "latestRelease": {
-    "date": 1455306471454,
-    "link": "https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master",
-    "name": "master"
-  },
-  "markdown": "python",
-  "package": {
-    "href": "https://pypi.python.org/pypi/google-cloud",
-    "title": "PyPI"
-  },
-  "titleDelimiter": ".",
-  "versions": [
-    "master"
-  ]
-}

From 14e570a3f435f8904ed9fa52d545a35ba5868ad1 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Thu, 20 Jul 2017 09:33:21 -0700
Subject: [PATCH 096/211] Changing all pypi.python.org links to warehouse
 links. (#3641)

Done via

$ export OLD='https\:\/\/pypi.python.org\/pypi\/'
$ export NEW='https\:\/\/pypi.org\/project\/'
$ git grep -l ${OLD} | xargs sed -i s/${OLD}/${NEW}/g

Then manually going through and adding a trailing slash to all
warehouse links.

(Though I did undo changes to `docs/json/`.)
---
 CONTRIBUTING.rst            |  2 +-
 README.rst                  | 34 +++++++++++++++++-----------------
 bigquery/README.rst         |  4 ++--
 bigtable/README.rst         |  4 ++--
 core/README.rst             |  4 ++--
 datastore/README.rst        |  4 ++--
 dns/README.rst              |  4 ++--
 docs/bigtable/usage.rst     |  2 +-
 docs/index.rst              |  2 +-
 docs/spanner/usage.rst      |  3 +--
 error_reporting/README.rst  |  4 ++--
 language/README.rst         |  4 ++--
 logging/README.rst          |  4 ++--
 monitoring/README.rst       |  4 ++--
 pubsub/README.rst           |  4 ++--
 resource_manager/README.rst |  4 ++--
 runtimeconfig/README.rst    |  4 ++--
 speech/README.rst           |  4 ++--
 storage/README.rst          |  4 ++--
 translate/README.rst        |  4 ++--
 vision/README.rst           |  4 ++--
 21 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index a9f654a52c37b..95a4dd13cfdb9 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -402,7 +402,7 @@ instead of
 ``https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/CONTRIBUTING.rst``)
 may cause problems creating links or rendering the description.
 
-.. _description on PyPI: https://pypi.python.org/pypi/google-cloud
+.. _description on PyPI: https://pypi.org/project/google-cloud/
 
 ********************************************
 Travis Configuration and Build Optimizations
diff --git a/README.rst b/README.rst
index b2fcb47df468d..5e3615da46f9d 100644
--- a/README.rst
+++ b/README.rst
@@ -57,35 +57,35 @@ Cloud Platform services:
 still a work-in-progress and is more likely to get backwards-incompatible
 updates. See `versioning`_ for more details.
 
-.. _Google Cloud Datastore: https://pypi.python.org/pypi/google-cloud-datastore
+.. _Google Cloud Datastore: https://pypi.org/project/google-cloud-datastore/
 .. _Datastore README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/datastore
-.. _Google Cloud Storage: https://pypi.python.org/pypi/google-cloud-storage
+.. _Google Cloud Storage: https://pypi.org/project/google-cloud-storage/
 .. _Storage README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/storage
-.. _Google Cloud Pub/Sub: https://pypi.python.org/pypi/google-cloud-pubsub
+.. _Google Cloud Pub/Sub: https://pypi.org/project/google-cloud-pubsub/
 .. _Pub/Sub README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/pubsub
-.. _Google BigQuery: https://pypi.python.org/pypi/google-cloud-bigquery
+.. _Google BigQuery: https://pypi.org/project/google-cloud-bigquery/
 .. _BigQuery README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/bigquery
-.. _Google Cloud Resource Manager: https://pypi.python.org/pypi/google-cloud-resource-manager
+.. _Google Cloud Resource Manager: https://pypi.org/project/google-cloud-resource-manager/
 .. _Resource Manager README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/resource_manager
-.. _Stackdriver Logging: https://pypi.python.org/pypi/google-cloud-logging
+.. _Stackdriver Logging: https://pypi.org/project/google-cloud-logging/
 .. _Logging README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/logging
-.. _Stackdriver Monitoring: https://pypi.python.org/pypi/google-cloud-monitoring
+.. _Stackdriver Monitoring: https://pypi.org/project/google-cloud-monitoring/
 .. _Monitoring README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/monitoring
-.. _Google Cloud Bigtable: https://pypi.python.org/pypi/google-cloud-bigtable
+.. _Google Cloud Bigtable: https://pypi.org/project/google-cloud-bigtable/
 .. _Bigtable README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/bigtable
-.. _Google Cloud DNS: https://pypi.python.org/pypi/google-cloud-dns
+.. _Google Cloud DNS: https://pypi.org/project/google-cloud-dns/
 .. _DNS README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/dns
-.. _Stackdriver Error Reporting: https://pypi.python.org/pypi/google-cloud-error-reporting
+.. _Stackdriver Error Reporting: https://pypi.org/project/google-cloud-error-reporting/
 .. _Error Reporting README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/error_reporting
-.. _Google Cloud Natural Language: https://pypi.python.org/pypi/google-cloud-language
+.. _Google Cloud Natural Language: https://pypi.org/project/google-cloud-language/
 .. _Natural Language README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/language
-.. _Google Cloud Translation: https://pypi.python.org/pypi/google-cloud-translate
+.. _Google Cloud Translation: https://pypi.org/project/google-cloud-translate/
 .. _Translation README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/translate
-.. _Google Cloud Speech: https://pypi.python.org/pypi/google-cloud-speech
+.. _Google Cloud Speech: https://pypi.org/project/google-cloud-speech/
 .. _Speech README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/speech
-.. _Google Cloud Vision: https://pypi.python.org/pypi/google-cloud-vision
+.. _Google Cloud Vision: https://pypi.org/project/google-cloud-vision/
 .. _Vision README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/vision
-.. _Google Cloud Bigtable - HappyBase: https://pypi.python.org/pypi/google-cloud-happybase/
+.. _Google Cloud Bigtable - HappyBase: https://pypi.org/project/google-cloud-happybase/
 .. _HappyBase README: https://github.com/GoogleCloudPlatform/google-cloud-python-happybase
 .. _Google Cloud Runtime Configuration: https://cloud.google.com/deployment-manager/runtime-configurator/
 .. _Runtime Config README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/runtimeconfig
@@ -159,6 +159,6 @@ Apache 2.0 - See `the LICENSE`_ for more information.
 .. |coverage| image:: https://coveralls.io/repos/GoogleCloudPlatform/google-cloud-python/badge.svg?branch=master
    :target: https://coveralls.io/r/GoogleCloudPlatform/google-cloud-python?branch=master
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud.svg
-   :target: https://pypi.python.org/pypi/google-cloud
+   :target: https://pypi.org/project/google-cloud/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud.svg
-   :target: https://pypi.python.org/pypi/google-cloud
+   :target: https://pypi.org/project/google-cloud/
diff --git a/bigquery/README.rst b/bigquery/README.rst
index bf5bc55f1fa43..7e4f0cb72dae2 100644
--- a/bigquery/README.rst
+++ b/bigquery/README.rst
@@ -89,6 +89,6 @@ to connect to BigQuery using this Client Library.
 .. _BigQuery documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/bigquery/usage.html
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-bigquery.svg
-   :target: https://pypi.python.org/pypi/google-cloud-bigquery
+   :target: https://pypi.org/project/google-cloud-bigquery/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-bigquery.svg
-   :target: https://pypi.python.org/pypi/google-cloud-bigquery
+   :target: https://pypi.org/project/google-cloud-bigquery/
diff --git a/bigtable/README.rst b/bigtable/README.rst
index 3385b882c28ff..ebc202d8d87e4 100644
--- a/bigtable/README.rst
+++ b/bigtable/README.rst
@@ -42,6 +42,6 @@ See the ``google-cloud-python`` API Bigtable `Documentation`_ to learn
 how to manage your data in Bigtable tables.
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-bigtable.svg
-   :target: https://pypi.python.org/pypi/google-cloud-bigtable
+   :target: https://pypi.org/project/google-cloud-bigtable/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-bigtable.svg
-   :target: https://pypi.python.org/pypi/google-cloud-bigtable
+   :target: https://pypi.org/project/google-cloud-bigtable/
diff --git a/core/README.rst b/core/README.rst
index e9e7e19278ced..53cbd311a50e0 100644
--- a/core/README.rst
+++ b/core/README.rst
@@ -19,6 +19,6 @@ Quick Start
     $ pip install --upgrade google-cloud-core
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-core.svg
-   :target: https://pypi.python.org/pypi/google-cloud-core
+   :target: https://pypi.org/project/google-cloud-core/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-core.svg
-   :target: https://pypi.python.org/pypi/google-cloud-core
+   :target: https://pypi.org/project/google-cloud-core/
diff --git a/datastore/README.rst b/datastore/README.rst
index dbfc252564ead..89ba561baed3d 100644
--- a/datastore/README.rst
+++ b/datastore/README.rst
@@ -67,6 +67,6 @@ how to activate Cloud Datastore for your project.
         print(result)
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-datastore.svg
-   :target: https://pypi.python.org/pypi/google-cloud-datastore
+   :target: https://pypi.org/project/google-cloud-datastore/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-datastore.svg
-   :target: https://pypi.python.org/pypi/google-cloud-datastore
+   :target: https://pypi.org/project/google-cloud-datastore/
diff --git a/dns/README.rst b/dns/README.rst
index 7f46dce1d617c..e5882fd0adc27 100644
--- a/dns/README.rst
+++ b/dns/README.rst
@@ -42,6 +42,6 @@ See the ``google-cloud-python`` API DNS `Documentation`_ to learn
 how to manage DNS records using this Client Library.
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-dns.svg
-   :target: https://pypi.python.org/pypi/google-cloud-dns
+   :target: https://pypi.org/project/google-cloud-dns/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-dns.svg
-   :target: https://pypi.python.org/pypi/google-cloud-dns
+   :target: https://pypi.org/project/google-cloud-dns/
diff --git a/docs/bigtable/usage.rst b/docs/bigtable/usage.rst
index 421b2426f8cfa..f5df56fdee740 100644
--- a/docs/bigtable/usage.rst
+++ b/docs/bigtable/usage.rst
@@ -40,4 +40,4 @@ In the hierarchy of API concepts
 
 .. _Google Cloud Bigtable: https://cloud.google.com/bigtable/docs/
 .. _gRPC: http://www.grpc.io/
-.. _grpcio: https://pypi.python.org/pypi/grpcio
+.. _grpcio: https://pypi.org/project/grpcio/
diff --git a/docs/index.rst b/docs/index.rst
index 8c81cefdda2e3..ee47a2ac378f7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -73,4 +73,4 @@ Resources
 * `GitHub <https://github.com/GoogleCloudPlatform/google-cloud-python/>`__
 * `Issues <https://github.com/GoogleCloudPlatform/google-cloud-python/issues>`__
 * `Stack Overflow <http://stackoverflow.com/questions/tagged/google-cloud-python>`__
-* `PyPI <https://pypi.python.org/pypi/google-cloud>`__
+* `PyPI <https://pypi.org/project/google-cloud/>`__
diff --git a/docs/spanner/usage.rst b/docs/spanner/usage.rst
index 0d91420415231..2d61fbaed9c7f 100644
--- a/docs/spanner/usage.rst
+++ b/docs/spanner/usage.rst
@@ -40,5 +40,4 @@ In the hierarchy of API concepts
 
 .. _Cloud Spanner: https://cloud.google.com/spanner/docs/
 .. _gRPC: http://www.grpc.io/
-.. _grpcio: https://pypi.python.org/pypi/grpcio
-
+.. _grpcio: https://pypi.org/project/grpcio/
diff --git a/error_reporting/README.rst b/error_reporting/README.rst
index 69308b1ce0e2b..104856f348e63 100644
--- a/error_reporting/README.rst
+++ b/error_reporting/README.rst
@@ -47,6 +47,6 @@ See the ``google-cloud-python`` API Error Reporting `Documentation`_ to learn
 how to get started using this library.
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-error-reporting.svg
-   :target: https://pypi.python.org/pypi/google-cloud-error-reporting
+   :target: https://pypi.org/project/google-cloud-error-reporting/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-error-reporting.svg
-   :target: https://pypi.python.org/pypi/google-cloud-error-reporting
+   :target: https://pypi.org/project/google-cloud-error-reporting/
diff --git a/language/README.rst b/language/README.rst
index 8685c89253131..9940503a78327 100644
--- a/language/README.rst
+++ b/language/README.rst
@@ -46,6 +46,6 @@ See the ``google-cloud-python`` API Natural Language `Documentation`_ to learn
 how to analyze text with this API.
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-language.svg
-   :target: https://pypi.python.org/pypi/google-cloud-language
+   :target: https://pypi.org/project/google-cloud-language/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-language.svg
-   :target: https://pypi.python.org/pypi/google-cloud-language
+   :target: https://pypi.org/project/google-cloud-language/
diff --git a/logging/README.rst b/logging/README.rst
index a706b50079acf..8cf274e4e4a12 100644
--- a/logging/README.rst
+++ b/logging/README.rst
@@ -57,6 +57,6 @@ connect to Stackdriver Logging using this Client Library.
 .. _logging documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/logging/usage.html
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-logging.svg
-   :target: https://pypi.python.org/pypi/google-cloud-logging
+   :target: https://pypi.org/project/google-cloud-logging/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-logging.svg
-   :target: https://pypi.python.org/pypi/google-cloud-logging
+   :target: https://pypi.org/project/google-cloud-logging/
diff --git a/monitoring/README.rst b/monitoring/README.rst
index 4debab64a3eab..f5a8bb8ecb779 100644
--- a/monitoring/README.rst
+++ b/monitoring/README.rst
@@ -67,6 +67,6 @@ to connect to Stackdriver Monitoring using this Client Library.
 .. _monitoring documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/monitoring/usage.html
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-monitoring.svg
-   :target: https://pypi.python.org/pypi/google-cloud-monitoring
+   :target: https://pypi.org/project/google-cloud-monitoring/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-monitoring.svg
-   :target: https://pypi.python.org/pypi/google-cloud-monitoring
+   :target: https://pypi.org/project/google-cloud-monitoring/
diff --git a/pubsub/README.rst b/pubsub/README.rst
index 472b74eb1bf05..bf116676a440f 100644
--- a/pubsub/README.rst
+++ b/pubsub/README.rst
@@ -61,6 +61,6 @@ To get started with this API, you'll need to create
                   attr1='value1', attr2='value2')
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-pubsub.svg
-   :target: https://pypi.python.org/pypi/google-cloud-pubsub
+   :target: https://pypi.org/project/google-cloud-pubsub/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-pubsub.svg
-   :target: https://pypi.python.org/pypi/google-cloud-pubsub
+   :target: https://pypi.org/project/google-cloud-pubsub/
diff --git a/resource_manager/README.rst b/resource_manager/README.rst
index f0e67ca4750ef..fe6864580ed51 100644
--- a/resource_manager/README.rst
+++ b/resource_manager/README.rst
@@ -45,6 +45,6 @@ how to manage projects using this Client Library.
 .. _Resource Manager documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/resource-manager/api.html
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-resource-manager.svg
-   :target: https://pypi.python.org/pypi/google-cloud-resource-manager
+   :target: https://pypi.org/project/google-cloud-resource-manager/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-resource-manager.svg
-   :target: https://pypi.python.org/pypi/google-cloud-resource-manager
+   :target: https://pypi.org/project/google-cloud-resource-manager/
diff --git a/runtimeconfig/README.rst b/runtimeconfig/README.rst
index b8d79b3fd3d35..d061bea3eda2c 100644
--- a/runtimeconfig/README.rst
+++ b/runtimeconfig/README.rst
@@ -48,6 +48,6 @@ See the ``google-cloud-python`` API runtimeconfig `Documentation`_ to learn
 how to interact with Cloud RuntimeConfig using this Client Library.
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-runtimeconfig.svg
-   :target: https://pypi.python.org/pypi/google-cloud-runtimeconfig
+   :target: https://pypi.org/project/google-cloud-runtimeconfig/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-runtimeconfig.svg
-   :target: https://pypi.python.org/pypi/google-cloud-runtimeconfig
+   :target: https://pypi.org/project/google-cloud-runtimeconfig/
diff --git a/speech/README.rst b/speech/README.rst
index ce67559f09e7a..150fc37bb5902 100644
--- a/speech/README.rst
+++ b/speech/README.rst
@@ -43,6 +43,6 @@ connect to the Google Cloud Speech API using this Client Library.
 
 .. _speech documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/speech/usage.html
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-speech.svg
-   :target: https://pypi.python.org/pypi/google-cloud-speech
+   :target: https://pypi.org/project/google-cloud-speech/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-speech.svg
-   :target: https://pypi.python.org/pypi/google-cloud-speech
+   :target: https://pypi.org/project/google-cloud-speech/
diff --git a/storage/README.rst b/storage/README.rst
index 553c377a2be3b..d291fc389c239 100644
--- a/storage/README.rst
+++ b/storage/README.rst
@@ -64,6 +64,6 @@ how to create a bucket.
     blob2.upload_from_filename(filename='/local/path.txt')
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-storage.svg
-   :target: https://pypi.python.org/pypi/google-cloud-storage
+   :target: https://pypi.org/project/google-cloud-storage/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-storage.svg
-   :target: https://pypi.python.org/pypi/google-cloud-storage
+   :target: https://pypi.org/project/google-cloud-storage/
diff --git a/translate/README.rst b/translate/README.rst
index 7e56d081cf467..18bc34002258d 100644
--- a/translate/README.rst
+++ b/translate/README.rst
@@ -42,6 +42,6 @@ See the ``google-cloud-python`` API Translation `Documentation`_ to learn
 how to translate text using this library.
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-translate.svg
-   :target: https://pypi.python.org/pypi/google-cloud-translate
+   :target: https://pypi.org/project/google-cloud-translate/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-translate.svg
-   :target: https://pypi.python.org/pypi/google-cloud-translate
+   :target: https://pypi.org/project/google-cloud-translate/
diff --git a/vision/README.rst b/vision/README.rst
index 0056d714dd5c7..d54f36c3e8c8a 100644
--- a/vision/README.rst
+++ b/vision/README.rst
@@ -50,6 +50,6 @@ See the ``google-cloud-python`` API `Documentation`_ to learn
 how to analyze images using this library.
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-vision.svg
-   :target: https://pypi.python.org/pypi/google-cloud-vision
+   :target: https://pypi.org/project/google-cloud-vision/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-vision.svg
-   :target: https://pypi.python.org/pypi/google-cloud-vision
+   :target: https://pypi.org/project/google-cloud-vision/

From 419588c65a3deef0d50e083b3913437f08f8475a Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Thu, 20 Jul 2017 10:07:12 -0700
Subject: [PATCH 097/211] Revert "RPC retries (second PR) (#3324)" (#3642)

This reverts commit 67f4ba47069146a9b93005e38046eb2cd59b150a.
---
 bigtable/google/cloud/bigtable/retry.py    | 169 -------------------
 bigtable/google/cloud/bigtable/row_data.py |   3 -
 bigtable/google/cloud/bigtable/table.py    | 101 +++++++----
 bigtable/tests/retry_test_script.txt       |  38 -----
 bigtable/tests/system.py                   |  78 ---------
 bigtable/tests/unit/_testing.py            |  27 +--
 bigtable/tests/unit/test_table.py          | 185 ++-------------------
 7 files changed, 81 insertions(+), 520 deletions(-)
 delete mode 100644 bigtable/google/cloud/bigtable/retry.py
 delete mode 100644 bigtable/tests/retry_test_script.txt

diff --git a/bigtable/google/cloud/bigtable/retry.py b/bigtable/google/cloud/bigtable/retry.py
deleted file mode 100644
index f20419ce4f8e0..0000000000000
--- a/bigtable/google/cloud/bigtable/retry.py
+++ /dev/null
@@ -1,169 +0,0 @@
-"""Provides function wrappers that implement retrying."""
-import random
-import time
-import six
-import sys
-
-from google.cloud._helpers import _to_bytes
-from google.cloud.bigtable._generated import (
-    bigtable_pb2 as data_messages_v2_pb2)
-from google.gax import config, errors
-from grpc import RpcError
-
-
-_MILLIS_PER_SECOND = 1000
-
-
-class ReadRowsIterator(object):
-    """Creates an iterator equivalent to a_iter, but that retries on certain
-    exceptions.
-    """
-
-    def __init__(self, client, name, start_key, end_key, filter_, limit,
-                 retry_options, **kwargs):
-        self.client = client
-        self.retry_options = retry_options
-        self.name = name
-        self.start_key = start_key
-        self.start_key_closed = True
-        self.end_key = end_key
-        self.filter_ = filter_
-        self.limit = limit
-        self.delay_mult = retry_options.backoff_settings.retry_delay_multiplier
-        self.max_delay_millis = \
-            retry_options.backoff_settings.max_retry_delay_millis
-        self.timeout_mult = \
-            retry_options.backoff_settings.rpc_timeout_multiplier
-        self.max_timeout = \
-            (retry_options.backoff_settings.max_rpc_timeout_millis /
-             _MILLIS_PER_SECOND)
-        self.total_timeout = \
-            (retry_options.backoff_settings.total_timeout_millis /
-             _MILLIS_PER_SECOND)
-        self.set_stream()
-
-    def set_start_key(self, start_key):
-        """
-        Sets the row key at which this iterator will begin reading.
-        """
-        self.start_key = start_key
-        self.start_key_closed = False
-
-    def set_stream(self):
-        """
-        Resets the read stream by making an RPC on the 'ReadRows' endpoint.
-        """
-        req_pb = _create_row_request(self.name, start_key=self.start_key,
-                                     start_key_closed=self.start_key_closed,
-                                     end_key=self.end_key,
-                                     filter_=self.filter_, limit=self.limit)
-        self.stream = self.client._data_stub.ReadRows(req_pb)
-
-    def next(self, *args, **kwargs):
-        """
-        Read and return the next row from the stream.
-        Retry on idempotent failure.
-        """
-        delay = self.retry_options.backoff_settings.initial_retry_delay_millis
-        exc = errors.RetryError('Retry total timeout exceeded before any'
-                                'response was received')
-        timeout = (self.retry_options.backoff_settings
-                   .initial_rpc_timeout_millis /
-                   _MILLIS_PER_SECOND)
-
-        now = time.time()
-        deadline = now + self.total_timeout
-        while deadline is None or now < deadline:
-            try:
-                return six.next(self.stream)
-            except StopIteration as stop:
-                raise stop
-            except RpcError as error:  # pylint: disable=broad-except
-                code = config.exc_to_code(error)
-                if code not in self.retry_options.retry_codes:
-                    six.reraise(type(error), error)
-
-                # pylint: disable=redefined-variable-type
-                exc = errors.RetryError(
-                    'Retry total timeout exceeded with exception', error)
-
-                # Sleep a random number which will, on average, equal the
-                # expected delay.
-                to_sleep = random.uniform(0, delay * 2)
-                time.sleep(to_sleep / _MILLIS_PER_SECOND)
-                delay = min(delay * self.delay_mult, self.max_delay_millis)
-                now = time.time()
-                timeout = min(
-                    timeout * self.timeout_mult, self.max_timeout,
-                    deadline - now)
-                self.set_stream()
-
-        six.reraise(errors.RetryError, exc, sys.exc_info()[2])
-
-    def __next__(self, *args, **kwargs):
-        return self.next(*args, **kwargs)
-
-
-def _create_row_request(table_name, row_key=None, start_key=None,
-                        start_key_closed=True, end_key=None, filter_=None,
-                        limit=None):
-    """Creates a request to read rows in a table.
-
-    :type table_name: str
-    :param table_name: The name of the table to read from.
-
-    :type row_key: bytes
-    :param row_key: (Optional) The key of a specific row to read from.
-
-    :type start_key: bytes
-    :param start_key: (Optional) The beginning of a range of row keys to
-                      read from. The range will include ``start_key``. If
-                      left empty, will be interpreted as the empty string.
-
-    :type end_key: bytes
-    :param end_key: (Optional) The end of a range of row keys to read from.
-                    The range will not include ``end_key``. If left empty,
-                    will be interpreted as an infinite string.
-
-    :type filter_: :class:`.RowFilter`
-    :param filter_: (Optional) The filter to apply to the contents of the
-                    specified row(s). If unset, reads the entire table.
-
-    :type limit: int
-    :param limit: (Optional) The read will terminate after committing to N
-                  rows' worth of results. The default (zero) is to return
-                  all results.
-
-    :rtype: :class:`data_messages_v2_pb2.ReadRowsRequest`
-    :returns: The ``ReadRowsRequest`` protobuf corresponding to the inputs.
-    :raises: :class:`ValueError <exceptions.ValueError>` if both
-             ``row_key`` and one of ``start_key`` and ``end_key`` are set
-    """
-    request_kwargs = {'table_name': table_name}
-    if (row_key is not None and
-            (start_key is not None or end_key is not None)):
-        raise ValueError('Row key and row range cannot be '
-                         'set simultaneously')
-    range_kwargs = {}
-    if start_key is not None or end_key is not None:
-        if start_key is not None:
-            if start_key_closed:
-                range_kwargs['start_key_closed'] = _to_bytes(start_key)
-            else:
-                range_kwargs['start_key_open'] = _to_bytes(start_key)
-        if end_key is not None:
-            range_kwargs['end_key_open'] = _to_bytes(end_key)
-    if filter_ is not None:
-        request_kwargs['filter'] = filter_.to_pb()
-    if limit is not None:
-        request_kwargs['rows_limit'] = limit
-
-    message = data_messages_v2_pb2.ReadRowsRequest(**request_kwargs)
-
-    if row_key is not None:
-        message.rows.row_keys.append(_to_bytes(row_key))
-
-    if range_kwargs:
-        message.rows.row_ranges.add(**range_kwargs)
-
-    return message
diff --git a/bigtable/google/cloud/bigtable/row_data.py b/bigtable/google/cloud/bigtable/row_data.py
index 0849e681b7e65..78179db25c4e5 100644
--- a/bigtable/google/cloud/bigtable/row_data.py
+++ b/bigtable/google/cloud/bigtable/row_data.py
@@ -274,9 +274,6 @@ def consume_next(self):
 
             self._validate_chunk(chunk)
 
-            if hasattr(self._response_iterator, 'set_start_key'):
-                self._response_iterator.set_start_key(chunk.row_key)
-
             if chunk.reset_row:
                 row = self._row = None
                 cell = self._cell = self._previous_cell = None
diff --git a/bigtable/google/cloud/bigtable/table.py b/bigtable/google/cloud/bigtable/table.py
index ad6fab88dcf9c..40ef3a2ca2fb9 100644
--- a/bigtable/google/cloud/bigtable/table.py
+++ b/bigtable/google/cloud/bigtable/table.py
@@ -17,6 +17,7 @@
 
 import six
 
+from google.cloud._helpers import _to_bytes
 from google.cloud.bigtable._generated import (
     bigtable_pb2 as data_messages_v2_pb2)
 from google.cloud.bigtable._generated import (
@@ -29,26 +30,6 @@
 from google.cloud.bigtable.row import ConditionalRow
 from google.cloud.bigtable.row import DirectRow
 from google.cloud.bigtable.row_data import PartialRowsData
-from google.gax import RetryOptions, BackoffSettings
-from google.cloud.bigtable.retry import ReadRowsIterator, _create_row_request
-from grpc import StatusCode
-
-BACKOFF_SETTINGS = BackoffSettings(
-    initial_retry_delay_millis=10,
-    retry_delay_multiplier=1.3,
-    max_retry_delay_millis=30000,
-    initial_rpc_timeout_millis=25 * 60 * 1000,
-    rpc_timeout_multiplier=1.0,
-    max_rpc_timeout_millis=25 * 60 * 1000,
-    total_timeout_millis=30 * 60 * 1000
-)
-
-RETRY_CODES = [
-    StatusCode.DEADLINE_EXCEEDED,
-    StatusCode.ABORTED,
-    StatusCode.INTERNAL,
-    StatusCode.UNAVAILABLE
-]
 
 
 # Maximum number of mutations in bulk (MutateRowsRequest message):
@@ -276,7 +257,7 @@ def read_row(self, row_key, filter_=None):
         return rows_data.rows[row_key]
 
     def read_rows(self, start_key=None, end_key=None, limit=None,
-                  filter_=None, backoff_settings=None):
+                  filter_=None):
         """Read rows from this table.
 
         :type start_key: bytes
@@ -303,18 +284,13 @@ def read_rows(self, start_key=None, end_key=None, limit=None,
         :returns: A :class:`.PartialRowsData` convenience wrapper for consuming
                   the streamed results.
         """
+        request_pb = _create_row_request(
+            self.name, start_key=start_key, end_key=end_key, filter_=filter_,
+            limit=limit)
         client = self._instance._client
-        if backoff_settings is None:
-            backoff_settings = BACKOFF_SETTINGS
-        RETRY_OPTIONS = RetryOptions(
-            retry_codes=RETRY_CODES,
-            backoff_settings=backoff_settings
-        )
-
-        retrying_iterator = ReadRowsIterator(client, self.name, start_key,
-                                             end_key, filter_, limit,
-                                             RETRY_OPTIONS)
-        return PartialRowsData(retrying_iterator)
+        response_iterator = client._data_stub.ReadRows(request_pb)
+        # We expect an iterator of `data_messages_v2_pb2.ReadRowsResponse`
+        return PartialRowsData(response_iterator)
 
     def mutate_rows(self, rows):
         """Mutates multiple rows in bulk.
@@ -383,6 +359,67 @@ def sample_row_keys(self):
         return response_iterator
 
 
+def _create_row_request(table_name, row_key=None, start_key=None, end_key=None,
+                        filter_=None, limit=None):
+    """Creates a request to read rows in a table.
+
+    :type table_name: str
+    :param table_name: The name of the table to read from.
+
+    :type row_key: bytes
+    :param row_key: (Optional) The key of a specific row to read from.
+
+    :type start_key: bytes
+    :param start_key: (Optional) The beginning of a range of row keys to
+                      read from. The range will include ``start_key``. If
+                      left empty, will be interpreted as the empty string.
+
+    :type end_key: bytes
+    :param end_key: (Optional) The end of a range of row keys to read from.
+                    The range will not include ``end_key``. If left empty,
+                    will be interpreted as an infinite string.
+
+    :type filter_: :class:`.RowFilter`
+    :param filter_: (Optional) The filter to apply to the contents of the
+                    specified row(s). If unset, reads the entire table.
+
+    :type limit: int
+    :param limit: (Optional) The read will terminate after committing to N
+                  rows' worth of results. The default (zero) is to return
+                  all results.
+
+    :rtype: :class:`data_messages_v2_pb2.ReadRowsRequest`
+    :returns: The ``ReadRowsRequest`` protobuf corresponding to the inputs.
+    :raises: :class:`ValueError <exceptions.ValueError>` if both
+             ``row_key`` and one of ``start_key`` and ``end_key`` are set
+    """
+    request_kwargs = {'table_name': table_name}
+    if (row_key is not None and
+            (start_key is not None or end_key is not None)):
+        raise ValueError('Row key and row range cannot be '
+                         'set simultaneously')
+    range_kwargs = {}
+    if start_key is not None or end_key is not None:
+        if start_key is not None:
+            range_kwargs['start_key_closed'] = _to_bytes(start_key)
+        if end_key is not None:
+            range_kwargs['end_key_open'] = _to_bytes(end_key)
+    if filter_ is not None:
+        request_kwargs['filter'] = filter_.to_pb()
+    if limit is not None:
+        request_kwargs['rows_limit'] = limit
+
+    message = data_messages_v2_pb2.ReadRowsRequest(**request_kwargs)
+
+    if row_key is not None:
+        message.rows.row_keys.append(_to_bytes(row_key))
+
+    if range_kwargs:
+        message.rows.row_ranges.add(**range_kwargs)
+
+    return message
+
+
 def _mutate_rows_request(table_name, rows):
     """Creates a request to mutate rows in a table.
 
diff --git a/bigtable/tests/retry_test_script.txt b/bigtable/tests/retry_test_script.txt
deleted file mode 100644
index 863662e897ba0..0000000000000
--- a/bigtable/tests/retry_test_script.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-# This retry script is processed by the retry server and the client under test.
-# Client tests should parse any command beginning with "CLIENT:", send the corresponding RPC
-# to the retry server and expect a valid response.
-# "EXPECT" commands indicate the call the server is expecting the client to send.
-#
-# The retry server has one table named "table" that should be used for testing.
-# There are three types of commands supported:
-# READ <comma-separated list of row ids to read>
-#     Expect the corresponding rows to be returned with arbitrary values.
-# SCAN <range>... <comma separated list of row ids to expect>
-#     Ranges are expressed as an interval with either open or closed start and end,
-#     such as [1,3) for "1,2" or (1, 3] for "2,3".
-# WRITE <comma-separated list of row ids to write>
-#     All writes should succeed eventually. Value payload is ignored.
-# The server writes PASS or FAIL on a line by itself to STDOUT depending on the result of the test.
-# All other server output should be ignored.
-
-# Echo same scan back after immediate error
-CLIENT: SCAN [r1,r3) r1,r2
-EXPECT: SCAN [r1,r3)
-SERVER: ERROR Unavailable
-EXPECT: SCAN [r1,r3)
-SERVER: READ_RESPONSE r1,r2
-
-# Retry scans with open interval starting at the least read row key.
-# Instead of using open intervals for retry ranges, '\x00' can be
-# appended to the last received row key and sent in a closed interval.
-CLIENT: SCAN [r1,r9) r1,r2,r3,r4,r5,r6,r7,r8
-EXPECT: SCAN [r1,r9)
-SERVER: READ_RESPONSE r1,r2,r3,r4
-SERVER: ERROR Unavailable
-EXPECT: SCAN (r4,r9)
-SERVER: ERROR Unavailable
-EXPECT: SCAN (r4,r9)
-SERVER: READ_RESPONSE r5,r6,r7
-SERVER: ERROR Unavailable
-EXPECT: SCAN (r7,r9)
-SERVER: READ_RESPONSE r8
diff --git a/bigtable/tests/system.py b/bigtable/tests/system.py
index 5a5b4324cbbeb..1fcda808db397 100644
--- a/bigtable/tests/system.py
+++ b/bigtable/tests/system.py
@@ -295,84 +295,6 @@ def test_delete_column_family(self):
         # Make sure we have successfully deleted it.
         self.assertEqual(temp_table.list_column_families(), {})
 
-    def test_retry(self):
-        import subprocess, os, stat, platform
-        from google.cloud.bigtable.client import Client
-        from google.cloud.bigtable.instance import Instance
-        from google.cloud.bigtable.table import Table
-
-        # import for urlopen based on version
-        try:
-            # python 3
-            from urllib.request import urlopen
-        except ImportError:
-            # python 2
-            from urllib2 import urlopen
-
-
-        TEST_SCRIPT = 'tests/retry_test_script.txt'
-        SERVER_NAME = 'retry_server'
-        SERVER_ZIP = SERVER_NAME + ".tar.gz"
-
-        def process_scan(table, range, ids):
-            range_chunks = range.split(",")
-            range_open = range_chunks[0].lstrip("[")
-            range_close = range_chunks[1].rstrip(")")
-            rows = table.read_rows(range_open, range_close)
-            rows.consume_all()
-
-        # Download server
-        MOCK_SERVER_URLS = {
-            'Linux': 'https://storage.googleapis.com/cloud-bigtable-test/retries/retry_server_linux.tar.gz',
-            'Darwin': 'https://storage.googleapis.com/cloud-bigtable-test/retries/retry_server_mac.tar.gz',
-        }
-
-        test_platform = platform.system()
-        if test_platform not in MOCK_SERVER_URLS:
-            self.skip('Retry server not available for platform {0}.'.format(test_platform))
-
-        mock_server_download = urlopen(MOCK_SERVER_URLS[test_platform]).read()
-        mock_server_file = open(SERVER_ZIP, 'wb')
-        mock_server_file.write(mock_server_download)
-
-        # Unzip server
-        subprocess.call(['tar', 'zxvf', SERVER_ZIP, '-C', '.'])
-
-        # Connect to server
-        server = subprocess.Popen(
-            ['./' + SERVER_NAME, '--script=' + TEST_SCRIPT],
-            stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-        )
-
-        (endpoint, port) = server.stdout.readline().rstrip("\n").split(":")
-        os.environ["BIGTABLE_EMULATOR_HOST"] = endpoint + ":" + port
-        client = Client(project="client", admin=True)
-        instance = Instance("instance", client)
-        table = instance.table("table")
-
-        # Run test, line by line
-        with open(TEST_SCRIPT, 'r') as script:
-            for line in script.readlines():
-                if line.startswith("CLIENT:"):
-                    chunks = line.split(" ")
-                    op = chunks[1]
-                    process_scan(table, chunks[2], chunks[3])
-
-        # Check that the test passed
-        server.kill()
-        server_stdout_lines = []
-        while True:
-            line = server.stdout.readline()
-            if line != '':
-                server_stdout_lines.append(line)
-            else:
-                break
-        self.assertEqual(server_stdout_lines[-1], "PASS\n")
-
-        # Clean up
-        os.remove(SERVER_ZIP)
-        os.remove(SERVER_NAME)
 
 class TestDataAPI(unittest.TestCase):
 
diff --git a/bigtable/tests/unit/_testing.py b/bigtable/tests/unit/_testing.py
index 7587c66c133be..e67af6a1498c3 100644
--- a/bigtable/tests/unit/_testing.py
+++ b/bigtable/tests/unit/_testing.py
@@ -14,6 +14,7 @@
 
 """Mocks used to emulate gRPC generated objects."""
 
+
 class _FakeStub(object):
     """Acts as a gPRC stub."""
 
@@ -26,16 +27,6 @@ def __getattr__(self, name):
         # since __getattribute__ will handle them.
         return _MethodMock(name, self)
 
-class _CustomFakeStub(object):
-    """Acts as a gRPC stub.  Generates a result using an injected callable."""
-    def __init__(self, result_callable):
-        self.result_callable = result_callable
-        self.method_calls = []
-
-    def __getattr__(self, name):
-        # We need not worry about attributes set in constructor
-        # since __getattribute__ will handle them.
-        return _CustomMethodMock(name, self)
 
 class _MethodMock(object):
     """Mock for API method attached to a gRPC stub.
@@ -51,19 +42,5 @@ def __call__(self, *args, **kwargs):
         """Sync method meant to mock a gRPC stub request."""
         self._stub.method_calls.append((self._name, args, kwargs))
         curr_result, self._stub.results = (self._stub.results[0],
-                                       self._stub.results[1:])
+                                           self._stub.results[1:])
         return curr_result
-
-class _CustomMethodMock(object):
-    """
-    Same as _MethodMock, but backed by an injected callable.
-    """
-
-    def __init__(self, name, stub):
-        self._name = name
-        self._stub = stub
-
-    def __call__(self, *args, **kwargs):
-        """Sync method meant to mock a gRPC stub request."""
-        self._stub.method_calls.append((self._name, args, kwargs))
-        return self._stub.result_callable()
diff --git a/bigtable/tests/unit/test_table.py b/bigtable/tests/unit/test_table.py
index c59667d6a8211..dc4d2b5bbad08 100644
--- a/bigtable/tests/unit/test_table.py
+++ b/bigtable/tests/unit/test_table.py
@@ -493,8 +493,7 @@ def test_read_rows(self):
         from google.cloud._testing import _Monkey
         from tests.unit._testing import _FakeStub
         from google.cloud.bigtable.row_data import PartialRowsData
-        from google.cloud.bigtable import retry as MUT
-        from google.cloud.bigtable.retry import ReadRowsIterator
+        from google.cloud.bigtable import table as MUT
 
         client = _Client()
         instance = _Instance(self.INSTANCE_NAME, client=client)
@@ -514,18 +513,20 @@ def mock_create_row_request(table_name, **kwargs):
         # Patch the stub used by the API method.
         client._data_stub = stub = _FakeStub(response_iterator)
 
+        # Create expected_result.
+        expected_result = PartialRowsData(response_iterator)
+
+        # Perform the method and check the result.
         start_key = b'start-key'
         end_key = b'end-key'
         filter_obj = object()
         limit = 22
         with _Monkey(MUT, _create_row_request=mock_create_row_request):
-            # Perform the method and check the result.
             result = table.read_rows(
                 start_key=start_key, end_key=end_key, filter_=filter_obj,
                 limit=limit)
 
-        self.assertIsInstance(result._response_iterator, ReadRowsIterator)
-        self.assertEqual(result._response_iterator.client, client)
+        self.assertEqual(result, expected_result)
         self.assertEqual(stub.method_calls, [(
             'ReadRows',
             (request_pb,),
@@ -536,166 +537,9 @@ def mock_create_row_request(table_name, **kwargs):
             'end_key': end_key,
             'filter_': filter_obj,
             'limit': limit,
-            'start_key_closed': True,
         }
         self.assertEqual(mock_created, [(table.name, created_kwargs)])
 
-    def test_read_rows_one_chunk(self):
-        from google.cloud._testing import _Monkey
-        from tests.unit._testing import _FakeStub
-        from google.cloud.bigtable import retry as MUT
-        from google.cloud.bigtable.retry import ReadRowsIterator
-        from google.cloud.bigtable.row_data import Cell
-        from google.cloud.bigtable.row_data import PartialRowsData
-
-        client = _Client()
-        instance = _Instance(self.INSTANCE_NAME, client=client)
-        table = self._make_one(self.TABLE_ID, instance)
-
-        # Create request_pb
-        request_pb = object()  # Returned by our mock.
-        mock_created = []
-
-        def mock_create_row_request(table_name, **kwargs):
-            mock_created.append((table_name, kwargs))
-            return request_pb
-
-        # Create response_iterator
-        chunk = _ReadRowsResponseCellChunkPB(
-            row_key=self.ROW_KEY,
-            family_name=self.FAMILY_NAME,
-            qualifier=self.QUALIFIER,
-            timestamp_micros=self.TIMESTAMP_MICROS,
-            value=self.VALUE,
-            commit_row=True,
-        )
-        response_pb = _ReadRowsResponsePB(chunks=[chunk])
-        response_iterator = iter([response_pb])
-
-        # Patch the stub used by the API method.
-        client._data_stub = stub = _FakeStub(response_iterator)
-
-        start_key = b'start-key'
-        end_key = b'end-key'
-        filter_obj = object()
-        limit = 22
-        with _Monkey(MUT, _create_row_request=mock_create_row_request):
-            # Perform the method and check the result.
-            result = table.read_rows(
-                start_key=start_key, end_key=end_key, filter_=filter_obj,
-                limit=limit)
-            result.consume_all()
-
-    def test_read_rows_retry_timeout(self):
-        from google.cloud._testing import _Monkey
-        from tests.unit._testing import _CustomFakeStub
-        from google.cloud.bigtable.row_data import PartialRowsData
-        from google.cloud.bigtable import retry as MUT
-        from google.cloud.bigtable.retry import ReadRowsIterator
-        from google.gax import BackoffSettings
-        from google.gax.errors import RetryError
-        from grpc import StatusCode, RpcError
-        import time
-
-        client = _Client()
-        instance = _Instance(self.INSTANCE_NAME, client=client)
-        table = self._make_one(self.TABLE_ID, instance)
-
-        # Create request_pb
-        request_pb = object()  # Returned by our mock.
-        mock_created = []
-
-        def mock_create_row_request(table_name, **kwargs):
-            mock_created.append((table_name, kwargs))
-            return request_pb
-
-        # Create a slow response iterator to cause a timeout
-        class MockTimeoutError(RpcError):
-            def code(self):
-                return StatusCode.DEADLINE_EXCEEDED
-
-        def _wait_then_raise():
-            time.sleep(0.1)
-            raise MockTimeoutError()
-
-        # Patch the stub used by the API method.  The stub should create a new
-        # slow_iterator every time its queried.
-        def make_slow_iterator():
-            return (_wait_then_raise() for i in range(10))
-        client._data_stub = stub = _CustomFakeStub(make_slow_iterator)
-
-        # Set to timeout before RPC completes
-        test_backoff_settings = BackoffSettings(
-            initial_retry_delay_millis=10,
-            retry_delay_multiplier=0.3,
-            max_retry_delay_millis=30000,
-            initial_rpc_timeout_millis=1000,
-            rpc_timeout_multiplier=1.0,
-            max_rpc_timeout_millis=25 * 60 * 1000,
-            total_timeout_millis=1000
-        )
-
-        start_key = b'start-key'
-        end_key = b'end-key'
-        filter_obj = object()
-        limit = 22
-        with _Monkey(MUT, _create_row_request=mock_create_row_request):
-            # Verify that a RetryError is thrown on read.
-            result = table.read_rows(
-                start_key=start_key, end_key=end_key, filter_=filter_obj,
-                limit=limit, backoff_settings=test_backoff_settings)
-            with self.assertRaises(RetryError):
-                result.consume_next()
-
-    def test_read_rows_non_idempotent_error_throws(self):
-        from google.cloud._testing import _Monkey
-        from tests.unit._testing import _CustomFakeStub
-        from google.cloud.bigtable.row_data import PartialRowsData
-        from google.cloud.bigtable import retry as MUT
-        from google.cloud.bigtable.retry import ReadRowsIterator
-        from google.gax import BackoffSettings
-        from google.gax.errors import RetryError
-        from grpc import StatusCode, RpcError
-        import time
-
-        client = _Client()
-        instance = _Instance(self.INSTANCE_NAME, client=client)
-        table = self._make_one(self.TABLE_ID, instance)
-
-        # Create request_pb
-        request_pb = object()  # Returned by our mock.
-        mock_created = []
-
-        def mock_create_row_request(table_name, **kwargs):
-            mock_created.append((table_name, kwargs))
-            return request_pb
-
-        # Create response iterator that raises a non-idempotent exception
-        class MockNonIdempotentError(RpcError):
-            def code(self):
-                return StatusCode.RESOURCE_EXHAUSTED
-
-        def _raise():
-            raise MockNonIdempotentError()
-
-        # Patch the stub used by the API method.  The stub should create a new
-        # slow_iterator every time its queried.
-        def make_raising_iterator():
-            return (_raise() for i in range(10))
-        client._data_stub = stub = _CustomFakeStub(make_raising_iterator)
-
-        start_key = b'start-key'
-        end_key = b'end-key'
-        filter_obj = object()
-        limit = 22
-        with _Monkey(MUT, _create_row_request=mock_create_row_request):
-            # Verify that a RetryError is thrown on read.
-            result = table.read_rows(
-                start_key=start_key, end_key=end_key, filter_=filter_obj,
-                limit=limit)
-            with self.assertRaises(MockNonIdempotentError):
-                result.consume_next()
-
     def test_sample_row_keys(self):
         from tests.unit._testing import _FakeStub
 
@@ -728,12 +572,12 @@ def test_sample_row_keys(self):
 class Test__create_row_request(unittest.TestCase):
 
     def _call_fut(self, table_name, row_key=None, start_key=None, end_key=None,
-                  start_key_closed=True, filter_=None, limit=None):
-        from google.cloud.bigtable.retry import _create_row_request
+                  filter_=None, limit=None):
+        from google.cloud.bigtable.table import _create_row_request
 
         return _create_row_request(
             table_name, row_key=row_key, start_key=start_key, end_key=end_key,
-            start_key_closed=start_key_closed, filter_=filter_, limit=limit)
+            filter_=filter_, limit=limit)
 
     def test_table_name_only(self):
         table_name = 'table_name'
@@ -756,7 +600,7 @@ def test_row_key(self):
         expected_result.rows.row_keys.append(row_key)
         self.assertEqual(result, expected_result)
 
-    def test_row_range_start_key_closed(self):
+    def test_row_range_start_key(self):
         table_name = 'table_name'
         start_key = b'start_key'
         result = self._call_fut(table_name, start_key=start_key)
@@ -764,15 +608,6 @@ def test_row_range_start_key_closed(self):
         expected_result.rows.row_ranges.add(start_key_closed=start_key)
         self.assertEqual(result, expected_result)
 
-    def test_row_range_start_key_open(self):
-        table_name = 'table_name'
-        start_key = b'start_key'
-        result = self._call_fut(table_name, start_key=start_key,
-            start_key_closed=False)
-        expected_result = _ReadRowsRequestPB(table_name=table_name)
-        expected_result.rows.row_ranges.add(start_key_open=start_key)
-        self.assertEqual(result, expected_result)
-
     def test_row_range_end_key(self):
         table_name = 'table_name'
         end_key = b'end_key'

From 4f4129d7d02b8ae5ea39d2b545ba179fc52b84c5 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Thu, 20 Jul 2017 10:18:50 -0700
Subject: [PATCH 098/211] Remove references to google.cloud.operation from
 spanner (#3625)

* Remove references to google.cloud.operation from spanner

* Remove unused import
---
 spanner/google/cloud/spanner/database.py | 11 +----------
 spanner/google/cloud/spanner/instance.py | 11 ++---------
 spanner/tests/unit/test_database.py      |  4 ----
 spanner/tests/unit/test_instance.py      |  4 ----
 4 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/spanner/google/cloud/spanner/database.py b/spanner/google/cloud/spanner/database.py
index 12af9ca20edb6..a449f304bf79e 100644
--- a/spanner/google/cloud/spanner/database.py
+++ b/spanner/google/cloud/spanner/database.py
@@ -18,8 +18,6 @@
 
 from google.gax.errors import GaxError
 from google.gax.grpc import exc_to_code
-from google.cloud.proto.spanner.admin.database.v1 import (
-    spanner_database_admin_pb2 as admin_v1_pb2)
 from google.cloud.gapic.spanner.v1.spanner_client import SpannerClient
 from grpc import StatusCode
 import six
@@ -27,7 +25,6 @@
 # pylint: disable=ungrouped-imports
 from google.cloud.exceptions import Conflict
 from google.cloud.exceptions import NotFound
-from google.cloud.operation import register_type
 from google.cloud.spanner import __version__
 from google.cloud.spanner._helpers import _options_with_prefix
 from google.cloud.spanner.batch import Batch
@@ -44,10 +41,6 @@
     r'databases/(?P<database_id>[a-z][a-z0-9_\-]*[a-z0-9])$'
     )
 
-register_type(admin_v1_pb2.Database)
-register_type(admin_v1_pb2.CreateDatabaseMetadata)
-register_type(admin_v1_pb2.UpdateDatabaseDdlMetadata)
-
 
 class Database(object):
     """Representation of a Cloud Spanner Database.
@@ -205,7 +198,6 @@ def create(self):
                 ))
             raise
 
-        future.caller_metadata = {'request_type': 'CreateDatabase'}
         return future
 
     def exists(self):
@@ -252,7 +244,7 @@ def update_ddl(self, ddl_statements):
         See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.UpdateDatabase
 
-        :rtype: :class:`google.cloud.operation.Operation`
+        :rtype: :class:`google.cloud.future.operation.Operation`
         :returns: an operation instance
         """
         client = self._instance._client
@@ -267,7 +259,6 @@ def update_ddl(self, ddl_statements):
                 raise NotFound(self.name)
             raise
 
-        future.caller_metadata = {'request_type': 'UpdateDatabaseDdl'}
         return future
 
     def drop(self):
diff --git a/spanner/google/cloud/spanner/instance.py b/spanner/google/cloud/spanner/instance.py
index 711b8c4898532..e67a0c31be6c5 100644
--- a/spanner/google/cloud/spanner/instance.py
+++ b/spanner/google/cloud/spanner/instance.py
@@ -28,7 +28,6 @@
 from google.cloud.exceptions import Conflict
 from google.cloud.exceptions import NotFound
 from google.cloud.iterator import GAXIterator
-from google.cloud.operation import register_type
 from google.cloud.spanner._helpers import _options_with_prefix
 from google.cloud.spanner.database import Database
 from google.cloud.spanner.pool import BurstyPool
@@ -41,10 +40,6 @@
 
 DEFAULT_NODE_COUNT = 1
 
-register_type(admin_v1_pb2.Instance)
-register_type(admin_v1_pb2.CreateInstanceMetadata)
-register_type(admin_v1_pb2.UpdateInstanceMetadata)
-
 
 class Instance(object):
     """Representation of a Cloud Spanner Instance.
@@ -204,7 +199,7 @@ def create(self):
 
            before calling :meth:`create`.
 
-        :rtype: :class:`google.cloud.operation.Operation`
+        :rtype: :class:`google.cloud.future.operation.Operation`
         :returns: an operation instance
         """
         api = self._client.instance_admin_api
@@ -228,7 +223,6 @@ def create(self):
                 raise Conflict(self.name)
             raise
 
-        future.caller_metadata = {'request_type': 'CreateInstance'}
         return future
 
     def exists(self):
@@ -285,7 +279,7 @@ def update(self):
 
             before calling :meth:`update`.
 
-        :rtype: :class:`google.cloud.operation.Operation`
+        :rtype: :class:`google.cloud.future.operation.Operation`
         :returns: an operation instance
         """
         api = self._client.instance_admin_api
@@ -309,7 +303,6 @@ def update(self):
                 raise NotFound(self.name)
             raise
 
-        future.caller_metadata = {'request_type': 'UpdateInstance'}
         return future
 
     def delete(self):
diff --git a/spanner/tests/unit/test_database.py b/spanner/tests/unit/test_database.py
index 5200a0ab7d1b0..6216d8a348fd9 100644
--- a/spanner/tests/unit/test_database.py
+++ b/spanner/tests/unit/test_database.py
@@ -312,8 +312,6 @@ def test_create_success(self):
         future = database.create()
 
         self.assertIs(future, op_future)
-        self.assertEqual(future.caller_metadata,
-                         {'request_type': 'CreateDatabase'})
 
         (parent, create_statement, extra_statements,
          options) = api._created_database
@@ -493,8 +491,6 @@ def test_update_ddl(self):
         future = database.update_ddl(DDL_STATEMENTS)
 
         self.assertIs(future, op_future)
-        self.assertEqual(future.caller_metadata,
-                         {'request_type': 'UpdateDatabaseDdl'})
 
         name, statements, op_id, options = api._updated_database_ddl
         self.assertEqual(name, self.DATABASE_NAME)
diff --git a/spanner/tests/unit/test_instance.py b/spanner/tests/unit/test_instance.py
index d86c611b3ccba..ca8edacf3b817 100644
--- a/spanner/tests/unit/test_instance.py
+++ b/spanner/tests/unit/test_instance.py
@@ -241,8 +241,6 @@ def test_create_success(self):
         future = instance.create()
 
         self.assertIs(future, op_future)
-        self.assertEqual(future.caller_metadata,
-                         {'request_type': 'CreateInstance'})
 
         (parent, instance_id, instance, options) = api._created_instance
         self.assertEqual(parent, self.PARENT)
@@ -424,8 +422,6 @@ def test_update_success(self):
         future = instance.update()
 
         self.assertIs(future, op_future)
-        self.assertEqual(future.caller_metadata,
-                         {'request_type': 'UpdateInstance'})
 
         instance, field_mask, options = api._updated_instance
         self.assertEqual(field_mask.paths,

From 5ea61e4dd462ba612f83fa3e817feb7ad08d363e Mon Sep 17 00:00:00 2001
From: Dan O'Meara <omeara.dan@gmail.com>
Date: Thu, 20 Jul 2017 10:24:06 -0700
Subject: [PATCH 099/211] Add Video Intelligence to README (#3628)

* Add Video Intelligence to README

Add Video Intelligence to list of APIs supported at Beta.  Link to PyPi and package README.

* Adding "Google" to "Cloud Video Intellegence" link.
---
 README.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 5e3615da46f9d..9b3d9f0db64e3 100644
--- a/README.rst
+++ b/README.rst
@@ -34,6 +34,7 @@ The following client libraries have **beta** support:
 -  `Google Cloud Vision`_ (`Vision README`_)
 -  `Google Cloud Natural Language`_ (`Natural Language README`_)
 -  `Google Cloud Translation`_ (`Translation README`_)
+-  `Google Cloud Video Intelligence`_ (`Video Intelligence README`_)
 
 **Beta** indicates that the client library for a particular service is
 mostly stable and is being prepared for release. Issues and requests
@@ -89,8 +90,10 @@ updates. See `versioning`_ for more details.
 .. _HappyBase README: https://github.com/GoogleCloudPlatform/google-cloud-python-happybase
 .. _Google Cloud Runtime Configuration: https://cloud.google.com/deployment-manager/runtime-configurator/
 .. _Runtime Config README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/runtimeconfig
-.. _Cloud Spanner: https://cloud.google.com/spanner/
+.. _Cloud Spanner: https://pypi.python.org/pypi/google-cloud-spanner
 .. _Cloud Spanner README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/spanner
+.. _Google Cloud Video Intelligence: https://pypi.python.org/pypi/google-cloud-videointelligence
+.. _Video Intelligence README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/videointelligence
 .. _versioning: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/CONTRIBUTING.rst#versioning
 
 If you need support for other Google APIs, check out the

From 08021bd85df19d073b33412dbd4ff4dbc8be008d Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Thu, 20 Jul 2017 10:24:22 -0700
Subject: [PATCH 100/211] Adding badge images to Video Intelligence README.
 (#3639)

---
 videointelligence/README.rst | 5 +++++
 videointelligence/nox.py     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/videointelligence/README.rst b/videointelligence/README.rst
index e294919b77bef..fff70efacf7b4 100644
--- a/videointelligence/README.rst
+++ b/videointelligence/README.rst
@@ -35,3 +35,8 @@ learning models in an easy to use REST API.
 
 .. _Video Intelligence: https://cloud.google.com/videointelligence/
 .. _Video Intelligence API docs: https://cloud.google.com/videointelligence/reference/rest/
+
+.. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-videointelligence.svg
+   :target: https://pypi.org/project/google-cloud-videointelligence/
+.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-videointelligence.svg
+   :target: https://pypi.org/project/google-cloud-videointelligence/
diff --git a/videointelligence/nox.py b/videointelligence/nox.py
index ceba6ff514e59..a76156e43a41b 100644
--- a/videointelligence/nox.py
+++ b/videointelligence/nox.py
@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc.
+# Copyright 2017 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

From 6ff37256bbebef42223eca688335a41ea29ca808 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Thu, 20 Jul 2017 10:40:24 -0700
Subject: [PATCH 101/211] Adding Bigtable Cluster location on create() request.
 (#3646)

---
 bigtable/google/cloud/bigtable/cluster.py | 1 +
 bigtable/tests/unit/test_cluster.py       | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/bigtable/google/cloud/bigtable/cluster.py b/bigtable/google/cloud/bigtable/cluster.py
index 80b9068958db8..8f7321b2a5486 100644
--- a/bigtable/google/cloud/bigtable/cluster.py
+++ b/bigtable/google/cloud/bigtable/cluster.py
@@ -49,6 +49,7 @@ def _prepare_create_request(cluster):
         parent=cluster._instance.name,
         cluster_id=cluster.cluster_id,
         cluster=data_v2_pb2.Cluster(
+            location=cluster.location,
             serve_nodes=cluster.serve_nodes,
         ),
     )
diff --git a/bigtable/tests/unit/test_cluster.py b/bigtable/tests/unit/test_cluster.py
index 3cc40964ba492..3eb18f43863db 100644
--- a/bigtable/tests/unit/test_cluster.py
+++ b/bigtable/tests/unit/test_cluster.py
@@ -393,12 +393,14 @@ def test_it(self):
         instance = _Instance(INSTANCE_ID, client)
         cluster = Cluster(CLUSTER_ID, instance,
                           serve_nodes=SERVE_NODES)
+        cluster.location = u'projects/prahj-ekt/locations/zona-tres'
 
         request_pb = self._call_fut(cluster)
 
         self.assertEqual(request_pb.cluster_id, CLUSTER_ID)
         self.assertEqual(request_pb.parent, instance.name)
         self.assertEqual(request_pb.cluster.serve_nodes, SERVE_NODES)
+        self.assertEqual(request_pb.cluster.location, cluster.location)
 
 
 def _ClusterPB(*args, **kw):

From 1ed681b443e185b40e5bb67cbb0f12f26f381a26 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Thu, 20 Jul 2017 11:00:26 -0700
Subject: [PATCH 102/211] Update bigtable to use future.operation (#3623)

---
 bigtable/google/cloud/bigtable/cluster.py  | 37 +++++++++++-----------
 bigtable/google/cloud/bigtable/instance.py | 17 ++++------
 bigtable/tests/system.py                   | 27 ++--------------
 bigtable/tests/unit/test_cluster.py        | 23 ++++++--------
 bigtable/tests/unit/test_instance.py       | 21 ++++++------
 5 files changed, 46 insertions(+), 79 deletions(-)

diff --git a/bigtable/google/cloud/bigtable/cluster.py b/bigtable/google/cloud/bigtable/cluster.py
index 8f7321b2a5486..8d15547efae38 100644
--- a/bigtable/google/cloud/bigtable/cluster.py
+++ b/bigtable/google/cloud/bigtable/cluster.py
@@ -21,9 +21,7 @@
     instance_pb2 as data_v2_pb2)
 from google.cloud.bigtable._generated import (
     bigtable_instance_admin_pb2 as messages_v2_pb2)
-from google.cloud.operation import Operation
-from google.cloud.operation import register_type
-
+from google.cloud.future import operation
 
 _CLUSTER_NAME_RE = re.compile(r'^projects/(?P<project>[^/]+)/'
                               r'instances/(?P<instance>[^/]+)/clusters/'
@@ -33,9 +31,6 @@
 """Default number of nodes to use when creating a cluster."""
 
 
-register_type(messages_v2_pb2.UpdateClusterMetadata)
-
-
 def _prepare_create_request(cluster):
     """Creates a protobuf request for a CreateCluster request.
 
@@ -208,15 +203,18 @@ def create(self):
         :returns: The long-running operation corresponding to the
                   create operation.
         """
-        request_pb = _prepare_create_request(self)
-        # We expect a `google.longrunning.operations_pb2.Operation`.
         client = self._instance._client
+
+        # We expect a `google.longrunning.operations_pb2.Operation`.
+        request_pb = _prepare_create_request(self)
         operation_pb = client._instance_stub.CreateCluster(request_pb)
 
-        operation = Operation.from_pb(operation_pb, client)
-        operation.target = self
-        operation.caller_metadata['request_type'] = 'CreateCluster'
-        return operation
+        operation_future = operation.from_grpc(
+            operation_pb,
+            client._operations_stub,
+            data_v2_pb2.Cluster,
+            metadata_type=messages_v2_pb2.UpdateClusterMetadata)
+        return operation_future
 
     def update(self):
         """Update this cluster.
@@ -236,18 +234,21 @@ def update(self):
         :returns: The long-running operation corresponding to the
                   update operation.
         """
+        client = self._instance._client
+
+        # We expect a `google.longrunning.operations_pb2.Operation`.
         request_pb = data_v2_pb2.Cluster(
             name=self.name,
             serve_nodes=self.serve_nodes,
         )
-        # We expect a `google.longrunning.operations_pb2.Operation`.
-        client = self._instance._client
         operation_pb = client._instance_stub.UpdateCluster(request_pb)
 
-        operation = Operation.from_pb(operation_pb, client)
-        operation.target = self
-        operation.caller_metadata['request_type'] = 'UpdateCluster'
-        return operation
+        operation_future = operation.from_grpc(
+            operation_pb,
+            client._operations_stub,
+            data_v2_pb2.Cluster,
+            metadata_type=messages_v2_pb2.UpdateClusterMetadata)
+        return operation_future
 
     def delete(self):
         """Delete this cluster.
diff --git a/bigtable/google/cloud/bigtable/instance.py b/bigtable/google/cloud/bigtable/instance.py
index 1de3cbcea8147..958f166029533 100644
--- a/bigtable/google/cloud/bigtable/instance.py
+++ b/bigtable/google/cloud/bigtable/instance.py
@@ -26,8 +26,7 @@
 from google.cloud.bigtable.cluster import Cluster
 from google.cloud.bigtable.cluster import DEFAULT_SERVE_NODES
 from google.cloud.bigtable.table import Table
-from google.cloud.operation import Operation
-from google.cloud.operation import register_type
+from google.cloud.future import operation
 
 
 _EXISTING_INSTANCE_LOCATION_ID = 'see-existing-cluster'
@@ -35,10 +34,6 @@
                                r'instances/(?P<instance_id>[a-z][-a-z0-9]*)$')
 
 
-register_type(messages_v2_pb2.CreateInstanceMetadata)
-register_type(data_v2_pb2.Instance)
-
-
 def _prepare_create_request(instance):
     """Creates a protobuf request for a CreateInstance request.
 
@@ -232,10 +227,12 @@ def create(self):
         # We expect a `google.longrunning.operations_pb2.Operation`.
         operation_pb = self._client._instance_stub.CreateInstance(request_pb)
 
-        operation = Operation.from_pb(operation_pb, self._client)
-        operation.target = self
-        operation.caller_metadata['request_type'] = 'CreateInstance'
-        return operation
+        operation_future = operation.from_grpc(
+            operation_pb,
+            self._client._operations_stub,
+            data_v2_pb2.Instance,
+            metadata_type=messages_v2_pb2.CreateInstanceMetadata)
+        return operation_future
 
     def update(self):
         """Update this instance.
diff --git a/bigtable/tests/system.py b/bigtable/tests/system.py
index 1fcda808db397..cfc2cb17f8058 100644
--- a/bigtable/tests/system.py
+++ b/bigtable/tests/system.py
@@ -32,7 +32,6 @@
 from google.cloud.environment_vars import BIGTABLE_EMULATOR
 
 from test_utils.retry import RetryErrors
-from test_utils.retry import RetryResult
 from test_utils.system import EmulatorCreds
 from test_utils.system import unique_resource_id
 
@@ -65,27 +64,6 @@ class Config(object):
     IN_EMULATOR = False
 
 
-def _wait_until_complete(operation, max_attempts=5):
-    """Wait until an operation has completed.
-
-    :type operation: :class:`google.cloud.operation.Operation`
-    :param operation: Operation that has not completed.
-
-    :type max_attempts: int
-    :param max_attempts: (Optional) The maximum number of times to check if
-                         the operation has completed. Defaults to 5.
-
-    :rtype: bool
-    :returns: Boolean indicating if the operation is complete.
-    """
-
-    def _operation_complete(result):
-        return result
-
-    retry = RetryResult(_operation_complete, max_tries=max_attempts)
-    return retry(operation.poll)()
-
-
 def _retry_on_unavailable(exc):
     """Retry only errors whose status code is 'UNAVAILABLE'."""
     from grpc import StatusCode
@@ -117,8 +95,7 @@ def setUpModule():
 
         # After listing, create the test instance.
         created_op = Config.INSTANCE.create()
-        if not _wait_until_complete(created_op):
-            raise RuntimeError('Instance creation exceed 5 seconds.')
+        created_op.result(timeout=10)
 
 
 def tearDownModule():
@@ -166,7 +143,7 @@ def test_create_instance(self):
         self.instances_to_delete.append(instance)
 
         # We want to make sure the operation completes.
-        self.assertTrue(_wait_until_complete(operation))
+        operation.result(timeout=10)
 
         # Create a new instance instance and make sure it is the same.
         instance_alt = Config.CLIENT.instance(ALT_INSTANCE_ID, LOCATION_ID)
diff --git a/bigtable/tests/unit/test_cluster.py b/bigtable/tests/unit/test_cluster.py
index 3eb18f43863db..e244b55d6dff6 100644
--- a/bigtable/tests/unit/test_cluster.py
+++ b/bigtable/tests/unit/test_cluster.py
@@ -15,6 +15,8 @@
 
 import unittest
 
+import mock
+
 
 class TestCluster(unittest.TestCase):
 
@@ -232,7 +234,7 @@ def test_reload(self):
 
     def test_create(self):
         from google.longrunning import operations_pb2
-        from google.cloud.operation import Operation
+        from google.cloud.future import operation
         from google.cloud.bigtable._generated import (
             bigtable_instance_admin_pb2 as messages_v2_pb2)
         from tests.unit._testing import _FakeStub
@@ -256,13 +258,9 @@ def test_create(self):
         # Perform the method and check the result.
         result = cluster.create()
 
-        self.assertIsInstance(result, Operation)
-        self.assertEqual(result.name, OP_NAME)
-        self.assertIs(result.target, cluster)
-        self.assertIs(result.client, client)
+        self.assertIsInstance(result, operation.Operation)
+        self.assertEqual(result.operation.name, OP_NAME)
         self.assertIsNone(result.metadata)
-        self.assertEqual(result.caller_metadata,
-                         {'request_type': 'CreateCluster'})
 
         self.assertEqual(len(stub.method_calls), 1)
         api_name, args, kwargs = stub.method_calls[0]
@@ -278,7 +276,7 @@ def test_create(self):
     def test_update(self):
         import datetime
         from google.longrunning import operations_pb2
-        from google.cloud.operation import Operation
+        from google.cloud.future import operation
         from google.protobuf.any_pb2 import Any
         from google.cloud._helpers import _datetime_to_pb_timestamp
         from google.cloud.bigtable._generated import (
@@ -324,15 +322,11 @@ def test_update(self):
 
         result = cluster.update()
 
-        self.assertIsInstance(result, Operation)
-        self.assertEqual(result.name, OP_NAME)
-        self.assertIs(result.target, cluster)
-        self.assertIs(result.client, client)
+        self.assertIsInstance(result, operation.Operation)
+        self.assertEqual(result.operation.name, OP_NAME)
         self.assertIsInstance(result.metadata,
                               messages_v2_pb2.UpdateClusterMetadata)
         self.assertEqual(result.metadata.request_time, NOW_PB)
-        self.assertEqual(result.caller_metadata,
-                         {'request_type': 'UpdateCluster'})
 
         self.assertEqual(len(stub.method_calls), 1)
         api_name, args, kwargs = stub.method_calls[0]
@@ -448,6 +442,7 @@ class _Client(object):
     def __init__(self, project):
         self.project = project
         self.project_name = 'projects/' + self.project
+        self._operations_stub = mock.sentinel.operations_stub
 
     def __eq__(self, other):
         return (other.project == self.project and
diff --git a/bigtable/tests/unit/test_instance.py b/bigtable/tests/unit/test_instance.py
index cdad3c376d0a0..03c0034fc49e8 100644
--- a/bigtable/tests/unit/test_instance.py
+++ b/bigtable/tests/unit/test_instance.py
@@ -15,6 +15,8 @@
 
 import unittest
 
+import mock
+
 
 class TestInstance(unittest.TestCase):
 
@@ -236,7 +238,7 @@ def test_create(self):
             bigtable_instance_admin_pb2 as messages_v2_pb2)
         from google.cloud._helpers import _datetime_to_pb_timestamp
         from tests.unit._testing import _FakeStub
-        from google.cloud.operation import Operation
+        from google.cloud.future import operation
         from google.cloud.bigtable.cluster import DEFAULT_SERVE_NODES
 
         NOW = datetime.datetime.utcnow()
@@ -263,15 +265,11 @@ def test_create(self):
         # Perform the method and check the result.
         result = instance.create()
 
-        self.assertIsInstance(result, Operation)
-        self.assertEqual(result.name, self.OP_NAME)
-        self.assertIs(result.target, instance)
-        self.assertIs(result.client, client)
+        self.assertIsInstance(result, operation.Operation)
+        self.assertEqual(result.operation.name, self.OP_NAME)
         self.assertIsInstance(result.metadata,
                               messages_v2_pb2.CreateInstanceMetadata)
         self.assertEqual(result.metadata.request_time, NOW_PB)
-        self.assertEqual(result.caller_metadata,
-                         {'request_type': 'CreateInstance'})
 
         self.assertEqual(len(stub.method_calls), 1)
         api_name, args, kwargs = stub.method_calls[0]
@@ -291,7 +289,7 @@ def test_create_w_explicit_serve_nodes(self):
         from google.cloud.bigtable._generated import (
             bigtable_instance_admin_pb2 as messages_v2_pb2)
         from tests.unit._testing import _FakeStub
-        from google.cloud.operation import Operation
+        from google.cloud.future import operation
 
         SERVE_NODES = 5
 
@@ -308,10 +306,8 @@ def test_create_w_explicit_serve_nodes(self):
         # Perform the method and check the result.
         result = instance.create()
 
-        self.assertIsInstance(result, Operation)
-        self.assertEqual(result.name, self.OP_NAME)
-        self.assertIs(result.target, instance)
-        self.assertIs(result.client, client)
+        self.assertIsInstance(result, operation.Operation)
+        self.assertEqual(result.operation.name, self.OP_NAME)
 
         self.assertEqual(len(stub.method_calls), 1)
         api_name, args, kwargs = stub.method_calls[0]
@@ -582,6 +578,7 @@ class _Client(object):
     def __init__(self, project):
         self.project = project
         self.project_name = 'projects/' + self.project
+        self._operations_stub = mock.sentinel.operations_stub
 
     def copy(self):
         from copy import deepcopy

From 2ed9426e5597d3676daaee1308788dc34c89c80d Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Thu, 20 Jul 2017 13:08:32 -0700
Subject: [PATCH 103/211] Update auto-gen code for video intelligence (#3643)

---
 .../video_intelligence_service_client.py      |   1 -
 ...eo_intelligence_service_client_config.json |   4 +-
 .../v1beta1/video_intelligence_pb2.py         | 235 +++++++++++++++++-
 .../v1beta1/video_intelligence_pb2_grpc.py    |   2 -
 .../cloud/videointelligence_v1beta1/types.py  |   1 +
 5 files changed, 235 insertions(+), 8 deletions(-)

diff --git a/videointelligence/google/cloud/gapic/videointelligence/v1beta1/video_intelligence_service_client.py b/videointelligence/google/cloud/gapic/videointelligence/v1beta1/video_intelligence_service_client.py
index 733a95c3240ab..5baae515c69ca 100644
--- a/videointelligence/google/cloud/gapic/videointelligence/v1beta1/video_intelligence_service_client.py
+++ b/videointelligence/google/cloud/gapic/videointelligence/v1beta1/video_intelligence_service_client.py
@@ -225,7 +225,6 @@ def annotate_video(self,
           :exc:`google.gax.errors.GaxError` if the RPC is aborted.
           :exc:`ValueError` if the parameters are invalid.
         """
-        # Create the request object.
         request = video_intelligence_pb2.AnnotateVideoRequest(
             input_uri=input_uri,
             features=features,
diff --git a/videointelligence/google/cloud/gapic/videointelligence/v1beta1/video_intelligence_service_client_config.json b/videointelligence/google/cloud/gapic/videointelligence/v1beta1/video_intelligence_service_client_config.json
index 7dd61bbb7b5d0..996b2ab5e30b9 100644
--- a/videointelligence/google/cloud/gapic/videointelligence/v1beta1/video_intelligence_service_client_config.json
+++ b/videointelligence/google/cloud/gapic/videointelligence/v1beta1/video_intelligence_service_client_config.json
@@ -6,9 +6,7 @@
           "DEADLINE_EXCEEDED",
           "UNAVAILABLE"
         ],
-        "non_idempotent": [
-          "UNAVAILABLE"
-        ]
+        "non_idempotent": []
       },
       "retry_params": {
         "default": {
diff --git a/videointelligence/google/cloud/proto/videointelligence/v1beta1/video_intelligence_pb2.py b/videointelligence/google/cloud/proto/videointelligence/v1beta1/video_intelligence_pb2.py
index 9046090f92d73..7eb2e71d7e052 100644
--- a/videointelligence/google/cloud/proto/videointelligence/v1beta1/video_intelligence_pb2.py
+++ b/videointelligence/google/cloud/proto/videointelligence/v1beta1/video_intelligence_pb2.py
@@ -884,6 +884,47 @@
 AnnotateVideoRequest = _reflection.GeneratedProtocolMessageType('AnnotateVideoRequest', (_message.Message,), dict(
   DESCRIPTOR = _ANNOTATEVIDEOREQUEST,
   __module__ = 'google.cloud.proto.videointelligence.v1beta1.video_intelligence_pb2'
+  ,
+  __doc__ = """Video annotation request.
+  
+  
+  Attributes:
+      input_uri:
+          Input video location. Currently, only `Google Cloud Storage
+          <https://cloud.google.com/storage/>`__ URIs are supported,
+          which must be specified in the following format:
+          ``gs://bucket-id/object-id`` (other URI formats return [google
+          .rpc.Code.INVALID\_ARGUMENT][google.rpc.Code.INVALID\_ARGUMENT
+          ]). For more information, see `Request URIs
+          </storage/docs/reference-uris>`__. A video URI may include
+          wildcards in ``object-id``, and thus identify multiple videos.
+          Supported wildcards: '\*' to match 0 or more characters; '?'
+          to match 1 character. If unset, the input video should be
+          embedded in the request as ``input_content``. If set,
+          ``input_content`` should be unset.
+      input_content:
+          The video data bytes. Encoding: base64. If unset, the input
+          video(s) should be specified via ``input_uri``. If set,
+          ``input_uri`` should be unset.
+      features:
+          Requested video annotation features.
+      video_context:
+          Additional video context and/or feature-specific parameters.
+      output_uri:
+          Optional location where the output (in JSON format) should be
+          stored. Currently, only `Google Cloud Storage
+          <https://cloud.google.com/storage/>`__ URIs are supported,
+          which must be specified in the following format:
+          ``gs://bucket-id/object-id`` (other URI formats return [google
+          .rpc.Code.INVALID\_ARGUMENT][google.rpc.Code.INVALID\_ARGUMENT
+          ]). For more information, see `Request URIs
+          </storage/docs/reference-uris>`__.
+      location_id:
+          Optional cloud region where annotation should take place.
+          Supported cloud regions: ``us-east1``, ``us-west1``, ``europe-
+          west1``, ``asia-east1``. If no region is specified, a region
+          will be determined based on video file location.
+  """,
   # @@protoc_insertion_point(class_scope:google.cloud.videointelligence.v1beta1.AnnotateVideoRequest)
   ))
 _sym_db.RegisterMessage(AnnotateVideoRequest)
@@ -891,6 +932,36 @@
 VideoContext = _reflection.GeneratedProtocolMessageType('VideoContext', (_message.Message,), dict(
   DESCRIPTOR = _VIDEOCONTEXT,
   __module__ = 'google.cloud.proto.videointelligence.v1beta1.video_intelligence_pb2'
+  ,
+  __doc__ = """Video context and/or feature-specific parameters.
+  
+  
+  Attributes:
+      segments:
+          Video segments to annotate. The segments may overlap and are
+          not required to be contiguous or span the whole video. If
+          unspecified, each video is treated as a single segment.
+      label_detection_mode:
+          If label detection has been requested, what labels should be
+          detected in addition to video-level labels or segment-level
+          labels. If unspecified, defaults to ``SHOT_MODE``.
+      stationary_camera:
+          Whether the video has been shot from a stationary (i.e. non-
+          moving) camera. When set to true, might improve detection
+          accuracy for moving objects.
+      label_detection_model:
+          Model to use for label detection. Supported values: "latest"
+          and "stable" (the default).
+      face_detection_model:
+          Model to use for face detection. Supported values: "latest"
+          and "stable" (the default).
+      shot_change_detection_model:
+          Model to use for shot change detection. Supported values:
+          "latest" and "stable" (the default).
+      safe_search_detection_model:
+          Model to use for safe search detection. Supported values:
+          "latest" and "stable" (the default).
+  """,
   # @@protoc_insertion_point(class_scope:google.cloud.videointelligence.v1beta1.VideoContext)
   ))
 _sym_db.RegisterMessage(VideoContext)
@@ -898,6 +969,16 @@
 VideoSegment = _reflection.GeneratedProtocolMessageType('VideoSegment', (_message.Message,), dict(
   DESCRIPTOR = _VIDEOSEGMENT,
   __module__ = 'google.cloud.proto.videointelligence.v1beta1.video_intelligence_pb2'
+  ,
+  __doc__ = """Video segment.
+  
+  
+  Attributes:
+      start_time_offset:
+          Start offset in microseconds (inclusive). Unset means 0.
+      end_time_offset:
+          End offset in microseconds (inclusive). Unset means 0.
+  """,
   # @@protoc_insertion_point(class_scope:google.cloud.videointelligence.v1beta1.VideoSegment)
   ))
 _sym_db.RegisterMessage(VideoSegment)
@@ -905,6 +986,21 @@
 LabelLocation = _reflection.GeneratedProtocolMessageType('LabelLocation', (_message.Message,), dict(
   DESCRIPTOR = _LABELLOCATION,
   __module__ = 'google.cloud.proto.videointelligence.v1beta1.video_intelligence_pb2'
+  ,
+  __doc__ = """Label location.
+  
+  
+  Attributes:
+      segment:
+          Video segment. Set to [-1, -1] for video-level labels. Set to
+          [timestamp, timestamp] for frame-level labels. Otherwise,
+          corresponds to one of ``AnnotateSpec.segments`` (if specified)
+          or to shot boundaries (if requested).
+      confidence:
+          Confidence that the label is accurate. Range: [0, 1].
+      level:
+          Label level.
+  """,
   # @@protoc_insertion_point(class_scope:google.cloud.videointelligence.v1beta1.LabelLocation)
   ))
 _sym_db.RegisterMessage(LabelLocation)
@@ -912,6 +1008,18 @@
 LabelAnnotation = _reflection.GeneratedProtocolMessageType('LabelAnnotation', (_message.Message,), dict(
   DESCRIPTOR = _LABELANNOTATION,
   __module__ = 'google.cloud.proto.videointelligence.v1beta1.video_intelligence_pb2'
+  ,
+  __doc__ = """Label annotation.
+  
+  
+  Attributes:
+      description:
+          Textual description, e.g. ``Fixed-gear bicycle``.
+      language_code:
+          Language code for ``description`` in BCP-47 format.
+      locations:
+          Where the label was detected and with what confidence.
+  """,
   # @@protoc_insertion_point(class_scope:google.cloud.videointelligence.v1beta1.LabelAnnotation)
   ))
 _sym_db.RegisterMessage(LabelAnnotation)
@@ -919,6 +1027,29 @@
 SafeSearchAnnotation = _reflection.GeneratedProtocolMessageType('SafeSearchAnnotation', (_message.Message,), dict(
   DESCRIPTOR = _SAFESEARCHANNOTATION,
   __module__ = 'google.cloud.proto.videointelligence.v1beta1.video_intelligence_pb2'
+  ,
+  __doc__ = """Safe search annotation (based on per-frame visual signals only). If no
+  unsafe content has been detected in a frame, no annotations are present
+  for that frame. If only some types of unsafe content have been detected
+  in a frame, the likelihood is set to ``UNKNOWN`` for all other types of
+  unsafe content.
+  
+  
+  Attributes:
+      adult:
+          Likelihood of adult content.
+      spoof:
+          Likelihood that an obvious modification was made to the
+          original version to make it appear funny or offensive.
+      medical:
+          Likelihood of medical content.
+      violent:
+          Likelihood of violent content.
+      racy:
+          Likelihood of racy content.
+      time_offset:
+          Video time offset in microseconds.
+  """,
   # @@protoc_insertion_point(class_scope:google.cloud.videointelligence.v1beta1.SafeSearchAnnotation)
   ))
 _sym_db.RegisterMessage(SafeSearchAnnotation)
@@ -926,6 +1057,20 @@
 BoundingBox = _reflection.GeneratedProtocolMessageType('BoundingBox', (_message.Message,), dict(
   DESCRIPTOR = _BOUNDINGBOX,
   __module__ = 'google.cloud.proto.videointelligence.v1beta1.video_intelligence_pb2'
+  ,
+  __doc__ = """Bounding box.
+  
+  
+  Attributes:
+      left:
+          Left X coordinate.
+      right:
+          Right X coordinate.
+      bottom:
+          Bottom Y coordinate.
+      top:
+          Top Y coordinate.
+  """,
   # @@protoc_insertion_point(class_scope:google.cloud.videointelligence.v1beta1.BoundingBox)
   ))
 _sym_db.RegisterMessage(BoundingBox)
@@ -933,6 +1078,16 @@
 FaceLocation = _reflection.GeneratedProtocolMessageType('FaceLocation', (_message.Message,), dict(
   DESCRIPTOR = _FACELOCATION,
   __module__ = 'google.cloud.proto.videointelligence.v1beta1.video_intelligence_pb2'
+  ,
+  __doc__ = """Face location.
+  
+  
+  Attributes:
+      bounding_box:
+          Bounding box in a frame.
+      time_offset:
+          Video time offset in microseconds.
+  """,
   # @@protoc_insertion_point(class_scope:google.cloud.videointelligence.v1beta1.FaceLocation)
   ))
 _sym_db.RegisterMessage(FaceLocation)
@@ -940,6 +1095,21 @@
 FaceAnnotation = _reflection.GeneratedProtocolMessageType('FaceAnnotation', (_message.Message,), dict(
   DESCRIPTOR = _FACEANNOTATION,
   __module__ = 'google.cloud.proto.videointelligence.v1beta1.video_intelligence_pb2'
+  ,
+  __doc__ = """Face annotation.
+  
+  
+  Attributes:
+      thumbnail:
+          Thumbnail of a representative face view (in JPEG format).
+          Encoding: base64.
+      segments:
+          All locations where a face was detected. Faces are detected
+          and tracked on a per-video basis (as opposed to across
+          multiple videos).
+      locations:
+          Face locations at one frame per second.
+  """,
   # @@protoc_insertion_point(class_scope:google.cloud.videointelligence.v1beta1.FaceAnnotation)
   ))
 _sym_db.RegisterMessage(FaceAnnotation)
@@ -947,6 +1117,29 @@
 VideoAnnotationResults = _reflection.GeneratedProtocolMessageType('VideoAnnotationResults', (_message.Message,), dict(
   DESCRIPTOR = _VIDEOANNOTATIONRESULTS,
   __module__ = 'google.cloud.proto.videointelligence.v1beta1.video_intelligence_pb2'
+  ,
+  __doc__ = """Annotation results for a single video.
+  
+  
+  Attributes:
+      input_uri:
+          Video file location in `Google Cloud Storage
+          <https://cloud.google.com/storage/>`__.
+      label_annotations:
+          Label annotations. There is exactly one element for each
+          unique label.
+      face_annotations:
+          Face annotations. There is exactly one element for each unique
+          face.
+      shot_annotations:
+          Shot annotations. Each shot is represented as a video segment.
+      safe_search_annotations:
+          Safe search annotations.
+      error:
+          If set, indicates an error. Note that for a single
+          ``AnnotateVideoRequest`` some videos may succeed and some may
+          fail.
+  """,
   # @@protoc_insertion_point(class_scope:google.cloud.videointelligence.v1beta1.VideoAnnotationResults)
   ))
 _sym_db.RegisterMessage(VideoAnnotationResults)
@@ -954,6 +1147,17 @@
 AnnotateVideoResponse = _reflection.GeneratedProtocolMessageType('AnnotateVideoResponse', (_message.Message,), dict(
   DESCRIPTOR = _ANNOTATEVIDEORESPONSE,
   __module__ = 'google.cloud.proto.videointelligence.v1beta1.video_intelligence_pb2'
+  ,
+  __doc__ = """Video annotation response. Included in the ``response`` field of the
+  ``Operation`` returned by the ``GetOperation`` call of the
+  ``google::longrunning::Operations`` service.
+  
+  
+  Attributes:
+      annotation_results:
+          Annotation results for all videos specified in
+          ``AnnotateVideoRequest``.
+  """,
   # @@protoc_insertion_point(class_scope:google.cloud.videointelligence.v1beta1.AnnotateVideoResponse)
   ))
 _sym_db.RegisterMessage(AnnotateVideoResponse)
@@ -961,6 +1165,22 @@
 VideoAnnotationProgress = _reflection.GeneratedProtocolMessageType('VideoAnnotationProgress', (_message.Message,), dict(
   DESCRIPTOR = _VIDEOANNOTATIONPROGRESS,
   __module__ = 'google.cloud.proto.videointelligence.v1beta1.video_intelligence_pb2'
+  ,
+  __doc__ = """Annotation progress for a single video.
+  
+  
+  Attributes:
+      input_uri:
+          Video file location in `Google Cloud Storage
+          <https://cloud.google.com/storage/>`__.
+      progress_percent:
+          Approximate percentage processed thus far. Guaranteed to be
+          100 when fully processed.
+      start_time:
+          Time when the request was received.
+      update_time:
+          Time of the most recent update.
+  """,
   # @@protoc_insertion_point(class_scope:google.cloud.videointelligence.v1beta1.VideoAnnotationProgress)
   ))
 _sym_db.RegisterMessage(VideoAnnotationProgress)
@@ -968,6 +1188,17 @@
 AnnotateVideoProgress = _reflection.GeneratedProtocolMessageType('AnnotateVideoProgress', (_message.Message,), dict(
   DESCRIPTOR = _ANNOTATEVIDEOPROGRESS,
   __module__ = 'google.cloud.proto.videointelligence.v1beta1.video_intelligence_pb2'
+  ,
+  __doc__ = """Video annotation progress. Included in the ``metadata`` field of the
+  ``Operation`` returned by the ``GetOperation`` call of the
+  ``google::longrunning::Operations`` service.
+  
+  
+  Attributes:
+      annotation_progress:
+          Progress metadata for all videos specified in
+          ``AnnotateVideoRequest``.
+  """,
   # @@protoc_insertion_point(class_scope:google.cloud.videointelligence.v1beta1.AnnotateVideoProgress)
   ))
 _sym_db.RegisterMessage(AnnotateVideoProgress)
@@ -979,10 +1210,10 @@
   # THESE ELEMENTS WILL BE DEPRECATED.
   # Please use the generated *_pb2_grpc.py files instead.
   import grpc
-  from grpc.framework.common import cardinality
-  from grpc.framework.interfaces.face import utilities as face_utilities
   from grpc.beta import implementations as beta_implementations
   from grpc.beta import interfaces as beta_interfaces
+  from grpc.framework.common import cardinality
+  from grpc.framework.interfaces.face import utilities as face_utilities
 
 
   class VideoIntelligenceServiceStub(object):
diff --git a/videointelligence/google/cloud/proto/videointelligence/v1beta1/video_intelligence_pb2_grpc.py b/videointelligence/google/cloud/proto/videointelligence/v1beta1/video_intelligence_pb2_grpc.py
index 4ea0e1df20f58..ca09db976c127 100644
--- a/videointelligence/google/cloud/proto/videointelligence/v1beta1/video_intelligence_pb2_grpc.py
+++ b/videointelligence/google/cloud/proto/videointelligence/v1beta1/video_intelligence_pb2_grpc.py
@@ -1,7 +1,5 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
-from grpc.framework.common import cardinality
-from grpc.framework.interfaces.face import utilities as face_utilities
 
 import google.cloud.proto.videointelligence.v1beta1.video_intelligence_pb2 as google_dot_cloud_dot_proto_dot_videointelligence_dot_v1beta1_dot_video__intelligence__pb2
 import google.longrunning.operations_pb2 as google_dot_longrunning_dot_operations__pb2
diff --git a/videointelligence/google/cloud/videointelligence_v1beta1/types.py b/videointelligence/google/cloud/videointelligence_v1beta1/types.py
index 9ac3b8a6b2a5b..bfc99c3ab24bb 100644
--- a/videointelligence/google/cloud/videointelligence_v1beta1/types.py
+++ b/videointelligence/google/cloud/videointelligence_v1beta1/types.py
@@ -21,6 +21,7 @@
 
 names = []
 for name, message in get_messages(video_intelligence_pb2).items():
+    message.__module__ = 'google.cloud.videointelligence_v1beta1.types'
     setattr(sys.modules[__name__], name, message)
     names.append(name)
 

From f8758dfda54c79a7c712e73348fc37a4c349c212 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Thu, 20 Jul 2017 18:18:02 -0400
Subject: [PATCH 104/211] Add systests for read/query w/ concurrent updates.
 (#3632)

* Also add systest for user exception aborting transaction.
---
 spanner/tests/_fixtures.py          |   4 +
 spanner/tests/system/test_system.py | 116 ++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+)

diff --git a/spanner/tests/_fixtures.py b/spanner/tests/_fixtures.py
index 1123d03c3f2dd..ace9b981b6ec9 100644
--- a/spanner/tests/_fixtures.py
+++ b/spanner/tests/_fixtures.py
@@ -38,6 +38,10 @@
     description STRING(16),
     exactly_hwhen TIMESTAMP)
     PRIMARY KEY (eye_d);
+CREATE TABLE counters (
+    name STRING(1024),
+    value INT64 )
+    PRIMARY KEY (name);
 """
 
 DDL_STATEMENTS = [stmt.strip() for stmt in DDL.split(';') if stmt.strip()]
diff --git a/spanner/tests/system/test_system.py b/spanner/tests/system/test_system.py
index b4ac62194bb1b..e6d73f977e942 100644
--- a/spanner/tests/system/test_system.py
+++ b/spanner/tests/system/test_system.py
@@ -17,6 +17,7 @@
 import operator
 import os
 import struct
+import threading
 import unittest
 
 from google.cloud.proto.spanner.v1.type_pb2 import ARRAY
@@ -358,6 +359,11 @@ class TestSessionAPI(unittest.TestCase, _TestData):
         'description',
         'exactly_hwhen',
     )
+    COUNTERS_TABLE = 'counters'
+    COUNTERS_COLUMNS = (
+        'name',
+        'value',
+    )
     SOME_DATE = datetime.date(2011, 1, 17)
     SOME_TIME = datetime.datetime(1989, 1, 17, 17, 59, 12, 345612)
     NANO_TIME = TimestampWithNanoseconds(1995, 8, 31, nanosecond=987654321)
@@ -482,6 +488,31 @@ def test_transaction_read_and_insert_then_rollback(self):
         rows = list(session.read(self.TABLE, self.COLUMNS, self.ALL))
         self.assertEqual(rows, [])
 
+    def _transaction_read_then_raise(self, transaction):
+        rows = list(transaction.read(self.TABLE, self.COLUMNS, self.ALL))
+        self.assertEqual(len(rows), 0)
+        transaction.insert(self.TABLE, self.COLUMNS, self.ROW_DATA)
+        raise CustomException()
+
+    @RetryErrors(exception=GrpcRendezvous)
+    def test_transaction_read_and_insert_then_execption(self):
+        retry = RetryInstanceState(_has_all_ddl)
+        retry(self._db.reload)()
+
+        session = self._db.session()
+        session.create()
+        self.to_delete.append(session)
+
+        with session.batch() as batch:
+            batch.delete(self.TABLE, self.ALL)
+
+        with self.assertRaises(CustomException):
+            session.run_in_transaction(self._transaction_read_then_raise)
+
+        # Transaction was rolled back.
+        rows = list(session.read(self.TABLE, self.COLUMNS, self.ALL))
+        self.assertEqual(rows, [])
+
     @RetryErrors(exception=GrpcRendezvous)
     def test_transaction_read_and_insert_or_update_then_commit(self):
         retry = RetryInstanceState(_has_all_ddl)
@@ -508,6 +539,87 @@ def test_transaction_read_and_insert_or_update_then_commit(self):
         rows = list(session.read(self.TABLE, self.COLUMNS, self.ALL))
         self._check_row_data(rows)
 
+    def _transaction_concurrency_helper(self, unit_of_work, pkey):
+        INITIAL_VALUE = 123
+        NUM_THREADS = 3     # conforms to equivalent Java systest.
+
+        retry = RetryInstanceState(_has_all_ddl)
+        retry(self._db.reload)()
+
+        session = self._db.session()
+        session.create()
+        self.to_delete.append(session)
+
+        with session.batch() as batch:
+            batch.insert_or_update(
+                self.COUNTERS_TABLE,
+                self.COUNTERS_COLUMNS,
+                [[pkey, INITIAL_VALUE]])
+
+        # We don't want to run the threads' transactions in the current
+        # session, which would fail.
+        txn_sessions = []
+
+        for _ in range(NUM_THREADS):
+            txn_session = self._db.session()
+            txn_sessions.append(txn_session)
+            txn_session.create()
+            self.to_delete.append(txn_session)
+
+        threads = [
+            threading.Thread(
+                target=txn_session.run_in_transaction,
+                args=(unit_of_work, pkey))
+            for txn_session in txn_sessions]
+
+        for thread in threads:
+            thread.start()
+
+        for thread in threads:
+            thread.join()
+
+        keyset = KeySet(keys=[(pkey,)])
+        rows = list(session.read(
+            self.COUNTERS_TABLE, self.COUNTERS_COLUMNS, keyset))
+        self.assertEqual(len(rows), 1)
+        _, value = rows[0]
+        self.assertEqual(value, INITIAL_VALUE + len(threads))
+
+    def _read_w_concurrent_update(self, transaction, pkey):
+        keyset = KeySet(keys=[(pkey,)])
+        rows = list(transaction.read(
+            self.COUNTERS_TABLE, self.COUNTERS_COLUMNS, keyset))
+        self.assertEqual(len(rows), 1)
+        pkey, value = rows[0]
+        transaction.update(
+            self.COUNTERS_TABLE,
+            self.COUNTERS_COLUMNS,
+            [[pkey, value + 1]])
+
+    def test_transaction_read_w_concurrent_updates(self):
+        PKEY = 'read_w_concurrent_updates'
+        self._transaction_concurrency_helper(
+            self._read_w_concurrent_update, PKEY)
+
+    def _query_w_concurrent_update(self, transaction, pkey):
+        SQL = 'SELECT * FROM counters WHERE name = @name'
+        rows = list(transaction.execute_sql(
+            SQL,
+            params={'name': pkey},
+            param_types={'name': Type(code=STRING)},
+        ))
+        self.assertEqual(len(rows), 1)
+        pkey, value = rows[0]
+        transaction.update(
+                self.COUNTERS_TABLE,
+                self.COUNTERS_COLUMNS,
+                [[pkey, value + 1]])
+
+    def test_transaction_query_w_concurrent_updates(self):
+        PKEY = 'query_w_concurrent_updates'
+        self._transaction_concurrency_helper(
+            self._query_w_concurrent_update, PKEY)
+
     @staticmethod
     def _row_data(max_index):
         for index in range(max_index):
@@ -910,6 +1022,10 @@ def test_four_meg(self):
         self._verify_two_columns(FOUR_MEG)
 
 
+class CustomException(Exception):
+    """Placeholder for any user-defined exception."""
+
+
 class _DatabaseDropper(object):
     """Helper for cleaning up databases created on-the-fly."""
 

From c5ccca1b6b5e96a369a4f2feaf2040d2f4afadb3 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Fri, 21 Jul 2017 14:41:13 -0700
Subject: [PATCH 105/211] Switched to google-resumable-media in BigQuery.
 (#3555)

* Switched to google-resumable-media in BigQuery.
* Upgrading google-resumable-media dependency to 0.2.1.
---
 bigquery/google/cloud/bigquery/table.py | 432 ++++++++----
 bigquery/nox.py                         |  33 +-
 bigquery/setup.py                       |   3 +
 bigquery/tests/unit/test_table.py       | 872 ++++++++++++++----------
 storage/google/cloud/storage/blob.py    |   1 +
 storage/setup.py                        |   2 +-
 storage/tests/unit/test_blob.py         |   8 +-
 7 files changed, 867 insertions(+), 484 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/table.py b/bigquery/google/cloud/bigquery/table.py
index 7e21e35d1fb09..f7752bb8fc364 100644
--- a/bigquery/google/cloud/bigquery/table.py
+++ b/bigquery/google/cloud/bigquery/table.py
@@ -15,22 +15,21 @@
 """Define API Datasets."""
 
 import datetime
-import json
 import os
 
 import httplib2
 import six
 
+import google.auth.transport.requests
+from google import resumable_media
+from google.resumable_media.requests import MultipartUpload
+from google.resumable_media.requests import ResumableUpload
+
 from google.cloud._helpers import _datetime_from_microseconds
 from google.cloud._helpers import _millis_from_datetime
 from google.cloud.exceptions import NotFound
 from google.cloud.exceptions import make_exception
 from google.cloud.iterator import HTTPIterator
-from google.cloud.streaming.exceptions import HttpError
-from google.cloud.streaming.http_wrapper import Request
-from google.cloud.streaming.http_wrapper import make_api_request
-from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-from google.cloud.streaming.transfer import Upload
 from google.cloud.bigquery.schema import SchemaField
 from google.cloud.bigquery._helpers import _item_to_row
 from google.cloud.bigquery._helpers import _rows_page_start
@@ -39,6 +38,17 @@
 
 _TABLE_HAS_NO_SCHEMA = "Table has no schema:  call 'table.reload()'"
 _MARKER = object()
+_DEFAULT_CHUNKSIZE = 1048576  # 1024 * 1024 B = 1 MB
+_BASE_UPLOAD_TEMPLATE = (
+    u'https://www.googleapis.com/upload/bigquery/v2/projects/'
+    u'{project}/jobs?uploadType=')
+_MULTIPART_URL_TEMPLATE = _BASE_UPLOAD_TEMPLATE + u'multipart'
+_RESUMABLE_URL_TEMPLATE = _BASE_UPLOAD_TEMPLATE + u'resumable'
+_GENERIC_CONTENT_TYPE = u'*/*'
+_READ_LESS_THAN_SIZE = (
+    'Size {:d} was specified but the file-like object only had '
+    '{:d} bytes remaining.')
+_DEFAULT_NUM_RETRIES = 6
 
 
 class Table(object):
@@ -815,15 +825,177 @@ def insert_data(self,
 
         return errors
 
-    @staticmethod
-    def _check_response_error(request, http_response):
-        """Helper for :meth:`upload_from_file`."""
-        info = http_response.info
-        status = int(info['status'])
-        if not 200 <= status < 300:
-            faux_response = httplib2.Response({'status': status})
-            raise make_exception(faux_response, http_response.content,
-                                 error_info=request.url)
+    def _make_transport(self, client):
+        """Make an authenticated transport with a client's credentials.
+
+        :type client: :class:`~google.cloud.bigquery.client.Client`
+        :param client: The client to use.
+
+        :rtype transport:
+            :class:`~google.auth.transport.requests.AuthorizedSession`
+        :returns: The transport (with credentials) that will
+                  make authenticated requests.
+        """
+        # Create a ``requests`` transport with the client's credentials.
+        transport = google.auth.transport.requests.AuthorizedSession(
+            client._credentials)
+        return transport
+
+    def _initiate_resumable_upload(self, client, stream,
+                                   metadata, num_retries):
+        """Initiate a resumable upload.
+
+        :type client: :class:`~google.cloud.bigquery.client.Client`
+        :param client: The client to use.
+
+        :type stream: IO[bytes]
+        :param stream: A bytes IO object open for reading.
+
+        :type metadata: dict
+        :param metadata: The metadata associated with the upload.
+
+        :type num_retries: int
+        :param num_retries: Number of upload retries. (Deprecated: This
+                            argument will be removed in a future release.)
+
+        :rtype: tuple
+        :returns:
+            Pair of
+
+            * The :class:`~google.resumable_media.requests.ResumableUpload`
+              that was created
+            * The ``transport`` used to initiate the upload.
+        """
+        chunk_size = _DEFAULT_CHUNKSIZE
+        transport = self._make_transport(client)
+        headers = _get_upload_headers(client._connection.USER_AGENT)
+        upload_url = _RESUMABLE_URL_TEMPLATE.format(project=self.project)
+        upload = ResumableUpload(upload_url, chunk_size, headers=headers)
+
+        if num_retries is not None:
+            upload._retry_strategy = resumable_media.RetryStrategy(
+                max_retries=num_retries)
+
+        upload.initiate(
+            transport, stream, metadata, _GENERIC_CONTENT_TYPE,
+            stream_final=False)
+
+        return upload, transport
+
+    def _do_resumable_upload(self, client, stream, metadata, num_retries):
+        """Perform a resumable upload.
+
+        :type client: :class:`~google.cloud.bigquery.client.Client`
+        :param client: The client to use.
+
+        :type stream: IO[bytes]
+        :param stream: A bytes IO object open for reading.
+
+        :type metadata: dict
+        :param metadata: The metadata associated with the upload.
+
+        :type num_retries: int
+        :param num_retries: Number of upload retries. (Deprecated: This
+                            argument will be removed in a future release.)
+
+        :rtype: :class:`~requests.Response`
+        :returns: The "200 OK" response object returned after the final chunk
+                  is uploaded.
+        """
+        upload, transport = self._initiate_resumable_upload(
+            client, stream, metadata, num_retries)
+
+        while not upload.finished:
+            response = upload.transmit_next_chunk(transport)
+
+        return response
+
+    def _do_multipart_upload(self, client, stream, metadata,
+                             size, num_retries):
+        """Perform a multipart upload.
+
+        :type client: :class:`~google.cloud.bigquery.client.Client`
+        :param client: The client to use.
+
+        :type stream: IO[bytes]
+        :param stream: A bytes IO object open for reading.
+
+        :type metadata: dict
+        :param metadata: The metadata associated with the upload.
+
+        :type size: int
+        :param size: The number of bytes to be uploaded (which will be read
+                     from ``stream``). If not provided, the upload will be
+                     concluded once ``stream`` is exhausted (or :data:`None`).
+
+        :type num_retries: int
+        :param num_retries: Number of upload retries. (Deprecated: This
+                            argument will be removed in a future release.)
+
+        :rtype: :class:`~requests.Response`
+        :returns: The "200 OK" response object returned after the multipart
+                  upload request.
+        :raises: :exc:`ValueError` if the ``stream`` has fewer than ``size``
+                 bytes remaining.
+        """
+        data = stream.read(size)
+        if len(data) < size:
+            msg = _READ_LESS_THAN_SIZE.format(size, len(data))
+            raise ValueError(msg)
+
+        transport = self._make_transport(client)
+        headers = _get_upload_headers(client._connection.USER_AGENT)
+
+        upload_url = _MULTIPART_URL_TEMPLATE.format(project=self.project)
+        upload = MultipartUpload(upload_url, headers=headers)
+
+        if num_retries is not None:
+            upload._retry_strategy = resumable_media.RetryStrategy(
+                max_retries=num_retries)
+
+        response = upload.transmit(
+            transport, data, metadata, _GENERIC_CONTENT_TYPE)
+
+        return response
+
+    def _do_upload(self, client, stream, metadata, size, num_retries):
+        """Determine an upload strategy and then perform the upload.
+
+        If ``size`` is :data:`None`, then a resumable upload will be used,
+        otherwise the content and the metadata will be uploaded
+        in a single multipart upload request.
+
+        :type client: :class:`~google.cloud.bigquery.client.Client`
+        :param client: The client to use.
+
+        :type stream: IO[bytes]
+        :param stream: A bytes IO object open for reading.
+
+        :type metadata: dict
+        :param metadata: The metadata associated with the upload.
+
+        :type size: int
+        :param size: The number of bytes to be uploaded (which will be read
+                     from ``stream``). If not provided, the upload will be
+                     concluded once ``stream`` is exhausted (or :data:`None`).
+
+        :type num_retries: int
+        :param num_retries: Number of upload retries. (Deprecated: This
+                            argument will be removed in a future release.)
+
+        :rtype: dict
+        :returns: The parsed JSON from the "200 OK" response. This will be the
+                  **only** response in the multipart case and it will be the
+                  **final** response in the resumable case.
+        """
+        if size is None:
+            response = self._do_resumable_upload(
+                client, stream, metadata, num_retries)
+        else:
+            response = self._do_multipart_upload(
+                client, stream, metadata, size, num_retries)
+
+        return response.json()
 
     # pylint: disable=too-many-arguments,too-many-locals
     def upload_from_file(self,
@@ -831,7 +1003,7 @@ def upload_from_file(self,
                          source_format,
                          rewind=False,
                          size=None,
-                         num_retries=6,
+                         num_retries=_DEFAULT_NUM_RETRIES,
                          allow_jagged_rows=None,
                          allow_quoted_newlines=None,
                          create_disposition=None,
@@ -846,10 +1018,6 @@ def upload_from_file(self,
                          job_name=None):
         """Upload the contents of this table from a file-like object.
 
-        The content type of the upload will either be
-        - The value passed in to the function (if any)
-        - ``text/csv``.
-
         :type file_obj: file
         :param file_obj: A file handle opened in binary mode for reading.
 
@@ -860,7 +1028,7 @@ def upload_from_file(self,
 
         :type rewind: bool
         :param rewind: If True, seek to the beginning of the file handle before
-                       writing the file to Cloud Storage.
+                       writing the file.
 
         :type size: int
         :param size: The number of bytes to read from the file handle.
@@ -911,16 +1079,16 @@ def upload_from_file(self,
         :param write_disposition: job configuration option; see
                                   :meth:`google.cloud.bigquery.job.LoadJob`.
 
-        :type client: :class:`~google.cloud.storage.client.Client` or
-                      ``NoneType``
-        :param client: Optional. The client to use.  If not passed, falls back
-                       to the ``client`` stored on the current dataset.
+        :type client: :class:`~google.cloud.bigquery.client.Client`
+        :param client: (Optional) The client to use.  If not passed, falls back
+                       to the ``client`` stored on the current table.
 
         :type job_name: str
         :param job_name: Optional. The id of the job. Generated if not
                          explicitly passed in.
 
-        :rtype: :class:`google.cloud.bigquery.jobs.LoadTableFromStorageJob`
+        :rtype: :class:`~google.cloud.bigquery.jobs.LoadTableFromStorageJob`
+
         :returns: the job instance used to load the data (e.g., for
                   querying status). Note that the job is already started:
                   do not call ``job.begin()``.
@@ -929,54 +1097,10 @@ def upload_from_file(self,
                  a file opened in text mode.
         """
         client = self._require_client(client)
-        connection = client._connection
-        content_type = 'application/octet-stream'
-
-        # Rewind the file if desired.
-        if rewind:
-            file_obj.seek(0, os.SEEK_SET)
-
-        mode = getattr(file_obj, 'mode', None)
-
-        if mode is not None and mode not in ('rb', 'r+b', 'rb+'):
-            raise ValueError(
-                "Cannot upload files opened in text mode:  use "
-                "open(filename, mode='rb') or open(filename, mode='r+b')")
-
-        # Get the basic stats about the file.
-        total_bytes = size
-        if total_bytes is None:
-            if hasattr(file_obj, 'fileno'):
-                total_bytes = os.fstat(file_obj.fileno()).st_size
-            else:
-                raise ValueError('total bytes could not be determined. Please '
-                                 'pass an explicit size.')
-        headers = {
-            'Accept': 'application/json',
-            'Accept-Encoding': 'gzip, deflate',
-            'User-Agent': connection.USER_AGENT,
-            'content-type': 'application/json',
-        }
-
-        metadata = {
-            'configuration': {
-                'load': {
-                    'sourceFormat': source_format,
-                    'destinationTable': {
-                        'projectId': self._dataset.project,
-                        'datasetId': self._dataset.name,
-                        'tableId': self.name,
-                    }
-                }
-            }
-        }
-
-        if len(self._schema) > 0:
-            load_config = metadata['configuration']['load']
-            load_config['schema'] = {
-                'fields': _build_schema_resource(self._schema)
-            }
-
+        _maybe_rewind(file_obj, rewind=rewind)
+        _check_mode(file_obj)
+        metadata = _get_upload_metadata(
+            source_format, self._schema, self._dataset, self.name)
         _configure_job_metadata(metadata, allow_jagged_rows,
                                 allow_quoted_newlines, create_disposition,
                                 encoding, field_delimiter,
@@ -984,47 +1108,12 @@ def upload_from_file(self,
                                 quote_character, skip_leading_rows,
                                 write_disposition, job_name)
 
-        upload = Upload(file_obj, content_type, total_bytes,
-                        auto_transfer=False)
-
-        url_builder = _UrlBuilder()
-        upload_config = _UploadConfig()
-
-        # Base URL may change once we know simple vs. resumable.
-        base_url = connection.API_BASE_URL + '/upload'
-        path = '/projects/%s/jobs' % (self._dataset.project,)
-        upload_url = connection.build_api_url(api_base_url=base_url, path=path)
-
-        # Use apitools 'Upload' facility.
-        request = Request(upload_url, 'POST', headers,
-                          body=json.dumps(metadata))
-
-        upload.configure_request(upload_config, request, url_builder)
-        query_params = url_builder.query_params
-        base_url = connection.API_BASE_URL + '/upload'
-        request.url = connection.build_api_url(api_base_url=base_url,
-                                               path=path,
-                                               query_params=query_params)
         try:
-            upload.initialize_upload(request, connection.http)
-        except HttpError as err_response:
-            faux_response = httplib2.Response(err_response.response)
-            raise make_exception(faux_response, err_response.content,
-                                 error_info=request.url)
-
-        if upload.strategy == RESUMABLE_UPLOAD:
-            http_response = upload.stream_file(use_chunks=True)
-        else:
-            http_response = make_api_request(connection.http, request,
-                                             retries=num_retries)
-
-        self._check_response_error(request, http_response)
-
-        response_content = http_response.content
-        if not isinstance(response_content,
-                          six.string_types):  # pragma: NO COVER  Python3
-            response_content = response_content.decode('utf-8')
-        return client.job_from_resource(json.loads(response_content))
+            created_json = self._do_upload(
+                client, file_obj, metadata, size, num_retries)
+            return client.job_from_resource(created_json)
+        except resumable_media.InvalidResponse as exc:
+            _raise_from_invalid_response(exc)
     # pylint: enable=too-many-arguments,too-many-locals
 
 
@@ -1122,20 +1211,109 @@ def _build_schema_resource(fields):
             info['fields'] = _build_schema_resource(field.fields)
         infos.append(info)
     return infos
+# pylint: enable=unused-argument
+
 
+def _maybe_rewind(stream, rewind=False):
+    """Rewind the stream if desired.
 
-class _UploadConfig(object):
-    """Faux message FBO apitools' 'configure_request'."""
-    accept = ['*/*']
-    max_size = None
-    resumable_multipart = True
-    resumable_path = u'/upload/bigquery/v2/projects/{project}/jobs'
-    simple_multipart = True
-    simple_path = u'/upload/bigquery/v2/projects/{project}/jobs'
+    :type stream: IO[bytes]
+    :param stream: A bytes IO object open for reading.
 
+    :type rewind: bool
+    :param rewind: Indicates if we should seek to the beginning of the stream.
+    """
+    if rewind:
+        stream.seek(0, os.SEEK_SET)
 
-class _UrlBuilder(object):
-    """Faux builder FBO apitools' 'configure_request'"""
-    def __init__(self):
-        self.query_params = {}
-        self._relative_path = ''
+
+def _check_mode(stream):
+    """Check that a stream was opened in read-binary mode.
+
+    :type stream: IO[bytes]
+    :param stream: A bytes IO object open for reading.
+
+    :raises: :exc:`ValueError` if the ``stream.mode`` is a valid attribute
+             and is not among ``rb``, ``r+b`` or ``rb+``.
+    """
+    mode = getattr(stream, 'mode', None)
+
+    if mode is not None and mode not in ('rb', 'r+b', 'rb+'):
+        raise ValueError(
+            "Cannot upload files opened in text mode:  use "
+            "open(filename, mode='rb') or open(filename, mode='r+b')")
+
+
+def _get_upload_headers(user_agent):
+    """Get the headers for an upload request.
+
+    :type user_agent: str
+    :param user_agent: The user-agent for requests.
+
+    :rtype: dict
+    :returns: The headers to be used for the request.
+    """
+    return {
+        'Accept': 'application/json',
+        'Accept-Encoding': 'gzip, deflate',
+        'User-Agent': user_agent,
+        'content-type': 'application/json',
+    }
+
+
+def _get_upload_metadata(source_format, schema, dataset, name):
+    """Get base metadata for creating a table.
+
+    :type source_format: str
+    :param source_format: one of 'CSV' or 'NEWLINE_DELIMITED_JSON'.
+                          job configuration option.
+
+    :type schema: list
+    :param schema: List of :class:`SchemaField` associated with a table.
+
+    :type dataset: :class:`~google.cloud.bigquery.dataset.Dataset`
+    :param dataset: A dataset which contains a table.
+
+    :type name: str
+    :param name: The name of the table.
+
+    :rtype: dict
+    :returns: The metadata dictionary.
+    """
+    load_config = {
+        'sourceFormat': source_format,
+        'destinationTable': {
+            'projectId': dataset.project,
+            'datasetId': dataset.name,
+            'tableId': name,
+        },
+    }
+    if schema:
+        load_config['schema'] = {
+            'fields': _build_schema_resource(schema),
+        }
+
+    return {
+        'configuration': {
+            'load': load_config,
+        },
+    }
+
+
+def _raise_from_invalid_response(error, error_info=None):
+    """Re-wrap and raise an ``InvalidResponse`` exception.
+
+    :type error: :exc:`google.resumable_media.InvalidResponse`
+    :param error: A caught exception from the ``google-resumable-media``
+                  library.
+
+    :type error_info: str
+    :param error_info: (Optional) Extra information about the failed request.
+
+    :raises: :class:`~google.cloud.exceptions.GoogleCloudError` corresponding
+             to the failed status code
+    """
+    response = error.response
+    faux_response = httplib2.Response({'status': response.status_code})
+    raise make_exception(faux_response, response.content,
+                         error_info=error_info, use_json=False)
diff --git a/bigquery/nox.py b/bigquery/nox.py
index 19a8f5761701f..9899654431595 100644
--- a/bigquery/nox.py
+++ b/bigquery/nox.py
@@ -19,7 +19,9 @@
 import nox
 
 
-LOCAL_DEPS = ('../core/',)
+LOCAL_DEPS = (
+    os.path.join('..', 'core'),
+)
 
 
 @nox.session
@@ -38,10 +40,17 @@ def unit_tests(session, python_version):
     session.install('-e', '.')
 
     # Run py.test against the unit tests.
-    session.run('py.test', '--quiet',
-        '--cov=google.cloud.bigquery', '--cov=tests.unit', '--cov-append',
-        '--cov-config=.coveragerc', '--cov-report=', '--cov-fail-under=97',
-        'tests/unit',
+    session.run(
+        'py.test',
+        '--quiet',
+        '--cov=google.cloud.bigquery',
+        '--cov=tests.unit',
+        '--cov-append',
+        '--cov-config=.coveragerc',
+        '--cov-report=',
+        '--cov-fail-under=97',
+        os.path.join('tests', 'unit'),
+        *session.posargs
     )
 
 
@@ -63,11 +72,19 @@ def system_tests(session, python_version):
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
     session.install('mock', 'pytest', *LOCAL_DEPS)
-    session.install('../storage/', '../test_utils/')
+    session.install(
+        os.path.join('..', 'storage'),
+        os.path.join('..', 'test_utils'),
+    )
     session.install('.')
 
     # Run py.test against the system tests.
-    session.run('py.test', '--quiet', 'tests/system.py')
+    session.run(
+        'py.test',
+        '--quiet',
+        os.path.join('tests', 'system.py'),
+        *session.posargs
+    )
 
 
 @nox.session
@@ -81,7 +98,7 @@ def lint(session):
 
     session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
     session.install('.')
-    session.run('flake8', 'google/cloud/bigquery')
+    session.run('flake8', os.path.join('google', 'cloud', 'bigquery'))
     session.run('flake8', 'tests')
     session.run(
         'gcp-devrel-py-tools', 'run-pylint',
diff --git a/bigquery/setup.py b/bigquery/setup.py
index 6d61064c88bad..eeb2d90549d8b 100644
--- a/bigquery/setup.py
+++ b/bigquery/setup.py
@@ -52,6 +52,9 @@
 
 REQUIREMENTS = [
     'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-auth >= 1.0.0',
+    'google-resumable-media >= 0.2.1',
+    'requests >= 2.0.0',
 ]
 
 setup(
diff --git a/bigquery/tests/unit/test_table.py b/bigquery/tests/unit/test_table.py
index f535e87996288..502c0495f9c9d 100644
--- a/bigquery/tests/unit/test_table.py
+++ b/bigquery/tests/unit/test_table.py
@@ -12,8 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import email
+import io
+import json
 import unittest
 
+import mock
+from six.moves import http_client
+import pytest
+
 
 class _SchemaBase(object):
 
@@ -31,7 +38,8 @@ def _verifySchema(self, schema, resource):
 
 
 class TestTable(unittest.TestCase, _SchemaBase):
-    PROJECT = 'project'
+
+    PROJECT = 'prahj-ekt'
     DS_NAME = 'dataset-name'
     TABLE_NAME = 'table-name'
 
@@ -1553,312 +1561,476 @@ def _row_data(row):
         self.assertEqual(req['path'], '/%s' % PATH)
         self.assertEqual(req['data'], SENT)
 
-    def test_upload_from_file_text_mode_file_failure(self):
+    @mock.patch('google.auth.transport.requests.AuthorizedSession')
+    def test__make_transport(self, session_factory):
+        client = mock.Mock(spec=[u'_credentials'])
+        table = self._make_one(self.TABLE_NAME, None)
+        transport = table._make_transport(client)
 
-        class TextModeFile(object):
-            mode = 'r'
+        self.assertIs(transport, session_factory.return_value)
+        session_factory.assert_called_once_with(client._credentials)
 
-        conn = _Connection()
-        client = _Client(project=self.PROJECT, connection=conn)
+    @staticmethod
+    def _mock_requests_response(status_code, headers, content=b''):
+        return mock.Mock(
+            content=content, headers=headers, status_code=status_code,
+            spec=['content', 'headers', 'status_code'])
+
+    def _mock_transport(self, status_code, headers, content=b''):
+        fake_transport = mock.Mock(spec=['request'])
+        fake_response = self._mock_requests_response(
+            status_code, headers, content=content)
+        fake_transport.request.return_value = fake_response
+        return fake_transport
+
+    def _initiate_resumable_upload_helper(self, num_retries=None):
+        from google.resumable_media.requests import ResumableUpload
+        from google.cloud.bigquery.table import _DEFAULT_CHUNKSIZE
+        from google.cloud.bigquery.table import _GENERIC_CONTENT_TYPE
+        from google.cloud.bigquery.table import _get_upload_headers
+        from google.cloud.bigquery.table import _get_upload_metadata
+
+        connection = _Connection()
+        client = _Client(self.PROJECT, connection=connection)
         dataset = _Dataset(client)
-        file_obj = TextModeFile()
-        table = self._make_one(self.TABLE_NAME, dataset=dataset)
-        with self.assertRaises(ValueError):
-            table.upload_from_file(file_obj, 'CSV', size=1234)
+        table = self._make_one(self.TABLE_NAME, dataset)
 
-    def test_upload_from_file_binary_mode_no_failure(self):
-        self._upload_from_file_helper(input_file_mode='r+b')
+        # Create mocks to be checked for doing transport.
+        resumable_url = 'http://test.invalid?upload_id=hey-you'
+        response_headers = {'location': resumable_url}
+        fake_transport = self._mock_transport(
+            http_client.OK, response_headers)
+        table._make_transport = mock.Mock(
+            return_value=fake_transport, spec=[])
+
+        # Create some mock arguments and call the method under test.
+        data = b'goodbye gudbi gootbee'
+        stream = io.BytesIO(data)
+        metadata = _get_upload_metadata(
+            'CSV', table._schema, table._dataset, table.name)
+        upload, transport = table._initiate_resumable_upload(
+            client, stream, metadata, num_retries)
+
+        # Check the returned values.
+        self.assertIsInstance(upload, ResumableUpload)
+        upload_url = (
+            'https://www.googleapis.com/upload/bigquery/v2/projects/' +
+            self.PROJECT +
+            '/jobs?uploadType=resumable')
+        self.assertEqual(upload.upload_url, upload_url)
+        expected_headers = _get_upload_headers(connection.USER_AGENT)
+        self.assertEqual(upload._headers, expected_headers)
+        self.assertFalse(upload.finished)
+        self.assertEqual(upload._chunk_size, _DEFAULT_CHUNKSIZE)
+        self.assertIs(upload._stream, stream)
+        self.assertIsNone(upload._total_bytes)
+        self.assertEqual(upload._content_type, _GENERIC_CONTENT_TYPE)
+        self.assertEqual(upload.resumable_url, resumable_url)
+
+        retry_strategy = upload._retry_strategy
+        self.assertEqual(retry_strategy.max_sleep, 64.0)
+        if num_retries is None:
+            self.assertEqual(retry_strategy.max_cumulative_retry, 600.0)
+            self.assertIsNone(retry_strategy.max_retries)
+        else:
+            self.assertIsNone(retry_strategy.max_cumulative_retry)
+            self.assertEqual(retry_strategy.max_retries, num_retries)
+        self.assertIs(transport, fake_transport)
+        # Make sure we never read from the stream.
+        self.assertEqual(stream.tell(), 0)
+
+        # Check the mocks.
+        table._make_transport.assert_called_once_with(client)
+        request_headers = expected_headers.copy()
+        request_headers['x-upload-content-type'] = _GENERIC_CONTENT_TYPE
+        fake_transport.request.assert_called_once_with(
+            'POST',
+            upload_url,
+            data=json.dumps(metadata).encode('utf-8'),
+            headers=request_headers,
+        )
 
-    def test_upload_from_file_size_failure(self):
-        conn = _Connection()
-        client = _Client(project=self.PROJECT, connection=conn)
-        dataset = _Dataset(client)
-        file_obj = object()
-        table = self._make_one(self.TABLE_NAME, dataset=dataset)
-        with self.assertRaises(ValueError):
-            table.upload_from_file(file_obj, 'CSV', size=None)
+    def test__initiate_resumable_upload(self):
+        self._initiate_resumable_upload_helper()
 
-    def test_upload_from_file_multipart_w_400(self):
-        import csv
-        import datetime
-        from six.moves.http_client import BAD_REQUEST
-        from google.cloud._testing import _NamedTemporaryFile
-        from google.cloud._helpers import UTC
-        from google.cloud.exceptions import BadRequest
+    def test__initiate_resumable_upload_with_retry(self):
+        self._initiate_resumable_upload_helper(num_retries=11)
 
-        WHEN_TS = 1437767599.006
-        WHEN = datetime.datetime.utcfromtimestamp(WHEN_TS).replace(
-            tzinfo=UTC)
-        response = {'status': BAD_REQUEST}
-        conn = _Connection(
-            (response, b'{}'),
-        )
-        client = _Client(project=self.PROJECT, connection=conn)
+    def _do_multipart_upload_success_helper(
+            self, get_boundary, num_retries=None):
+        from google.cloud.bigquery.table import _get_upload_headers
+        from google.cloud.bigquery.table import _get_upload_metadata
+
+        connection = _Connection()
+        client = _Client(self.PROJECT, connection=connection)
         dataset = _Dataset(client)
-        table = self._make_one(self.TABLE_NAME, dataset=dataset)
+        table = self._make_one(self.TABLE_NAME, dataset)
 
-        with _NamedTemporaryFile() as temp:
-            with open(temp.name, 'w') as file_obj:
-                writer = csv.writer(file_obj)
-                writer.writerow(('full_name', 'age', 'joined'))
-                writer.writerow(('Phred Phlyntstone', 32, WHEN))
+        # Create mocks to be checked for doing transport.
+        fake_transport = self._mock_transport(http_client.OK, {})
+        table._make_transport = mock.Mock(return_value=fake_transport, spec=[])
+
+        # Create some mock arguments.
+        data = b'Bzzzz-zap \x00\x01\xf4'
+        stream = io.BytesIO(data)
+        metadata = _get_upload_metadata(
+            'CSV', table._schema, table._dataset, table.name)
+        size = len(data)
+        response = table._do_multipart_upload(
+            client, stream, metadata, size, num_retries)
+
+        # Check the mocks and the returned value.
+        self.assertIs(response, fake_transport.request.return_value)
+        self.assertEqual(stream.tell(), size)
+        table._make_transport.assert_called_once_with(client)
+        get_boundary.assert_called_once_with()
+
+        upload_url = (
+            'https://www.googleapis.com/upload/bigquery/v2/projects/' +
+            self.PROJECT +
+            '/jobs?uploadType=multipart')
+        payload = (
+            b'--==0==\r\n' +
+            b'content-type: application/json; charset=UTF-8\r\n\r\n' +
+            json.dumps(metadata).encode('utf-8') + b'\r\n' +
+            b'--==0==\r\n' +
+            b'content-type: */*\r\n\r\n' +
+            data + b'\r\n' +
+            b'--==0==--')
+        headers = _get_upload_headers(connection.USER_AGENT)
+        headers['content-type'] = b'multipart/related; boundary="==0=="'
+        fake_transport.request.assert_called_once_with(
+            'POST',
+            upload_url,
+            data=payload,
+            headers=headers,
+        )
 
-            with open(temp.name, 'rb') as file_obj:
-                with self.assertRaises(BadRequest):
-                    table.upload_from_file(
-                        file_obj, 'CSV', rewind=True)
+    @mock.patch(u'google.resumable_media._upload.get_boundary',
+                return_value=b'==0==')
+    def test__do_multipart_upload(self, get_boundary):
+        self._do_multipart_upload_success_helper(get_boundary)
 
-    def _upload_from_file_helper(self, **kw):
-        import csv
-        import datetime
-        from six.moves.http_client import OK
-        from google.cloud._helpers import UTC
-        from google.cloud._testing import _NamedTemporaryFile
-        from google.cloud.bigquery.table import SchemaField
+    @mock.patch(u'google.resumable_media._upload.get_boundary',
+                return_value=b'==0==')
+    def test__do_multipart_upload_with_retry(self, get_boundary):
+        self._do_multipart_upload_success_helper(get_boundary, num_retries=8)
 
-        WHEN_TS = 1437767599.006
-        WHEN = datetime.datetime.utcfromtimestamp(WHEN_TS).replace(
-            tzinfo=UTC)
-        PATH = 'projects/%s/jobs' % (self.PROJECT,)
-        response = {'status': OK}
-        conn = _Connection(
-            (response, b'{}'),
-        )
-        client = _Client(project=self.PROJECT, connection=conn)
-        expected_job = object()
-        if 'client' in kw:
-            kw['client']._job = expected_job
-        else:
-            client._job = expected_job
-        input_file_mode = kw.pop('input_file_mode', 'rb')
-        dataset = _Dataset(client)
-        full_name = SchemaField('full_name', 'STRING', mode='REQUIRED')
-        age = SchemaField('age', 'INTEGER', mode='REQUIRED')
-        joined = SchemaField('joined', 'TIMESTAMP', mode='NULLABLE')
-        table = self._make_one(self.TABLE_NAME, dataset=dataset,
-                               schema=[full_name, age, joined])
-        ROWS = [
-            ('Phred Phlyntstone', 32, WHEN),
-            ('Bharney Rhubble', 33, WHEN + datetime.timedelta(seconds=1)),
-            ('Wylma Phlyntstone', 29, WHEN + datetime.timedelta(seconds=2)),
-            ('Bhettye Rhubble', 27, None),
-        ]
 
-        with _NamedTemporaryFile() as temp:
-            with open(temp.name, 'w') as file_obj:
-                writer = csv.writer(file_obj)
-                writer.writerow(('full_name', 'age', 'joined'))
-                writer.writerows(ROWS)
-
-            with open(temp.name, input_file_mode) as file_obj:
-                BODY = file_obj.read()
-                explicit_size = kw.pop('_explicit_size', False)
-                if explicit_size:
-                    kw['size'] = len(BODY)
-                job = table.upload_from_file(
-                    file_obj, 'CSV', rewind=True, **kw)
-
-        self.assertIs(job, expected_job)
-        return conn.http._requested, PATH, BODY
-
-    def test_upload_from_file_w_bound_client_multipart(self):
-        import json
-        from six.moves.urllib.parse import parse_qsl
-        from six.moves.urllib.parse import urlsplit
-        from google.cloud._helpers import _to_bytes
-
-        requested, PATH, BODY = self._upload_from_file_helper()
-        parse_chunk = _email_chunk_parser()
-
-        self.assertEqual(len(requested), 1)
-        req = requested[0]
-        self.assertEqual(req['method'], 'POST')
-        uri = req['uri']
-        scheme, netloc, path, qs, _ = urlsplit(uri)
-        self.assertEqual(scheme, 'http')
-        self.assertEqual(netloc, 'example.com')
-        self.assertEqual(path, '/%s' % PATH)
-        self.assertEqual(dict(parse_qsl(qs)),
-                         {'uploadType': 'multipart'})
-
-        ctype, boundary = [x.strip()
-                           for x in req['headers']['content-type'].split(';')]
-        self.assertEqual(ctype, 'multipart/related')
-        self.assertTrue(boundary.startswith('boundary="=='))
-        self.assertTrue(boundary.endswith('=="'))
-
-        divider = b'--' + _to_bytes(boundary[len('boundary="'):-1])
-        chunks = req['body'].split(divider)[1:-1]  # discard prolog / epilog
-        self.assertEqual(len(chunks), 2)
-
-        text_msg = parse_chunk(chunks[0].strip())
-        self.assertEqual(dict(text_msg._headers),
-                         {'Content-Type': 'application/json',
-                          'MIME-Version': '1.0'})
-        metadata = json.loads(text_msg._payload)
-        load_config = metadata['configuration']['load']
-        DESTINATION_TABLE = {
-            'projectId': self.PROJECT,
-            'datasetId': self.DS_NAME,
-            'tableId': self.TABLE_NAME,
-        }
-        self.assertEqual(load_config['destinationTable'], DESTINATION_TABLE)
-        self.assertEqual(load_config['sourceFormat'], 'CSV')
-
-        app_msg = parse_chunk(chunks[1].strip())
-        self.assertEqual(dict(app_msg._headers),
-                         {'Content-Type': 'application/octet-stream',
-                          'Content-Transfer-Encoding': 'binary',
-                          'MIME-Version': '1.0'})
-        body = BODY.decode('ascii').rstrip()
-        body_lines = [line.strip() for line in body.splitlines()]
-        payload_lines = app_msg._payload.rstrip().splitlines()
-        self.assertEqual(payload_lines, body_lines)
-
-    def test_upload_from_file_resumable_with_400(self):
-        import csv
-        import datetime
-        import mock
-        from six.moves.http_client import BAD_REQUEST
-        from google.cloud.exceptions import BadRequest
-        from google.cloud._helpers import UTC
-        from google.cloud._testing import _NamedTemporaryFile
+class TestTableUpload(object):
+    # NOTE: This is a "partner" to `TestTable` meant to test some of the
+    #       "upload" portions of `Table`. It also uses `pytest`-style tests
+    #       rather than `unittest`-style.
 
-        WHEN_TS = 1437767599.006
-        WHEN = datetime.datetime.utcfromtimestamp(WHEN_TS).replace(
-            tzinfo=UTC)
-        initial_response = {'status': BAD_REQUEST}
-        conn = _Connection(
-            (initial_response, b'{}'),
-        )
-        client = _Client(project=self.PROJECT, connection=conn)
+    @staticmethod
+    def _make_table():
+        from google.cloud.bigquery import _http
+        from google.cloud.bigquery import client
+        from google.cloud.bigquery import dataset
+        from google.cloud.bigquery import table
 
-        class _UploadConfig(object):
-            accept = ['*/*']
-            max_size = None
-            resumable_multipart = True
-            resumable_path = u'/upload/bigquery/v2/projects/{project}/jobs'
-            simple_multipart = True
-            simple_path = u''  # force resumable
-        dataset = _Dataset(client)
-        table = self._make_one(self.TABLE_NAME, dataset=dataset)
+        connection = mock.create_autospec(_http.Connection, instance=True)
+        client = mock.create_autospec(client.Client, instance=True)
+        client._connection = connection
+        client._credentials = mock.sentinel.credentials
+        client.project = 'project_id'
 
-        with mock.patch('google.cloud.bigquery.table._UploadConfig',
-                        new=_UploadConfig):
-            with _NamedTemporaryFile() as temp:
-                with open(temp.name, 'w') as file_obj:
-                    writer = csv.writer(file_obj)
-                    writer.writerow(('full_name', 'age', 'joined'))
-                    writer.writerow(('Phred Phlyntstone', 32, WHEN))
-
-                with open(temp.name, 'rb') as file_obj:
-                    with self.assertRaises(BadRequest):
-                        table.upload_from_file(
-                            file_obj, 'CSV', rewind=True)
-
-    # pylint: disable=too-many-statements
-    def test_upload_from_file_w_explicit_client_resumable(self):
-        import json
-        import mock
-        from six.moves.http_client import OK
-        from six.moves.urllib.parse import parse_qsl
-        from six.moves.urllib.parse import urlsplit
-
-        UPLOAD_PATH = 'https://example.com/upload/test'
-        initial_response = {'status': OK, 'location': UPLOAD_PATH}
-        upload_response = {'status': OK}
-        conn = _Connection(
-            (initial_response, b'{}'),
-            (upload_response, b'{}'),
-        )
-        client = _Client(project=self.PROJECT, connection=conn)
+        dataset = dataset.Dataset('test_dataset', client)
+        table = table.Table('test_table', dataset)
 
-        class _UploadConfig(object):
-            accept = ['*/*']
-            max_size = None
-            resumable_multipart = True
-            resumable_path = u'/upload/bigquery/v2/projects/{project}/jobs'
-            simple_multipart = True
-            simple_path = u''  # force resumable
-
-        with mock.patch('google.cloud.bigquery.table._UploadConfig',
-                        new=_UploadConfig):
-            orig_requested, PATH, BODY = self._upload_from_file_helper(
-                allow_jagged_rows=False,
-                allow_quoted_newlines=False,
-                create_disposition='CREATE_IF_NEEDED',
-                encoding='utf8',
-                field_delimiter=',',
-                ignore_unknown_values=False,
-                max_bad_records=0,
-                quote_character='"',
-                skip_leading_rows=1,
-                write_disposition='WRITE_APPEND',
-                client=client,
-                _explicit_size=True)
-
-        self.assertEqual(len(orig_requested), 0)
-
-        requested = conn.http._requested
-        self.assertEqual(len(requested), 2)
-        req = requested[0]
-        self.assertEqual(req['method'], 'POST')
-        uri = req['uri']
-        scheme, netloc, path, qs, _ = urlsplit(uri)
-        self.assertEqual(scheme, 'http')
-        self.assertEqual(netloc, 'example.com')
-        self.assertEqual(path, '/%s' % PATH)
-        self.assertEqual(dict(parse_qsl(qs)),
-                         {'uploadType': 'resumable'})
-
-        self.assertEqual(req['headers']['content-type'], 'application/json')
-        metadata = json.loads(req['body'])
-        load_config = metadata['configuration']['load']
-        DESTINATION_TABLE = {
-            'projectId': self.PROJECT,
-            'datasetId': self.DS_NAME,
-            'tableId': self.TABLE_NAME,
+        return table
+
+    @staticmethod
+    def _make_response(status_code, content='', headers={}):
+        """Make a mock HTTP response."""
+        import requests
+        response = mock.create_autospec(requests.Response, instance=True)
+        response.content = content.encode('utf-8')
+        response.headers = headers
+        response.status_code = status_code
+        return response
+
+    @classmethod
+    def _make_do_upload_patch(cls, table, method, side_effect=None):
+        """Patches the low-level upload helpers."""
+        if side_effect is None:
+            side_effect = [cls._make_response(
+                http_client.OK,
+                json.dumps({}),
+                {'Content-Type': 'application/json'})]
+        return mock.patch.object(
+            table, method, side_effect=side_effect, autospec=True)
+
+    EXPECTED_CONFIGURATION = {
+        'configuration': {
+            'load': {
+                'sourceFormat': 'CSV',
+                'destinationTable': {
+                    'projectId': 'project_id',
+                    'datasetId': 'test_dataset',
+                    'tableId': 'test_table'
+                }
+            }
+        }
+    }
+
+    @staticmethod
+    def _make_file_obj():
+        return io.BytesIO(b'hello, is it me you\'re looking for?')
+
+    # High-level tests
+
+    def test_upload_from_file_resumable(self):
+        import google.cloud.bigquery.table
+
+        table = self._make_table()
+        file_obj = self._make_file_obj()
+
+        do_upload_patch = self._make_do_upload_patch(
+            table, '_do_resumable_upload')
+        with do_upload_patch as do_upload:
+            table.upload_from_file(file_obj, source_format='CSV')
+
+        do_upload.assert_called_once_with(
+            table._dataset._client,
+            file_obj,
+            self.EXPECTED_CONFIGURATION,
+            google.cloud.bigquery.table._DEFAULT_NUM_RETRIES)
+
+    def test_upload_file_resumable_metadata(self):
+        table = self._make_table()
+        file_obj = self._make_file_obj()
+
+        config_args = {
+            'source_format': 'CSV',
+            'allow_jagged_rows': False,
+            'allow_quoted_newlines': False,
+            'create_disposition': 'CREATE_IF_NEEDED',
+            'encoding': 'utf8',
+            'field_delimiter': ',',
+            'ignore_unknown_values': False,
+            'max_bad_records': 0,
+            'quote_character': '"',
+            'skip_leading_rows': 1,
+            'write_disposition': 'WRITE_APPEND',
+            'job_name': 'oddjob'
         }
-        self.assertEqual(load_config['destinationTable'], DESTINATION_TABLE)
-        self.assertEqual(load_config['sourceFormat'], 'CSV')
-        self.assertEqual(load_config['allowJaggedRows'], False)
-        self.assertEqual(load_config['allowQuotedNewlines'], False)
-        self.assertEqual(load_config['createDisposition'], 'CREATE_IF_NEEDED')
-        self.assertEqual(load_config['encoding'], 'utf8')
-        self.assertEqual(load_config['fieldDelimiter'], ',')
-        self.assertEqual(load_config['ignoreUnknownValues'], False)
-        self.assertEqual(load_config['maxBadRecords'], 0)
-        self.assertEqual(load_config['quote'], '"')
-        self.assertEqual(load_config['skipLeadingRows'], 1)
-        self.assertEqual(load_config['writeDisposition'], 'WRITE_APPEND')
-
-        req = requested[1]
-        self.assertEqual(req['method'], 'PUT')
-        self.assertEqual(req['uri'], UPLOAD_PATH)
-        headers = req['headers']
-        length = len(BODY)
-        self.assertEqual(headers['Content-Type'], 'application/octet-stream')
-        self.assertEqual(headers['Content-Range'],
-                         'bytes 0-%d/%d' % (length - 1, length))
-        self.assertEqual(headers['content-length'], '%d' % (length,))
-        self.assertEqual(req['body'], BODY)
-    # pylint: enable=too-many-statements
-
-    def test_upload_from_file_w_jobid(self):
-        import json
-        from google.cloud._helpers import _to_bytes
-
-        requested, PATH, BODY = self._upload_from_file_helper(job_name='foo')
-        parse_chunk = _email_chunk_parser()
-        req = requested[0]
-        ctype, boundary = [x.strip()
-                           for x in req['headers']['content-type'].split(';')]
-        divider = b'--' + _to_bytes(boundary[len('boundary="'):-1])
-        chunks = req['body'].split(divider)[1:-1]  # discard prolog / epilog
-        text_msg = parse_chunk(chunks[0].strip())
-        metadata = json.loads(text_msg._payload)
-        load_config = metadata['configuration']['load']
-        self.assertEqual(load_config['jobReference'], {'jobId': 'foo'})
+
+        expected_config = {
+            'configuration': {
+                'load': {
+                    'sourceFormat': config_args['source_format'],
+                    'destinationTable': {
+                        'projectId': table._dataset._client.project,
+                        'datasetId': table.dataset_name,
+                        'tableId': table.name
+                    },
+                    'allowJaggedRows': config_args['allow_jagged_rows'],
+                    'allowQuotedNewlines':
+                        config_args['allow_quoted_newlines'],
+                    'createDisposition': config_args['create_disposition'],
+                    'encoding': config_args['encoding'],
+                    'fieldDelimiter': config_args['field_delimiter'],
+                    'ignoreUnknownValues':
+                        config_args['ignore_unknown_values'],
+                    'maxBadRecords': config_args['max_bad_records'],
+                    'quote': config_args['quote_character'],
+                    'skipLeadingRows': config_args['skip_leading_rows'],
+                    'writeDisposition': config_args['write_disposition'],
+                    'jobReference': {'jobId': config_args['job_name']}
+                }
+            }
+        }
+
+        do_upload_patch = self._make_do_upload_patch(
+            table, '_do_resumable_upload')
+        with do_upload_patch as do_upload:
+            table.upload_from_file(
+                file_obj, **config_args)
+
+        do_upload.assert_called_once_with(
+            table._dataset._client,
+            file_obj,
+            expected_config,
+            mock.ANY)
+
+    def test_upload_from_file_multipart(self):
+        import google.cloud.bigquery.table
+
+        table = self._make_table()
+        file_obj = self._make_file_obj()
+        file_obj_size = 10
+
+        do_upload_patch = self._make_do_upload_patch(
+            table, '_do_multipart_upload')
+        with do_upload_patch as do_upload:
+            table.upload_from_file(
+                file_obj, source_format='CSV', size=file_obj_size)
+
+        do_upload.assert_called_once_with(
+            table._dataset._client,
+            file_obj,
+            self.EXPECTED_CONFIGURATION,
+            file_obj_size,
+            google.cloud.bigquery.table._DEFAULT_NUM_RETRIES)
+
+    def test_upload_from_file_with_retries(self):
+        table = self._make_table()
+        file_obj = self._make_file_obj()
+        num_retries = 20
+
+        do_upload_patch = self._make_do_upload_patch(
+            table, '_do_resumable_upload')
+        with do_upload_patch as do_upload:
+            table.upload_from_file(
+                file_obj, source_format='CSV', num_retries=num_retries)
+
+        do_upload.assert_called_once_with(
+            table._dataset._client,
+            file_obj,
+            self.EXPECTED_CONFIGURATION,
+            num_retries)
+
+    def test_upload_from_file_with_rewind(self):
+        table = self._make_table()
+        file_obj = self._make_file_obj()
+        file_obj.seek(2)
+
+        with self._make_do_upload_patch(table, '_do_resumable_upload'):
+            table.upload_from_file(
+                file_obj, source_format='CSV', rewind=True)
+
+        assert file_obj.tell() == 0
+
+    def test_upload_from_file_failure(self):
+        from google.resumable_media import InvalidResponse
+        from google.cloud import exceptions
+
+        table = self._make_table()
+        file_obj = self._make_file_obj()
+
+        response = self._make_response(
+            content='Someone is already in this spot.',
+            status_code=http_client.CONFLICT)
+
+        do_upload_patch = self._make_do_upload_patch(
+            table, '_do_resumable_upload',
+            side_effect=InvalidResponse(response))
+
+        with do_upload_patch, pytest.raises(exceptions.Conflict) as exc_info:
+            table.upload_from_file(
+                file_obj, source_format='CSV', rewind=True)
+
+        assert exc_info.value.message == response.content.decode('utf-8')
+        assert exc_info.value.errors == []
+
+    def test_upload_from_file_bad_mode(self):
+        table = self._make_table()
+        file_obj = mock.Mock(spec=['mode'])
+        file_obj.mode = 'x'
+
+        with pytest.raises(ValueError):
+            table.upload_from_file(
+                file_obj, source_format='CSV',)
+
+    # Low-level tests
+
+    @classmethod
+    def _make_resumable_upload_responses(cls, size):
+        """Make a series of responses for a successful resumable upload."""
+        from google import resumable_media
+
+        resumable_url = 'http://test.invalid?upload_id=and-then-there-was-1'
+        initial_response = cls._make_response(
+            http_client.OK, '', {'location': resumable_url})
+        data_response = cls._make_response(
+            resumable_media.PERMANENT_REDIRECT,
+            '', {'range': 'bytes=0-{:d}'.format(size - 1)})
+        final_response = cls._make_response(
+            http_client.OK,
+            json.dumps({'size': size}),
+            {'Content-Type': 'application/json'})
+        return [initial_response, data_response, final_response]
+
+    @staticmethod
+    def _make_transport_patch(table, responses=None):
+        """Patch a table's _make_transport method to return given responses."""
+        import google.auth.transport.requests
+
+        transport = mock.create_autospec(
+            google.auth.transport.requests.AuthorizedSession, instance=True)
+        transport.request.side_effect = responses
+        return mock.patch.object(
+            table, '_make_transport', return_value=transport, autospec=True)
+
+    def test__do_resumable_upload(self):
+        table = self._make_table()
+        file_obj = self._make_file_obj()
+        file_obj_len = len(file_obj.getvalue())
+        responses = self._make_resumable_upload_responses(file_obj_len)
+
+        with self._make_transport_patch(table, responses) as transport:
+            result = table._do_resumable_upload(
+                table._dataset._client,
+                file_obj,
+                self.EXPECTED_CONFIGURATION,
+                None)
+
+        content = result.content.decode('utf-8')
+        assert json.loads(content) == {'size': file_obj_len}
+
+        # Verify that configuration data was passed in with the initial
+        # request.
+        transport.return_value.request.assert_any_call(
+            'POST',
+            mock.ANY,
+            data=json.dumps(self.EXPECTED_CONFIGURATION).encode('utf-8'),
+            headers=mock.ANY)
+
+    def test__do_multipart_upload(self):
+        table = self._make_table()
+        file_obj = self._make_file_obj()
+        file_obj_len = len(file_obj.getvalue())
+        responses = [self._make_response(http_client.OK)]
+
+        with self._make_transport_patch(table, responses) as transport:
+            table._do_multipart_upload(
+                table._dataset._client,
+                file_obj,
+                self.EXPECTED_CONFIGURATION,
+                file_obj_len,
+                None)
+
+        # Verify that configuration data was passed in with the initial
+        # request.
+        request_args = transport.return_value.request.mock_calls[0][2]
+        request_data = request_args['data'].decode('utf-8')
+        request_headers = request_args['headers']
+
+        request_content = email.message_from_string(
+            'Content-Type: {}\r\n{}'.format(
+                request_headers['content-type'].decode('utf-8'),
+                request_data))
+
+        # There should be two payloads: the configuration and the binary daya.
+        configuration_data = request_content.get_payload(0).get_payload()
+        binary_data = request_content.get_payload(1).get_payload()
+
+        assert json.loads(configuration_data) == self.EXPECTED_CONFIGURATION
+        assert binary_data.encode('utf-8') == file_obj.getvalue()
+
+    def test__do_multipart_upload_wrong_size(self):
+        table = self._make_table()
+        file_obj = self._make_file_obj()
+        file_obj_len = len(file_obj.getvalue())
+
+        with pytest.raises(ValueError):
+            table._do_multipart_upload(
+                table._dataset._client,
+                file_obj,
+                {},
+                file_obj_len+1,
+                None)
 
 
 class Test_parse_schema_resource(unittest.TestCase, _SchemaBase):
@@ -1974,6 +2146,70 @@ def test_w_subfields(self):
                                       'mode': 'REQUIRED'}]})
 
 
+class Test__get_upload_metadata(unittest.TestCase):
+
+    @staticmethod
+    def _call_fut(source_format, schema, dataset, name):
+        from google.cloud.bigquery.table import _get_upload_metadata
+
+        return _get_upload_metadata(source_format, schema, dataset, name)
+
+    def test_empty_schema(self):
+        source_format = 'AVRO'
+        dataset = mock.Mock(project='prediction', spec=['name', 'project'])
+        dataset.name = 'market'  # mock.Mock() treats `name` specially.
+        table_name = 'chairs'
+        metadata = self._call_fut(source_format, [], dataset, table_name)
+
+        expected = {
+            'configuration': {
+                'load': {
+                    'sourceFormat': source_format,
+                    'destinationTable': {
+                        'projectId': dataset.project,
+                        'datasetId': dataset.name,
+                        'tableId': table_name,
+                    },
+                },
+            },
+        }
+        self.assertEqual(metadata, expected)
+
+    def test_with_schema(self):
+        from google.cloud.bigquery.table import SchemaField
+
+        source_format = 'CSV'
+        full_name = SchemaField('full_name', 'STRING', mode='REQUIRED')
+        dataset = mock.Mock(project='blind', spec=['name', 'project'])
+        dataset.name = 'movie'  # mock.Mock() treats `name` specially.
+        table_name = 'teebull-neem'
+        metadata = self._call_fut(
+            source_format, [full_name], dataset, table_name)
+
+        expected = {
+            'configuration': {
+                'load': {
+                    'sourceFormat': source_format,
+                    'destinationTable': {
+                        'projectId': dataset.project,
+                        'datasetId': dataset.name,
+                        'tableId': table_name,
+                    },
+                    'schema': {
+                        'fields': [
+                            {
+                                'name': full_name.name,
+                                'type': full_name.field_type,
+                                'mode': full_name.mode,
+                            },
+                        ],
+                    },
+                },
+            },
+        }
+        self.assertEqual(metadata, expected)
+
+
 class _Client(object):
 
     _query_results = ()
@@ -1982,9 +2218,6 @@ def __init__(self, project='project', connection=None):
         self.project = project
         self._connection = connection
 
-    def job_from_resource(self, resource):  # pylint: disable=unused-argument
-        return self._job
-
     def run_sync_query(self, query):
         return _Query(query, self)
 
@@ -2016,37 +2249,14 @@ def project(self):
         return self._client.project
 
 
-class _Responder(object):
-
-    def __init__(self, *responses):
-        self._responses = responses[:]
-        self._requested = []
-
-    def _respond(self, **kw):
-        self._requested.append(kw)
-        response, self._responses = self._responses[0], self._responses[1:]
-        return response
-
-
-class _HTTP(_Responder):
-
-    connections = {}  # For google-apitools debugging.
-
-    def request(self, uri, method, headers, body, **kw):
-        if hasattr(body, 'read'):
-            body = body.read()
-        return self._respond(uri=uri, method=method, headers=headers,
-                             body=body, **kw)
-
-
-class _Connection(_Responder):
+class _Connection(object):
 
     API_BASE_URL = 'http://example.com'
     USER_AGENT = 'testing 1.2.3'
 
     def __init__(self, *responses):
-        super(_Connection, self).__init__(*responses)
-        self.http = _HTTP(*responses)
+        self._responses = responses[:]
+        self._requested = []
 
     def api_request(self, **kw):
         from google.cloud.exceptions import NotFound
@@ -2059,29 +2269,3 @@ def api_request(self, **kw):
             raise NotFound('miss')
         else:
             return response
-
-    def build_api_url(self, path, query_params=None,
-                      api_base_url=API_BASE_URL):
-        from six.moves.urllib.parse import urlencode
-        from six.moves.urllib.parse import urlsplit
-        from six.moves.urllib.parse import urlunsplit
-
-        # Mimic the build_api_url interface.
-        qs = urlencode(query_params or {})
-        scheme, netloc, _, _, _ = urlsplit(api_base_url)
-        return urlunsplit((scheme, netloc, path, qs, ''))
-
-
-def _email_chunk_parser():
-    import six
-
-    if six.PY3:  # pragma: NO COVER  Python3
-        from email.parser import BytesParser
-
-        parser = BytesParser()
-        return parser.parsebytes
-    else:
-        from email.parser import Parser
-
-        parser = Parser()
-        return parser.parsestr
diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index 7d967a3e4901d..d03d1364cf400 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -368,6 +368,7 @@ def _make_transport(self, client):
         :type client: :class:`~google.cloud.storage.client.Client`
         :param client: (Optional) The client to use.  If not passed, falls back
                        to the ``client`` stored on the blob's bucket.
+
         :rtype transport:
             :class:`~google.auth.transport.requests.AuthorizedSession`
         :returns: The transport (with credentials) that will
diff --git a/storage/setup.py b/storage/setup.py
index d18624f3c13d2..8d11055fac77c 100644
--- a/storage/setup.py
+++ b/storage/setup.py
@@ -53,7 +53,7 @@
 REQUIREMENTS = [
     'google-cloud-core >= 0.25.0, < 0.26dev',
     'google-auth >= 1.0.0',
-    'google-resumable-media >= 0.1.1',
+    'google-resumable-media >= 0.2.1',
     'requests >= 2.0.0',
 ]
 
diff --git a/storage/tests/unit/test_blob.py b/storage/tests/unit/test_blob.py
index 250a05bd28f41..e2227adbd94ae 100644
--- a/storage/tests/unit/test_blob.py
+++ b/storage/tests/unit/test_blob.py
@@ -775,7 +775,7 @@ def _do_multipart_success(self, mock_get_boundary, size=None,
         blob._make_transport = mock.Mock(return_value=fake_transport, spec=[])
 
         # Create some mock arguments.
-        client = mock.sentinel.mock
+        client = mock.sentinel.client
         data = b'data here hear hier'
         stream = io.BytesIO(data)
         content_type = u'application/xml'
@@ -865,7 +865,7 @@ def _initiate_resumable_helper(self, size=None, extra_headers=None,
         blob._make_transport = mock.Mock(return_value=fake_transport, spec=[])
 
         # Create some mock arguments and call the method under test.
-        client = mock.sentinel.mock
+        client = mock.sentinel.client
         data = b'hello hallo halo hi-low'
         stream = io.BytesIO(data)
         content_type = u'text/plain'
@@ -1033,7 +1033,7 @@ def _do_resumable_helper(self, use_size=False, num_retries=None):
         blob._make_transport = mock.Mock(return_value=fake_transport, spec=[])
 
         # Create some mock arguments and call the method under test.
-        client = mock.sentinel.mock
+        client = mock.sentinel.client
         stream = io.BytesIO(data)
         content_type = u'text/html'
         response = blob._do_resumable_upload(
@@ -1271,7 +1271,7 @@ def _create_resumable_upload_session_helper(self, origin=None,
         # Create some mock arguments and call the method under test.
         content_type = u'text/plain'
         size = 10000
-        client = mock.sentinel.mock
+        client = mock.sentinel.client
         new_url = blob.create_resumable_upload_session(
             content_type=content_type, size=size,
             origin=origin, client=client)

From d2bc36daaab2c6a0f3393754ad8a0092325bc3ec Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 21 Jul 2017 14:50:26 -0700
Subject: [PATCH 106/211] Translate GA (#3650)

---
 README.rst                                    |  2 +-
 translate/google/cloud/translate.py           | 32 +++++++++++++++++++
 .../{translate => translate_v2}/__init__.py   |  9 +++---
 .../{translate => translate_v2}/_http.py      |  2 +-
 .../{translate => translate_v2}/client.py     |  6 ++--
 translate/setup.py                            |  4 +--
 translate/tests/system.py                     |  2 +-
 translate/tests/unit/test__http.py            |  4 +--
 translate/tests/unit/test_client.py           | 11 +++----
 9 files changed, 52 insertions(+), 20 deletions(-)
 create mode 100644 translate/google/cloud/translate.py
 rename translate/google/cloud/{translate => translate_v2}/__init__.py (79%)
 rename translate/google/cloud/{translate => translate_v2}/_http.py (96%)
 rename translate/google/cloud/{translate => translate_v2}/client.py (98%)

diff --git a/README.rst b/README.rst
index 9b3d9f0db64e3..3de445aba7622 100644
--- a/README.rst
+++ b/README.rst
@@ -20,6 +20,7 @@ The following client libraries have **GA** support:
 -  `Google Cloud Datastore`_ (`Datastore README`_)
 -  `Stackdriver Logging`_ (`Logging README`_)
 -  `Google Cloud Storage`_ (`Storage README`_)
+-  `Google Cloud Translation`_ (`Translation README`_)
 
 **GA** (general availability) indicates that the client library for a
 particular service is stable, and that the code surface will not change in
@@ -33,7 +34,6 @@ The following client libraries have **beta** support:
 -  `Google BigQuery`_ (`BigQuery README`_)
 -  `Google Cloud Vision`_ (`Vision README`_)
 -  `Google Cloud Natural Language`_ (`Natural Language README`_)
--  `Google Cloud Translation`_ (`Translation README`_)
 -  `Google Cloud Video Intelligence`_ (`Video Intelligence README`_)
 
 **Beta** indicates that the client library for a particular service is
diff --git a/translate/google/cloud/translate.py b/translate/google/cloud/translate.py
new file mode 100644
index 0000000000000..9a24ceebcd10f
--- /dev/null
+++ b/translate/google/cloud/translate.py
@@ -0,0 +1,32 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Google Cloud Translation API wrapper."""
+
+
+from google.cloud.translate_v2 import __version__
+from google.cloud.translate_v2.client import Client
+
+# These constants are essentially deprecated; strings should be used instead.
+# They are imported here for backwards compatibility.
+from google.cloud.translate_v2.client import BASE
+from google.cloud.translate_v2.client import NMT
+
+
+__all__ = (
+    '__version__',
+    'BASE',
+    'Client',
+    'NMT',
+)
diff --git a/translate/google/cloud/translate/__init__.py b/translate/google/cloud/translate_v2/__init__.py
similarity index 79%
rename from translate/google/cloud/translate/__init__.py
rename to translate/google/cloud/translate_v2/__init__.py
index bf20faa86bdfc..11b762101cf7e 100644
--- a/translate/google/cloud/translate/__init__.py
+++ b/translate/google/cloud/translate_v2/__init__.py
@@ -18,9 +18,10 @@
 from pkg_resources import get_distribution
 __version__ = get_distribution('google-cloud-translate').version
 
-from google.cloud.translate.client import BASE
-from google.cloud.translate.client import Client
-from google.cloud.translate.client import NMT
+from google.cloud.translate_v2.client import Client
 
 
-__all__ = ['__version__', 'BASE', 'Client', 'NMT']
+__all__ = (
+    '__version__',
+    'Client',
+)
diff --git a/translate/google/cloud/translate/_http.py b/translate/google/cloud/translate_v2/_http.py
similarity index 96%
rename from translate/google/cloud/translate/_http.py
rename to translate/google/cloud/translate_v2/_http.py
index 0c404f2a4a3bb..dedb17ec9e14c 100644
--- a/translate/google/cloud/translate/_http.py
+++ b/translate/google/cloud/translate_v2/_http.py
@@ -16,7 +16,7 @@
 
 from google.cloud import _http
 
-from google.cloud.translate import __version__
+from google.cloud.translate_v2 import __version__
 
 
 _CLIENT_INFO = _http.CLIENT_INFO_TEMPLATE.format(__version__)
diff --git a/translate/google/cloud/translate/client.py b/translate/google/cloud/translate_v2/client.py
similarity index 98%
rename from translate/google/cloud/translate/client.py
rename to translate/google/cloud/translate_v2/client.py
index 9acd7d65cc470..d72993f0fffdc 100644
--- a/translate/google/cloud/translate/client.py
+++ b/translate/google/cloud/translate_v2/client.py
@@ -20,7 +20,7 @@
 from google.cloud._helpers import _to_bytes
 from google.cloud.client import Client as BaseClient
 
-from google.cloud.translate._http import Connection
+from google.cloud.translate_v2._http import Connection
 
 
 ENGLISH_ISO_639 = 'en'
@@ -189,8 +189,8 @@ def translate(self, values, target_language=None, format_=None,
                                   in the query.
 
         :type model: str
-        :param model: (Optional) The model used to translate the text. The
-                      only accepted values are :attr:`BASE` and :attr:`NMT`.
+        :param model: (Optional) The model used to translate the text, such
+                      as ``'base'`` or ``'nmt'``.
 
         :rtype: str or list
         :returns: A list of dictionaries for each queried value. Each
diff --git a/translate/setup.py b/translate/setup.py
index edfaf5cbdc963..12934c6b4e964 100644
--- a/translate/setup.py
+++ b/translate/setup.py
@@ -35,7 +35,7 @@
     'include_package_data': True,
     'zip_safe': False,
     'classifiers': [
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
@@ -56,7 +56,7 @@
 
 setup(
     name='google-cloud-translate',
-    version='0.25.0',
+    version='1.0.0',
     description='Python Client for Google Cloud Translation API',
     long_description=README,
     namespace_packages=[
diff --git a/translate/tests/system.py b/translate/tests/system.py
index e4b971e238f02..7403ed3c05105 100644
--- a/translate/tests/system.py
+++ b/translate/tests/system.py
@@ -56,7 +56,7 @@ def test_translate(self):
         values = ['hvala ti', 'dankon',
                   'Me llamo Jeff', 'My name is Jeff']
         translations = Config.CLIENT.translate(
-            values, target_language='de', model=translate.NMT)
+            values, target_language='de', model='nmt')
         self.assertEqual(len(values), len(translations))
 
         self.assertEqual(
diff --git a/translate/tests/unit/test__http.py b/translate/tests/unit/test__http.py
index 1d7f7b4c6c188..2dc6b015d6dec 100644
--- a/translate/tests/unit/test__http.py
+++ b/translate/tests/unit/test__http.py
@@ -21,7 +21,7 @@ class TestConnection(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.translate._http import Connection
+        from google.cloud.translate_v2._http import Connection
 
         return Connection
 
@@ -57,7 +57,7 @@ def test_build_api_url_w_extra_query_params(self):
 
     def test_extra_headers(self):
         from google.cloud import _http as base_http
-        from google.cloud.translate import _http as MUT
+        from google.cloud.translate_v2 import _http as MUT
 
         http = mock.Mock(spec=['request'])
         response = mock.Mock(status=200, spec=['status'])
diff --git a/translate/tests/unit/test_client.py b/translate/tests/unit/test_client.py
index d2c26cec96c46..18c19c436e45e 100644
--- a/translate/tests/unit/test_client.py
+++ b/translate/tests/unit/test_client.py
@@ -19,16 +19,15 @@ class TestClient(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.translate.client import Client
-
+        from google.cloud.translate import Client
         return Client
 
     def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
     def test_constructor(self):
-        from google.cloud.translate._http import Connection
-        from google.cloud.translate.client import ENGLISH_ISO_639
+        from google.cloud.translate_v2._http import Connection
+        from google.cloud.translate_v2.client import ENGLISH_ISO_639
 
         http = object()
         client = self._make_one(_http=http)
@@ -38,7 +37,7 @@ def test_constructor(self):
         self.assertEqual(client.target_language, ENGLISH_ISO_639)
 
     def test_constructor_non_default(self):
-        from google.cloud.translate._http import Connection
+        from google.cloud.translate_v2._http import Connection
 
         http = object()
         target = 'es'
@@ -49,7 +48,7 @@ def test_constructor_non_default(self):
         self.assertEqual(client.target_language, target)
 
     def test_get_languages(self):
-        from google.cloud.translate.client import ENGLISH_ISO_639
+        from google.cloud.translate_v2.client import ENGLISH_ISO_639
 
         client = self._make_one(_http=object())
         supported = [

From 6336e6c832ae148eefc3edeb2a387d8e9d72bdd3 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Fri, 21 Jul 2017 15:42:38 -0700
Subject: [PATCH 107/211] Add Future interface to BigQuery jobs (#3626)

* Add future interface to bigquery Jobs.
* Make QueryJob return QueryResults from result()
* Deprecate QueryJob.results()
---
 bigquery/google/cloud/bigquery/job.py | 201 +++++++++++++++++++++++---
 bigquery/tests/system.py              |  10 ++
 bigquery/tests/unit/test_job.py       | 102 ++++++++++++-
 3 files changed, 291 insertions(+), 22 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/job.py b/bigquery/google/cloud/bigquery/job.py
index 4f791bdbea0c9..35a423b755b97 100644
--- a/bigquery/google/cloud/bigquery/job.py
+++ b/bigquery/google/cloud/bigquery/job.py
@@ -14,8 +14,14 @@
 
 """Define API Jobs."""
 
+import collections
+import threading
+import warnings
+
 import six
+from six.moves import http_client
 
+from google.cloud import exceptions
 from google.cloud.exceptions import NotFound
 from google.cloud._helpers import _datetime_from_microseconds
 from google.cloud.bigquery.dataset import Dataset
@@ -27,6 +33,60 @@
 from google.cloud.bigquery._helpers import UDFResourcesProperty
 from google.cloud.bigquery._helpers import _EnumProperty
 from google.cloud.bigquery._helpers import _TypedProperty
+import google.cloud.future.base
+
+_DONE_STATE = 'DONE'
+_STOPPED_REASON = 'stopped'
+
+_ERROR_REASON_TO_EXCEPTION = {
+    'accessDenied': http_client.FORBIDDEN,
+    'backendError': http_client.INTERNAL_SERVER_ERROR,
+    'billingNotEnabled': http_client.FORBIDDEN,
+    'billingTierLimitExceeded': http_client.BAD_REQUEST,
+    'blocked': http_client.FORBIDDEN,
+    'duplicate': http_client.CONFLICT,
+    'internalError': http_client.INTERNAL_SERVER_ERROR,
+    'invalid': http_client.BAD_REQUEST,
+    'invalidQuery': http_client.BAD_REQUEST,
+    'notFound': http_client.NOT_FOUND,
+    'notImplemented': http_client.NOT_IMPLEMENTED,
+    'quotaExceeded': http_client.FORBIDDEN,
+    'rateLimitExceeded': http_client.FORBIDDEN,
+    'resourceInUse': http_client.BAD_REQUEST,
+    'resourcesExceeded': http_client.BAD_REQUEST,
+    'responseTooLarge': http_client.FORBIDDEN,
+    'stopped': http_client.OK,
+    'tableUnavailable': http_client.BAD_REQUEST,
+}
+
+_FakeResponse = collections.namedtuple('_FakeResponse', ['status'])
+
+
+def _error_result_to_exception(error_result):
+    """Maps BigQuery error reasons to an exception.
+
+    The reasons and their matching HTTP status codes are documented on
+    the `troubleshooting errors`_ page.
+
+    .. _troubleshooting errors: https://cloud.google.com/bigquery\
+        /troubleshooting-errors
+
+    :type error_result: Mapping[str, str]
+    :param error_result: The error result from BigQuery.
+
+    :rtype google.cloud.exceptions.GoogleCloudError:
+    :returns: The mapped exception.
+    """
+    reason = error_result.get('reason')
+    status_code = _ERROR_REASON_TO_EXCEPTION.get(
+        reason, http_client.INTERNAL_SERVER_ERROR)
+    # make_exception expects an httplib2 response object.
+    fake_response = _FakeResponse(status=status_code)
+    return exceptions.make_exception(
+        fake_response,
+        error_result.get('message', ''),
+        error_info=error_result,
+        use_json=False)
 
 
 class Compression(_EnumProperty):
@@ -82,16 +142,23 @@ class WriteDisposition(_EnumProperty):
     ALLOWED = (WRITE_APPEND, WRITE_TRUNCATE, WRITE_EMPTY)
 
 
-class _BaseJob(object):
-    """Base class for jobs.
+class _AsyncJob(google.cloud.future.base.PollingFuture):
+    """Base class for asynchronous jobs.
+
+    :type name: str
+    :param name: the name of the job
 
     :type client: :class:`google.cloud.bigquery.client.Client`
     :param client: A client which holds credentials and project configuration
                    for the dataset (which requires a project).
     """
-    def __init__(self, client):
+    def __init__(self, name, client):
+        super(_AsyncJob, self).__init__()
+        self.name = name
         self._client = client
         self._properties = {}
+        self._result_set = False
+        self._completion_lock = threading.Lock()
 
     @property
     def project(self):
@@ -117,21 +184,6 @@ def _require_client(self, client):
             client = self._client
         return client
 
-
-class _AsyncJob(_BaseJob):
-    """Base class for asynchronous jobs.
-
-    :type name: str
-    :param name: the name of the job
-
-    :type client: :class:`google.cloud.bigquery.client.Client`
-    :param client: A client which holds credentials and project configuration
-                   for the dataset (which requires a project).
-    """
-    def __init__(self, name, client):
-        super(_AsyncJob, self).__init__(client)
-        self.name = name
-
     @property
     def job_type(self):
         """Type of job
@@ -273,6 +325,9 @@ def _set_properties(self, api_response):
         self._properties.clear()
         self._properties.update(cleaned)
 
+        # For Future interface
+        self._set_future_result()
+
     @classmethod
     def _get_resource_config(cls, resource):
         """Helper for :meth:`from_api_repr`
@@ -345,7 +400,7 @@ def exists(self, client=None):
             return True
 
     def reload(self, client=None):
-        """API call:  refresh job properties via a GET request
+        """API call:  refresh job properties via a GET request.
 
         See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/get
@@ -371,12 +426,85 @@ def cancel(self, client=None):
                       ``NoneType``
         :param client: the client to use.  If not passed, falls back to the
                        ``client`` stored on the current dataset.
+
+        :rtype: bool
+        :returns: Boolean indicating that the cancel request was sent.
         """
         client = self._require_client(client)
 
         api_response = client._connection.api_request(
             method='POST', path='%s/cancel' % (self.path,))
         self._set_properties(api_response['job'])
+        # The Future interface requires that we return True if the *attempt*
+        # to cancel was successful.
+        return True
+
+    # The following methods implement the PollingFuture interface. Note that
+    # the methods above are from the pre-Future interface and are left for
+    # compatibility. The only "overloaded" method is :meth:`cancel`, which
+    # satisfies both interfaces.
+
+    def _set_future_result(self):
+        """Set the result or exception from the job if it is complete."""
+        # This must be done in a lock to prevent the polling thread
+        # and main thread from both executing the completion logic
+        # at the same time.
+        with self._completion_lock:
+            # If the operation isn't complete or if the result has already been
+            # set, do not call set_result/set_exception again.
+            # Note: self._result_set is set to True in set_result and
+            # set_exception, in case those methods are invoked directly.
+            if self.state != _DONE_STATE or self._result_set:
+                return
+
+            if self.error_result is not None:
+                exception = _error_result_to_exception(self.error_result)
+                self.set_exception(exception)
+            else:
+                self.set_result(self)
+
+    def done(self):
+        """Refresh the job and checks if it is complete.
+
+        :rtype: bool
+        :returns: True if the job is complete, False otherwise.
+        """
+        # Do not refresh is the state is already done, as the job will not
+        # change once complete.
+        if self.state != _DONE_STATE:
+            self.reload()
+        return self.state == _DONE_STATE
+
+    def result(self, timeout=None):
+        """Start the job and wait for it to complete and get the result.
+
+        :type timeout: int
+        :param timeout: How long to wait for job to complete before raising
+            a :class:`TimeoutError`.
+
+        :rtype: _AsyncJob
+        :returns: This instance.
+
+        :raises: :class:`~google.cloud.exceptions.GoogleCloudError` if the job
+            failed or  :class:`TimeoutError` if the job did not complete in the
+            given timeout.
+        """
+        if self.state is None:
+            self.begin()
+        return super(_AsyncJob, self).result(timeout=timeout)
+
+    def cancelled(self):
+        """Check if the job has been cancelled.
+
+        This always returns False. It's not possible to check if a job was
+        cancelled in the API. This method is here to satisfy the interface
+        for :class:`google.cloud.future.Future`.
+
+        :rtype: bool
+        :returns: False
+        """
+        return (self.error_result is not None
+                and self.error_result.get('reason') == _STOPPED_REASON)
 
 
 class _LoadConfiguration(object):
@@ -1127,7 +1255,7 @@ def from_api_repr(cls, resource, client):
         job._set_properties(resource)
         return job
 
-    def results(self):
+    def query_results(self):
         """Construct a QueryResults instance, bound to this job.
 
         :rtype: :class:`~google.cloud.bigquery.query.QueryResults`
@@ -1135,3 +1263,36 @@ def results(self):
         """
         from google.cloud.bigquery.query import QueryResults
         return QueryResults.from_query_job(self)
+
+    def results(self):
+        """DEPRECATED.
+
+        This method is deprecated. Use :meth:`query_results` or :meth:`result`.
+
+        Construct a QueryResults instance, bound to this job.
+
+        :rtype: :class:`~google.cloud.bigquery.query.QueryResults`
+        :returns: The query results.
+        """
+        warnings.warn(
+            'QueryJob.results() is deprecated. Please use query_results() or '
+            'result().', DeprecationWarning)
+        return self.query_results()
+
+    def result(self, timeout=None):
+        """Start the job and wait for it to complete and get the result.
+
+        :type timeout: int
+        :param timeout: How long to wait for job to complete before raising
+            a :class:`TimeoutError`.
+
+        :rtype: :class:`~google.cloud.bigquery.query.QueryResults`
+        :returns: The query results.
+
+        :raises: :class:`~google.cloud.exceptions.GoogleCloudError` if the job
+            failed or  :class:`TimeoutError` if the job did not complete in the
+            given timeout.
+        """
+        super(QueryJob, self).result(timeout=timeout)
+        # Return a QueryResults instance instead of returning the job.
+        return self.query_results()
diff --git a/bigquery/tests/system.py b/bigquery/tests/system.py
index 3391ec2bd2d86..1d3da3d2a83d7 100644
--- a/bigquery/tests/system.py
+++ b/bigquery/tests/system.py
@@ -19,6 +19,7 @@
 import os
 import time
 import unittest
+import uuid
 
 from google.cloud import bigquery
 from google.cloud._helpers import UTC
@@ -1013,6 +1014,15 @@ def test_large_query_w_public_data(self):
         rows = list(iterator)
         self.assertEqual(len(rows), LIMIT)
 
+    def test_async_query_future(self):
+        query_job = Config.CLIENT.run_async_query(
+            str(uuid.uuid4()), 'SELECT 1')
+        query_job.use_legacy_sql = False
+
+        iterator = query_job.result().fetch_data()
+        rows = list(iterator)
+        self.assertEqual(rows, [(1,)])
+
     def test_insert_nested_nested(self):
         # See #2951
         SF = bigquery.SchemaField
diff --git a/bigquery/tests/unit/test_job.py b/bigquery/tests/unit/test_job.py
index 57d96bf8ae154..8b9d079df148c 100644
--- a/bigquery/tests/unit/test_job.py
+++ b/bigquery/tests/unit/test_job.py
@@ -12,9 +12,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import copy
+import warnings
+
+from six.moves import http_client
 import unittest
 
 
+class Test__error_result_to_exception(unittest.TestCase):
+    def _call_fut(self, *args, **kwargs):
+        from google.cloud.bigquery import job
+        return job._error_result_to_exception(*args, **kwargs)
+
+    def test_simple(self):
+        error_result = {
+            'reason': 'invalid',
+            'message': 'bad request'
+        }
+        exception = self._call_fut(error_result)
+        self.assertEqual(exception.code, http_client.BAD_REQUEST)
+        self.assertTrue(exception.message.startswith('bad request'))
+        self.assertIn("'reason': 'invalid'", exception.message)
+
+    def test_missing_reason(self):
+        error_result = {}
+        exception = self._call_fut(error_result)
+        self.assertEqual(exception.code, http_client.INTERNAL_SERVER_ERROR)
+
+
 class _Base(object):
     PROJECT = 'project'
     SOURCE1 = 'http://example.com/source1.csv'
@@ -1514,15 +1539,88 @@ def test_from_api_repr_w_properties(self):
         self.assertIs(dataset._client, client)
         self._verifyResourceProperties(dataset, RESOURCE)
 
-    def test_results(self):
+    def test_cancelled(self):
+        client = _Client(self.PROJECT)
+        job = self._make_one(self.JOB_NAME, self.QUERY, client)
+        job._properties['status'] = {
+            'state': 'DONE',
+            'errorResult': {
+                'reason': 'stopped'
+            }
+        }
+
+        self.assertTrue(job.cancelled())
+
+    def test_query_results(self):
         from google.cloud.bigquery.query import QueryResults
 
         client = _Client(self.PROJECT)
         job = self._make_one(self.JOB_NAME, self.QUERY, client)
-        results = job.results()
+        results = job.query_results()
         self.assertIsInstance(results, QueryResults)
         self.assertIs(results._job, job)
 
+    def test_results_is_deprecated(self):
+        client = _Client(self.PROJECT)
+        job = self._make_one(self.JOB_NAME, self.QUERY, client)
+
+        with warnings.catch_warnings(record=True) as warned:
+            warnings.simplefilter('always')
+            job.results()
+            self.assertEqual(len(warned), 1)
+            self.assertIn('deprecated', str(warned[0]))
+
+    def test_result(self):
+        from google.cloud.bigquery.query import QueryResults
+
+        client = _Client(self.PROJECT)
+        job = self._make_one(self.JOB_NAME, self.QUERY, client)
+        job._properties['status'] = {'state': 'DONE'}
+
+        result = job.result()
+
+        self.assertIsInstance(result, QueryResults)
+        self.assertIs(result._job, job)
+
+    def test_result_invokes_begins(self):
+        begun_resource = self._makeResource()
+        done_resource = copy.deepcopy(begun_resource)
+        done_resource['status'] = {'state': 'DONE'}
+        connection = _Connection(begun_resource, done_resource)
+        client = _Client(self.PROJECT, connection=connection)
+        job = self._make_one(self.JOB_NAME, self.QUERY, client)
+
+        job.result()
+
+        self.assertEqual(len(connection._requested), 2)
+        begin_request, reload_request = connection._requested
+        self.assertEqual(begin_request['method'], 'POST')
+        self.assertEqual(reload_request['method'], 'GET')
+
+    def test_result_error(self):
+        from google.cloud import exceptions
+
+        client = _Client(self.PROJECT)
+        job = self._make_one(self.JOB_NAME, self.QUERY, client)
+        error_result = {
+            'debugInfo': 'DEBUG',
+            'location': 'LOCATION',
+            'message': 'MESSAGE',
+            'reason': 'invalid'
+        }
+        job._properties['status'] = {
+            'errorResult': error_result,
+            'errors': [error_result],
+            'state': 'DONE'
+        }
+        job._set_future_result()
+
+        with self.assertRaises(exceptions.GoogleCloudError) as exc_info:
+            job.result()
+
+        self.assertIsInstance(exc_info.exception, exceptions.GoogleCloudError)
+        self.assertEqual(exc_info.exception.code, http_client.BAD_REQUEST)
+
     def test_begin_w_bound_client(self):
         PATH = '/projects/%s/jobs' % (self.PROJECT,)
         RESOURCE = self._makeResource()

From 0414ef1eca3af5259f94d793351f91f6f7a17645 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Fri, 21 Jul 2017 16:20:38 -0700
Subject: [PATCH 108/211] Removing vendored in google.cloud.streaming. (#3654)

* Removing vendored in google.cloud.streaming.

* Modifying setup.cfg so pytest errors are sane.

This is **not** to be merged, just to debug the b0rken build:
https://circleci.com/gh/GoogleCloudPlatform/google-cloud-python/2515
---
 core/google/cloud/streaming/__init__.py       |   17 -
 .../google/cloud/streaming/buffered_stream.py |  106 -
 core/google/cloud/streaming/exceptions.py     |  122 -
 core/google/cloud/streaming/http_wrapper.py   |  396 ----
 core/google/cloud/streaming/stream_slice.py   |   87 -
 core/google/cloud/streaming/transfer.py       | 1223 ----------
 core/google/cloud/streaming/util.py           |   74 -
 core/tests/unit/streaming/__init__.py         |   13 -
 .../unit/streaming/test_buffered_stream.py    |  141 --
 core/tests/unit/streaming/test_exceptions.py  |  105 -
 .../tests/unit/streaming/test_http_wrapper.py |  498 ----
 .../tests/unit/streaming/test_stream_slice.py |   90 -
 core/tests/unit/streaming/test_transfer.py    | 2035 -----------------
 core/tests/unit/streaming/test_util.py        |   66 -
 setup.cfg                                     |    3 +
 15 files changed, 3 insertions(+), 4973 deletions(-)
 delete mode 100644 core/google/cloud/streaming/__init__.py
 delete mode 100644 core/google/cloud/streaming/buffered_stream.py
 delete mode 100644 core/google/cloud/streaming/exceptions.py
 delete mode 100644 core/google/cloud/streaming/http_wrapper.py
 delete mode 100644 core/google/cloud/streaming/stream_slice.py
 delete mode 100644 core/google/cloud/streaming/transfer.py
 delete mode 100644 core/google/cloud/streaming/util.py
 delete mode 100644 core/tests/unit/streaming/__init__.py
 delete mode 100644 core/tests/unit/streaming/test_buffered_stream.py
 delete mode 100644 core/tests/unit/streaming/test_exceptions.py
 delete mode 100644 core/tests/unit/streaming/test_http_wrapper.py
 delete mode 100644 core/tests/unit/streaming/test_stream_slice.py
 delete mode 100644 core/tests/unit/streaming/test_transfer.py
 delete mode 100644 core/tests/unit/streaming/test_util.py

diff --git a/core/google/cloud/streaming/__init__.py b/core/google/cloud/streaming/__init__.py
deleted file mode 100644
index 44e00907cb66b..0000000000000
--- a/core/google/cloud/streaming/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Vendored-in from google-apitools 0.4.11
-
-"""Base ``google.cloud.streaming`` package."""
diff --git a/core/google/cloud/streaming/buffered_stream.py b/core/google/cloud/streaming/buffered_stream.py
deleted file mode 100644
index 24a52176cb66b..0000000000000
--- a/core/google/cloud/streaming/buffered_stream.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Small helper class to provide a small slice of a stream.
-
-This class reads ahead to detect if we are at the end of the stream.
-"""
-
-
-class BufferedStream(object):
-    """Buffers a stream, reading ahead to determine if we're at the end.
-
-    :type stream:  readable file-like object
-    :param stream:  the stream to be buffered
-
-    :type start: int
-    :param start: the starting point in the stream
-
-    :type size: int
-    :param size:  the size of the buffer
-    """
-    def __init__(self, stream, start, size):
-        self._stream = stream
-        self._start_pos = start
-        self._buffer_pos = 0
-
-        if not hasattr(self._stream, 'closed') or not self._stream.closed:
-            self._buffered_data = self._stream.read(size)
-        else:
-            self._buffered_data = b''
-
-        self._stream_at_end = len(self._buffered_data) < size
-        self._end_pos = self._start_pos + len(self._buffered_data)
-
-    def __repr__(self):
-        return ('Buffered stream %s from position %s-%s with %s '
-                'bytes remaining' % (self._stream, self._start_pos,
-                                     self._end_pos, self._bytes_remaining))
-
-    def __len__(self):
-        return len(self._buffered_data)
-
-    @property
-    def stream_exhausted(self):
-        """Does the stream have bytes remaining beyond the buffer
-
-        :rtype: bool
-        :returns: Boolean indicating if the stream is exhausted.
-        """
-        return self._stream_at_end
-
-    @property
-    def stream_end_position(self):
-        """Point to which stream was read into the buffer
-
-        :rtype: int
-        :returns: The end-position of the stream.
-        """
-        return self._end_pos
-
-    @property
-    def _bytes_remaining(self):
-        """Bytes remaining to be read from the buffer
-
-        :rtype: int
-        :returns: The number of bytes remaining.
-        """
-        return len(self._buffered_data) - self._buffer_pos
-
-    def read(self, size=None):
-        """Read bytes from the buffer.
-
-        :type size: int
-        :param size:
-            (Optional) How many bytes to read (defaults to all remaining
-            bytes).
-
-        :rtype: str
-        :returns: The data read from the stream.
-        """
-        if size is None or size < 0:
-            raise ValueError(
-                'Illegal read of size %s requested on BufferedStream. '
-                'Wrapped stream %s is at position %s-%s, '
-                '%s bytes remaining.' %
-                (size, self._stream, self._start_pos, self._end_pos,
-                 self._bytes_remaining))
-
-        if not self._bytes_remaining:
-            return b''
-
-        size = min(size, self._bytes_remaining)
-        data = self._buffered_data[self._buffer_pos:self._buffer_pos + size]
-        self._buffer_pos += size
-        return data
diff --git a/core/google/cloud/streaming/exceptions.py b/core/google/cloud/streaming/exceptions.py
deleted file mode 100644
index cfeb8f8fa41fa..0000000000000
--- a/core/google/cloud/streaming/exceptions.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Exceptions for generated client libraries."""
-
-
-class Error(Exception):
-    """Base class for all exceptions."""
-
-
-class CommunicationError(Error):
-    """Any communication error talking to an API server."""
-
-
-class HttpError(CommunicationError):
-    """Error making a request. Soon to be HttpError.
-
-    :type response: dict
-    :param response: headers from the response which returned the error
-
-    :type content: bytes
-    :param content: payload of the response which returned the error
-
-    :type url: str
-    :param url: URL of the response which returned the error
-    """
-    def __init__(self, response, content, url):
-        super(HttpError, self).__init__()
-        self.response = response
-        self.content = content
-        self.url = url
-
-    def __str__(self):
-        content = self.content.decode('ascii', 'replace')
-        return 'HttpError accessing <%s>: response: <%s>, content <%s>' % (
-            self.url, self.response, content)
-
-    @property
-    def status_code(self):
-        """Status code for the response.
-
-        :rtype: int
-        :returns: the code
-        """
-        return int(self.response['status'])
-
-    @classmethod
-    def from_response(cls, http_response):
-        """Factory:  construct an exception from a response.
-
-        :type http_response: :class:`~.http_wrapper.Response`
-        :param http_response: the response which returned the error
-
-        :rtype: :class:`HttpError`
-        :returns: The error created from the response.
-        """
-        return cls(http_response.info, http_response.content,
-                   http_response.request_url)
-
-
-class TransferError(CommunicationError):
-    """Errors related to transfers."""
-
-
-class TransferRetryError(TransferError):
-    """Retryable errors related to transfers."""
-
-
-class TransferInvalidError(TransferError):
-    """The given transfer is invalid."""
-
-
-class RequestError(CommunicationError):
-    """The request was not successful."""
-
-
-class RetryAfterError(HttpError):
-    """The response contained a retry-after header.
-
-    :type response: dict
-    :param response: headers from the response which returned the error.
-
-    :type content: bytes
-    :param content: payload of the response which returned the error.
-
-    :type url: str
-    :param url: URL of the response which returned the error.
-
-    :type retry_after: int
-    :param retry_after: seconds to wait before retrying.
-    """
-    def __init__(self, response, content, url, retry_after):
-        super(RetryAfterError, self).__init__(response, content, url)
-        self.retry_after = int(retry_after)
-
-    @classmethod
-    def from_response(cls, http_response):
-        """Factory:  construct an exception from a response.
-
-        :type http_response: :class:`~.http_wrapper.Response`
-        :param http_response: the response which returned the error.
-
-        :rtype: :class:`RetryAfterError`
-        :returns: The error created from the response.
-        """
-        return cls(http_response.info, http_response.content,
-                   http_response.request_url, http_response.retry_after)
-
-
-class BadStatusCodeError(HttpError):
-    """The request completed but returned a bad status code."""
diff --git a/core/google/cloud/streaming/http_wrapper.py b/core/google/cloud/streaming/http_wrapper.py
deleted file mode 100644
index e80e105175e7a..0000000000000
--- a/core/google/cloud/streaming/http_wrapper.py
+++ /dev/null
@@ -1,396 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""HTTP wrapper for apitools.
-
-This library wraps the underlying http library we use, which is
-currently :mod:`httplib2`.
-"""
-
-import collections
-import contextlib
-import logging
-import socket
-import time
-
-import httplib2
-import six
-from six.moves import http_client
-from six.moves.urllib import parse
-
-from google.cloud.streaming.exceptions import BadStatusCodeError
-from google.cloud.streaming.exceptions import RequestError
-from google.cloud.streaming.exceptions import RetryAfterError
-from google.cloud.streaming.util import calculate_wait_for_retry
-
-
-_REDIRECTIONS = 5
-# 308 and 429 don't have names in httplib.
-RESUME_INCOMPLETE = 308
-TOO_MANY_REQUESTS = 429
-
-
-_REDIRECT_STATUS_CODES = (
-    http_client.MOVED_PERMANENTLY,
-    http_client.FOUND,
-    http_client.SEE_OTHER,
-    http_client.TEMPORARY_REDIRECT,
-    RESUME_INCOMPLETE,
-)
-
-
-_RETRYABLE_EXCEPTIONS = (
-    http_client.BadStatusLine,
-    http_client.IncompleteRead,
-    http_client.ResponseNotReady,
-    socket.error,
-    httplib2.ServerNotFoundError,
-    ValueError,
-    RequestError,
-    BadStatusCodeError,
-    RetryAfterError,
-)
-
-
-@contextlib.contextmanager
-def _httplib2_debug_level(http_request, level, http=None):
-    """Temporarily change the value of httplib2.debuglevel, if necessary.
-
-    If http_request has a `loggable_body` distinct from `body`, then we
-    need to prevent httplib2 from logging the full body. This sets
-    httplib2.debuglevel for the duration of the `with` block; however,
-    that alone won't change the value of existing HTTP connections. If
-    an httplib2.Http object is provided, we'll also change the level on
-    any cached connections attached to it.
-
-    :type http_request: :class:`Request`
-    :param http_request: the request to be logged.
-
-    :type level: int
-    :param level: the debuglevel for logging.
-
-    :type http: :class:`httplib2.Http`
-    :param http:
-        (Optional) the instance on whose connections to set the debuglevel.
-    """
-    if http_request.loggable_body is None:
-        yield
-        return
-    old_level = httplib2.debuglevel
-    http_levels = {}
-    httplib2.debuglevel = level
-    if http is not None and getattr(http, 'connections', None) is not None:
-        for connection_key, connection in http.connections.items():
-            # httplib2 stores two kinds of values in this dict, connection
-            # classes and instances. Since the connection types are all
-            # old-style classes, we can't easily distinguish by connection
-            # type -- so instead we use the key pattern.
-            if ':' not in connection_key:
-                continue
-            http_levels[connection_key] = connection.debuglevel
-            connection.set_debuglevel(level)
-    yield
-    httplib2.debuglevel = old_level
-    if http is not None:
-        for connection_key, old_level in http_levels.items():
-            http.connections[connection_key].set_debuglevel(old_level)
-
-
-class Request(object):
-    """Encapsulates the data for an HTTP request.
-
-    :type url: str
-    :param url: the URL for the request
-
-    :type http_method: str
-    :param http_method: the HTTP method to use for the request
-
-    :type headers: mapping
-    :param headers: (Optional) headers to be sent with the request
-
-    :type body: str
-    :param body: body to be sent with the request
-    """
-    def __init__(self, url='', http_method='GET', headers=None, body=''):
-        self.url = url
-        self.http_method = http_method
-        self.headers = headers or {}
-        self._body = None
-        self._loggable_body = None
-        self.body = body
-
-    @property
-    def loggable_body(self):
-        """Request body for logging purposes
-
-        :rtype: str
-        :returns: The body to be logged.
-        """
-        return self._loggable_body
-
-    @loggable_body.setter
-    def loggable_body(self, value):
-        """Update request body for logging purposes
-
-        :type value: str
-        :param value: updated body
-
-        :raises: :exc:`RequestError` if the request does not have a body.
-        """
-        if self.body is None:
-            raise RequestError(
-                'Cannot set loggable body on request with no body')
-        self._loggable_body = value
-
-    @property
-    def body(self):
-        """Request body
-
-        :rtype: str
-        :returns: The body of the request.
-        """
-        return self._body
-
-    @body.setter
-    def body(self, value):
-        """Update the request body
-
-        Handles logging and length measurement.
-
-        :type value: str
-        :param value: updated body
-        """
-        self._body = value
-        if value is not None:
-            # Avoid calling len() which cannot exceed 4GiB in 32-bit python.
-            body_length = getattr(
-                self._body, 'length', None) or len(self._body)
-            self.headers['content-length'] = str(body_length)
-        else:
-            self.headers.pop('content-length', None)
-        # This line ensures we don't try to print large requests.
-        if not isinstance(value, (type(None), six.string_types)):
-            self.loggable_body = '<media body>'
-
-
-def _process_content_range(content_range):
-    """Convert a 'Content-Range' header into a length for the response.
-
-    Helper for :meth:`Response.length`.
-
-    :type content_range: str
-    :param content_range: the header value being parsed.
-
-    :rtype: int
-    :returns: the length of the response chunk.
-    """
-    _, _, range_spec = content_range.partition(' ')
-    byte_range, _, _ = range_spec.partition('/')
-    start, _, end = byte_range.partition('-')
-    return int(end) - int(start) + 1
-
-
-# Note: currently the order of fields here is important, since we want
-# to be able to pass in the result from httplib2.request.
-_ResponseTuple = collections.namedtuple(
-    'HttpResponse', ['info', 'content', 'request_url'])
-
-
-class Response(_ResponseTuple):
-    """Encapsulates data for an HTTP response.
-    """
-    __slots__ = ()
-
-    def __len__(self):
-        return self.length
-
-    @property
-    def length(self):
-        """Length of this response.
-
-        Exposed as an attribute since using ``len()`` directly can fail
-        for responses larger than ``sys.maxint``.
-
-        :rtype: int or long
-        :returns: The length of the response.
-        """
-        if 'content-encoding' in self.info and 'content-range' in self.info:
-            # httplib2 rewrites content-length in the case of a compressed
-            # transfer; we can't trust the content-length header in that
-            # case, but we *can* trust content-range, if it's present.
-            return _process_content_range(self.info['content-range'])
-        elif 'content-length' in self.info:
-            return int(self.info.get('content-length'))
-        elif 'content-range' in self.info:
-            return _process_content_range(self.info['content-range'])
-        return len(self.content)
-
-    @property
-    def status_code(self):
-        """HTTP status code
-
-        :rtype: int
-        :returns: The response status code.
-        """
-        return int(self.info['status'])
-
-    @property
-    def retry_after(self):
-        """Retry interval (if set).
-
-        :rtype: int
-        :returns: interval in seconds
-        """
-        if 'retry-after' in self.info:
-            return int(self.info['retry-after'])
-
-    @property
-    def is_redirect(self):
-        """Does this response contain a redirect
-
-        :rtype: bool
-        :returns: True if the status code indicates a redirect and the
-                  'location' header is present.
-        """
-        return (self.status_code in _REDIRECT_STATUS_CODES and
-                'location' in self.info)
-
-
-def _check_response(response):
-    """Validate a response
-
-    :type response: :class:`Response`
-    :param response: the response to validate
-
-    :raises: :exc:`google.cloud.streaming.exceptions.RequestError` if response
-             is None, :exc:`~.exceptions.BadStatusCodeError` if response status
-             code indicates an error, or :exc:`~.exceptions.RetryAfterError`
-             if response indicates a retry interval.
-    """
-    if response is None:
-        # Caller shouldn't call us if the response is None, but handle anyway.
-        raise RequestError(
-            'Request did not return a response.')
-    elif (response.status_code >= 500 or
-          response.status_code == TOO_MANY_REQUESTS):
-        raise BadStatusCodeError.from_response(response)
-    elif response.retry_after:
-        raise RetryAfterError.from_response(response)
-
-
-def _reset_http_connections(http):
-    """Rebuild all http connections in the httplib2.Http instance.
-
-    httplib2 overloads the map in http.connections to contain two different
-    types of values:
-    { scheme string:  connection class } and
-    { scheme + authority string : actual http connection }
-    Here we remove all of the entries for actual connections so that on the
-    next request httplib2 will rebuild them from the connection types.
-
-    :type http: :class:`httplib2.Http`
-    :param http: the instance whose connections are to be rebuilt
-    """
-    if getattr(http, 'connections', None):
-        for conn_key in list(http.connections.keys()):
-            if ':' in conn_key:
-                del http.connections[conn_key]
-
-
-def _make_api_request_no_retry(http, http_request, redirections=_REDIRECTIONS):
-    """Send an HTTP request via the given http instance.
-
-    This wrapper exists to handle translation between the plain httplib2
-    request/response types and the Request and Response types above.
-
-    :type http: :class:`httplib2.Http`
-    :param http: an instance which impelements the `Http` API.
-
-    :type http_request: :class:`Request`
-    :param http_request: the request to send.
-
-    :type redirections: int
-    :param redirections: Number of redirects to follow.
-
-    :rtype: :class:`Response`
-    :returns: an object representing the server's response
-
-    :raises: :exc:`google.cloud.streaming.exceptions.RequestError` if no
-             response could be parsed.
-    """
-    connection_type = None
-    # Handle overrides for connection types.  This is used if the caller
-    # wants control over the underlying connection for managing callbacks
-    # or hash digestion.
-    if getattr(http, 'connections', None):
-        url_scheme = parse.urlsplit(http_request.url).scheme
-        if url_scheme and url_scheme in http.connections:
-            connection_type = http.connections[url_scheme]
-
-    # Custom printing only at debuglevel 4
-    new_debuglevel = 4 if httplib2.debuglevel == 4 else 0
-    with _httplib2_debug_level(http_request, new_debuglevel, http=http):
-        info, content = http.request(
-            str(http_request.url), method=str(http_request.http_method),
-            body=http_request.body, headers=http_request.headers,
-            redirections=redirections, connection_type=connection_type)
-
-    if info is None:
-        raise RequestError()
-
-    response = Response(info, content, http_request.url)
-    _check_response(response)
-    return response
-
-
-def make_api_request(http, http_request, retries=7,
-                     redirections=_REDIRECTIONS):
-    """Send an HTTP request via the given http, performing error/retry handling.
-
-    :type http: :class:`httplib2.Http`
-    :param http: an instance which implements the `Http` API.
-
-    :type http_request: :class:`Request`
-    :param http_request: the request to send.
-
-    :type retries: int
-    :param retries: Number of retries to attempt on retryable
-                    responses (such as 429 or 5XX).
-
-    :type redirections: int
-    :param redirections: Number of redirects to follow.
-
-    :rtype: :class:`Response`
-    :returns: an object representing the server's response.
-
-    :raises: :exc:`google.cloud.streaming.exceptions.RequestError` if no
-             response could be parsed.
-    """
-    retry = 0
-    while True:
-        try:
-            return _make_api_request_no_retry(http, http_request,
-                                              redirections=redirections)
-        except _RETRYABLE_EXCEPTIONS as exc:
-            retry += 1
-            if retry >= retries:
-                raise
-            retry_after = getattr(exc, 'retry_after', None)
-            if retry_after is None:
-                retry_after = calculate_wait_for_retry(retry)
-
-            _reset_http_connections(http)
-            logging.debug('Retrying request to url %s after exception %s',
-                          http_request.url, type(exc).__name__)
-            time.sleep(retry_after)
diff --git a/core/google/cloud/streaming/stream_slice.py b/core/google/cloud/streaming/stream_slice.py
deleted file mode 100644
index 3a13337bb9937..0000000000000
--- a/core/google/cloud/streaming/stream_slice.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Small helper class to provide a small slice of a stream."""
-
-from six.moves import http_client
-
-
-class StreamSlice(object):
-    """Provides a slice-like object for streams.
-
-    :type stream:  readable file-like object
-    :param stream:  the stream to be buffered.
-
-    :type max_bytes: int
-    :param max_bytes: maximum number of bytes to return in the slice.
-    """
-    def __init__(self, stream, max_bytes):
-        self._stream = stream
-        self._remaining_bytes = max_bytes
-        self._max_bytes = max_bytes
-
-    def __repr__(self):
-        return 'Slice of stream %s with %s/%s bytes not yet read' % (
-            self._stream, self._remaining_bytes, self._max_bytes)
-
-    def __len__(self):
-        return self._max_bytes
-
-    def __nonzero__(self):
-        # For 32-bit python2.x, len() cannot exceed a 32-bit number; avoid
-        # accidental len() calls from httplib in the form of "if this_object:".
-        return bool(self._max_bytes)
-
-    @property
-    def length(self):
-        """Maximum number of bytes to return in the slice.
-
-        .. note::
-
-           For 32-bit python2.x, len() cannot exceed a 32-bit number.
-
-        :rtype: int
-        :returns: The max "length" of the stream.
-        """
-        return self._max_bytes
-
-    def read(self, size=None):
-        """Read bytes from the slice.
-
-        Compared to other streams, there is one case where we may
-        unexpectedly raise an exception on read: if the underlying stream
-        is exhausted (i.e. returns no bytes on read), and the size of this
-        slice indicates we should still be able to read more bytes, we
-        raise :exc:`IncompleteRead`.
-
-        :type size: int
-        :param size:
-            (Optional) If provided, read no more than size bytes from the
-            stream.
-
-        :rtype: bytes
-        :returns: bytes read from this slice.
-
-        :raises: :exc:`IncompleteRead`
-        """
-        if size is not None:
-            read_size = min(size, self._remaining_bytes)
-        else:
-            read_size = self._remaining_bytes
-        data = self._stream.read(read_size)
-        if read_size > 0 and not data:
-            raise http_client.IncompleteRead(
-                self._max_bytes - self._remaining_bytes, self._max_bytes)
-        self._remaining_bytes -= len(data)
-        return data
diff --git a/core/google/cloud/streaming/transfer.py b/core/google/cloud/streaming/transfer.py
deleted file mode 100644
index 3d6d5b8e6016f..0000000000000
--- a/core/google/cloud/streaming/transfer.py
+++ /dev/null
@@ -1,1223 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# pylint: disable=too-many-lines
-
-"""Upload and download support for apitools."""
-
-import email.generator as email_generator
-import email.mime.multipart as mime_multipart
-import email.mime.nonmultipart as mime_nonmultipart
-import mimetypes
-import os
-
-import httplib2
-import six
-from six.moves import http_client
-
-from google.cloud._helpers import _to_bytes
-from google.cloud.streaming.buffered_stream import BufferedStream
-from google.cloud.streaming.exceptions import CommunicationError
-from google.cloud.streaming.exceptions import HttpError
-from google.cloud.streaming.exceptions import TransferInvalidError
-from google.cloud.streaming.exceptions import TransferRetryError
-from google.cloud.streaming.http_wrapper import make_api_request
-from google.cloud.streaming.http_wrapper import Request
-from google.cloud.streaming.http_wrapper import RESUME_INCOMPLETE
-from google.cloud.streaming.stream_slice import StreamSlice
-from google.cloud.streaming.util import acceptable_mime_type
-
-
-RESUMABLE_UPLOAD_THRESHOLD = 5 << 20
-SIMPLE_UPLOAD = 'simple'
-RESUMABLE_UPLOAD = 'resumable'
-
-
-_DEFAULT_CHUNKSIZE = 1 << 20
-
-
-class _Transfer(object):
-    """Generic bits common to Uploads and Downloads.
-
-    :type stream: file-like object
-    :param stream: stream to/from which data is downloaded/uploaded.
-
-    :type close_stream: bool
-    :param close_stream: should this instance close the stream when deleted
-
-    :type chunksize: int
-    :param chunksize: the size of chunks used to download/upload a file.
-
-    :type auto_transfer: bool
-    :param auto_transfer: should this instance automatically begin transfering
-                          data when initialized
-
-    :type http: :class:`httplib2.Http` (or workalike)
-    :param http: Http instance used to perform requests.
-
-    :type num_retries: int
-    :param num_retries: how many retries should the transfer attempt
-    """
-
-    _num_retries = None
-
-    def __init__(self, stream, close_stream=False,
-                 chunksize=_DEFAULT_CHUNKSIZE, auto_transfer=True,
-                 http=None, num_retries=5):
-        self._bytes_http = None
-        self._close_stream = close_stream
-        self._http = http
-        self._stream = stream
-        self._url = None
-
-        # Let the @property do validation.
-        self.num_retries = num_retries
-
-        self.auto_transfer = auto_transfer
-        self.chunksize = chunksize
-
-    def __repr__(self):
-        return str(self)
-
-    @property
-    def close_stream(self):
-        """Should this instance close the stream when deleted.
-
-        :rtype: bool
-        :returns: Boolean indicated if the stream should be closed.
-        """
-        return self._close_stream
-
-    @property
-    def http(self):
-        """Http instance used to perform requests.
-
-        :rtype: :class:`httplib2.Http` (or workalike)
-        :returns: The HTTP object used for requests.
-        """
-        return self._http
-
-    @property
-    def bytes_http(self):
-        """Http instance used to perform binary requests.
-
-        Defaults to :attr:`http`.
-
-        :rtype: :class:`httplib2.Http` (or workalike)
-        :returns: The HTTP object used for binary requests.
-        """
-        return self._bytes_http or self.http
-
-    @bytes_http.setter
-    def bytes_http(self, value):
-        """Update Http instance used to perform binary requests.
-
-        :type value: :class:`httplib2.Http` (or workalike)
-        :param value: new instance
-        """
-        self._bytes_http = value
-
-    @property
-    def num_retries(self):
-        """How many retries should the transfer attempt
-
-        :rtype: int
-        :returns: The number of retries allowed.
-        """
-        return self._num_retries
-
-    @num_retries.setter
-    def num_retries(self, value):
-        """Update how many retries should the transfer attempt
-
-        :type value: int
-        """
-        if not isinstance(value, six.integer_types):
-            raise ValueError("num_retries: pass an integer")
-
-        if value < 0:
-            raise ValueError(
-                'Cannot have negative value for num_retries')
-        self._num_retries = value
-
-    @property
-    def stream(self):
-        """Stream to/from which data is downloaded/uploaded.
-
-        :rtype: file-like object
-        :returns: The stream that sends/receives data.
-        """
-        return self._stream
-
-    @property
-    def url(self):
-        """URL to / from which data is downloaded/uploaded.
-
-        :rtype: str
-        :returns: The URL where data is sent/received.
-        """
-        return self._url
-
-    def _initialize(self, http, url):
-        """Initialize this download by setting :attr:`http` and :attr`url`.
-
-        Allow the user to be able to pre-initialize :attr:`http` by setting
-        the value in the constructor; in that case, we ignore the provided
-        http.
-
-        :type http: :class:`httplib2.Http` (or a worklike) or None.
-        :param http: the Http instance to use to make requests.
-
-        :type url: str
-        :param url: The url for this transfer.
-        """
-        self._ensure_uninitialized()
-        if self.http is None:
-            self._http = http or httplib2.Http()
-        self._url = url
-
-    @property
-    def initialized(self):
-        """Has the instance been initialized
-
-        :rtype: bool
-        :returns: Boolean indicating if the current transfer
-                  has been initialized.
-        """
-        return self.url is not None and self.http is not None
-
-    def _ensure_initialized(self):
-        """Helper:  assert that the instance is initialized.
-
-        :raises: :exc:`google.cloud.streaming.exceptions.TransferInvalidError`
-                 if the instance is not initialized.
-        """
-        if not self.initialized:
-            raise TransferInvalidError(
-                'Cannot use uninitialized %s', type(self).__name__)
-
-    def _ensure_uninitialized(self):
-        """Helper:  assert that the instance is not initialized.
-
-        :raises: :exc:`google.cloud.streaming.exceptions.TransferInvalidError`
-                 if the instance is already initialized.
-        """
-        if self.initialized:
-            raise TransferInvalidError(
-                'Cannot re-initialize %s', type(self).__name__)
-
-    def __del__(self):
-        if self._close_stream:
-            self._stream.close()
-
-
-class Download(_Transfer):
-    """Represent a single download.
-
-    :type stream: file-like object
-    :param stream: stream to/from which data is downloaded/uploaded.
-
-    :type kwds: dict
-    :param kwds:  keyword arguments:  all except ``total_size`` are passed
-                  through to :meth:`_Transfer.__init__()`.
-    """
-    _ACCEPTABLE_STATUSES = set((
-        http_client.OK,
-        http_client.NO_CONTENT,
-        http_client.PARTIAL_CONTENT,
-        http_client.REQUESTED_RANGE_NOT_SATISFIABLE,
-    ))
-
-    def __init__(self, stream, **kwds):
-        total_size = kwds.pop('total_size', None)
-        super(Download, self).__init__(stream, **kwds)
-        self._initial_response = None
-        self._progress = 0
-        self._total_size = total_size
-        self._encoding = None
-
-    @classmethod
-    def from_file(cls, filename, overwrite=False, auto_transfer=True, **kwds):
-        """Create a new download object from a filename.
-
-        :type filename: str
-        :param filename: path/filename for the target file
-
-        :type overwrite: bool
-        :param overwrite: should an existing file be overwritten
-
-        :type auto_transfer: bool
-        :param auto_transfer: should the transfer be started immediately
-
-        :type kwds: dict
-        :param kwds:  keyword arguments:  passed
-                      through to :meth:`_Transfer.__init__()`.
-
-        :rtype: :class:`Download`
-        :returns: The download initiated from the file passed.
-        """
-        path = os.path.expanduser(filename)
-        if os.path.exists(path) and not overwrite:
-            raise ValueError(
-                'File %s exists and overwrite not specified' % path)
-        return cls(open(path, 'wb'), close_stream=True,
-                   auto_transfer=auto_transfer, **kwds)
-
-    @classmethod
-    def from_stream(cls, stream, auto_transfer=True, total_size=None, **kwds):
-        """Create a new Download object from a stream.
-
-        :type stream: writable file-like object
-        :param stream: the target file
-
-        :type total_size: int
-        :param total_size: (Optional) total size of the file to be downloaded
-
-        :type auto_transfer: bool
-        :param auto_transfer: should the transfer be started immediately
-
-        :type kwds: dict
-        :param kwds:  keyword arguments:  passed
-                      through to :meth:`_Transfer.__init__()`.
-
-        :rtype: :class:`Download`
-        :returns: The download initiated from the stream passed.
-        """
-        return cls(stream, auto_transfer=auto_transfer, total_size=total_size,
-                   **kwds)
-
-    @property
-    def progress(self):
-        """Number of bytes have been downloaded.
-
-        :rtype: int >= 0
-        :returns: The number of downloaded bytes.
-        """
-        return self._progress
-
-    @property
-    def total_size(self):
-        """Total number of bytes to be downloaded.
-
-        :rtype: int or None
-        :returns: The total number of bytes to download.
-        """
-        return self._total_size
-
-    @property
-    def encoding(self):
-        """'Content-Encoding' used to transfer the file
-
-        :rtype: str or None
-        :returns: The encoding of the downloaded content.
-        """
-        return self._encoding
-
-    def __repr__(self):
-        if not self.initialized:
-            return 'Download (uninitialized)'
-        else:
-            return 'Download with %d/%s bytes transferred from url %s' % (
-                self.progress, self.total_size, self.url)
-
-    def configure_request(self, http_request, url_builder):
-        """Update http_request/url_builder with download-appropriate values.
-
-        :type http_request: :class:`~.streaming.http_wrapper.Request`
-        :param http_request: the request to be updated
-
-        :type url_builder: instance with settable 'query_params' attribute.
-        :param url_builder: transfer policy object to be updated
-        """
-        url_builder.query_params['alt'] = 'media'
-        http_request.headers['Range'] = 'bytes=0-%d' % (self.chunksize - 1,)
-
-    def _set_total(self, info):
-        """Update 'total_size' based on data from a response.
-
-        :type info: mapping
-        :param info: response headers
-        """
-        if 'content-range' in info:
-            _, _, total = info['content-range'].rpartition('/')
-            if total != '*':
-                self._total_size = int(total)
-        # Note "total_size is None" means we don't know it; if no size
-        # info was returned on our initial range request, that means we
-        # have a 0-byte file. (That last statement has been verified
-        # empirically, but is not clearly documented anywhere.)
-        if self.total_size is None:
-            self._total_size = 0
-
-    def initialize_download(self, http_request, http):
-        """Initialize this download.
-
-        If the instance has :attr:`auto_transfer` enabled, begins the
-        download immediately.
-
-        :type http_request: :class:`~.streaming.http_wrapper.Request`
-        :param http_request: the request to use to initialize this download.
-
-        :type http: :class:`httplib2.Http` (or workalike)
-        :param http: Http instance for this request.
-        """
-        self._ensure_uninitialized()
-        url = http_request.url
-        if self.auto_transfer:
-            end_byte = self._compute_end_byte(0)
-            self._set_range_header(http_request, 0, end_byte)
-            response = make_api_request(
-                self.bytes_http or http, http_request)
-            if response.status_code not in self._ACCEPTABLE_STATUSES:
-                raise HttpError.from_response(response)
-            self._initial_response = response
-            self._set_total(response.info)
-            url = response.info.get('content-location', response.request_url)
-        self._initialize(http, url)
-        # Unless the user has requested otherwise, we want to just
-        # go ahead and pump the bytes now.
-        if self.auto_transfer:
-            self.stream_file(use_chunks=True, headers=http_request.headers)
-
-    def _normalize_start_end(self, start, end=None):
-        """Validate / fix up byte range.
-
-        :type start: int
-        :param start: start byte of the range:  if negative, used as an
-                      offset from the end.
-
-        :type end: int
-        :param end: end byte of the range.
-
-        :rtype: tuple, (start, end)
-        :returns:  the normalized start, end pair.
-        :raises: :exc:`google.cloud.streaming.exceptions.TransferInvalidError`
-                 for invalid combinations of start, end.
-        """
-        if end is not None:
-            if start < 0:
-                raise TransferInvalidError(
-                    'Cannot have end index with negative start index')
-            elif start >= self.total_size:
-                raise TransferInvalidError(
-                    'Cannot have start index greater than total size')
-            end = min(end, self.total_size - 1)
-            if end < start:
-                raise TransferInvalidError(
-                    'Range requested with end[%s] < start[%s]' % (end, start))
-            return start, end
-        else:
-            if start < 0:
-                start = max(0, start + self.total_size)
-            return start, self.total_size - 1
-
-    @staticmethod
-    def _set_range_header(request, start, end=None):
-        """Update the 'Range' header in a request to match a byte range.
-
-        :type request: :class:`google.cloud.streaming.http_wrapper.Request`
-        :param request: the request to update
-
-        :type start: int
-        :param start: start byte of the range:  if negative, used as an
-                      offset from the end.
-
-        :type end: int
-        :param end: end byte of the range.
-        """
-        if start < 0:
-            request.headers['range'] = 'bytes=%d' % start
-        elif end is None:
-            request.headers['range'] = 'bytes=%d-' % start
-        else:
-            request.headers['range'] = 'bytes=%d-%d' % (start, end)
-
-    def _compute_end_byte(self, start, end=None, use_chunks=True):
-        """Compute the last byte to fetch for this request.
-
-        Based on the HTTP spec for Range and Content-Range.
-
-        .. note::
-           This is potentially confusing in several ways:
-           - the value for the last byte is 0-based, eg "fetch 10 bytes
-             from the beginning" would return 9 here.
-           - if we have no information about size, and don't want to
-             use the chunksize, we'll return None.
-
-        :type start: int
-        :param start: start byte of the range.
-
-        :type end: int
-        :param end: (Optional) suggested last byte of the range.
-
-        :type use_chunks: bool
-        :param use_chunks: If False, ignore :attr:`chunksize`.
-
-        :rtype: str
-        :returns: Last byte to use in a 'Range' header, or None.
-        """
-        end_byte = end
-
-        if start < 0 and not self.total_size:
-            return end_byte
-
-        if use_chunks:
-            alternate = start + self.chunksize - 1
-            if end_byte is not None:
-                end_byte = min(end_byte, alternate)
-            else:
-                end_byte = alternate
-
-        if self.total_size:
-            alternate = self.total_size - 1
-            if end_byte is not None:
-                end_byte = min(end_byte, alternate)
-            else:
-                end_byte = alternate
-
-        return end_byte
-
-    def _get_chunk(self, start, end, headers=None):
-        """Retrieve a chunk of the file.
-
-        :type start: int
-        :param start: start byte of the range.
-
-        :type end: int
-        :param end: (Optional) end byte of the range.
-
-        :type headers: dict
-        :param headers: (Optional) Headers to be used for the ``Request``.
-
-        :rtype: :class:`google.cloud.streaming.http_wrapper.Response`
-        :returns: response from the chunk request.
-        """
-        self._ensure_initialized()
-        request = Request(url=self.url, headers=headers)
-        self._set_range_header(request, start, end=end)
-        return make_api_request(
-            self.bytes_http, request, retries=self.num_retries)
-
-    def _process_response(self, response):
-        """Update attribtes and writing stream, based on response.
-
-        :type response: :class:`google.cloud.streaming.http_wrapper.Response`
-        :param response: response from a download request.
-
-        :rtype: :class:`google.cloud.streaming.http_wrapper.Response`
-        :returns: the response
-        :raises: :exc:`google.cloud.streaming.exceptions.HttpError` for
-                 missing / unauthorized responses;
-                 :exc:`google.cloud.streaming.exceptions.TransferRetryError`
-                 for other error responses.
-        """
-        if response.status_code not in self._ACCEPTABLE_STATUSES:
-            # We distinguish errors that mean we made a mistake in setting
-            # up the transfer versus something we should attempt again.
-            if response.status_code in (http_client.FORBIDDEN,
-                                        http_client.NOT_FOUND):
-                raise HttpError.from_response(response)
-            else:
-                raise TransferRetryError(response.content)
-        if response.status_code in (http_client.OK,
-                                    http_client.PARTIAL_CONTENT):
-            self.stream.write(response.content)
-            self._progress += response.length
-            if response.info and 'content-encoding' in response.info:
-                self._encoding = response.info['content-encoding']
-        elif response.status_code == http_client.NO_CONTENT:
-            # It's important to write something to the stream for the case
-            # of a 0-byte download to a file, as otherwise python won't
-            # create the file.
-            self.stream.write('')
-        return response
-
-    def get_range(self, start, end=None, use_chunks=True):
-        """Retrieve a given byte range from this download, inclusive.
-
-        Writes retrieved bytes into :attr:`stream`.
-
-        Range must be of one of these three forms:
-        * 0 <= start, end = None: Fetch from start to the end of the file.
-        * 0 <= start <= end: Fetch the bytes from start to end.
-        * start < 0, end = None: Fetch the last -start bytes of the file.
-
-        (These variations correspond to those described in the HTTP 1.1
-        protocol for range headers in RFC 2616, sec. 14.35.1.)
-
-        :type start: int
-        :param start: Where to start fetching bytes. (See above.)
-
-        :type end: int
-        :param end: (Optional) Where to stop fetching bytes. (See above.)
-
-        :type use_chunks: bool
-        :param use_chunks: If False, ignore :attr:`chunksize`
-                           and fetch this range in a single request.
-                           If True, streams via chunks.
-
-        :raises: :exc:`google.cloud.streaming.exceptions.TransferRetryError`
-                 if a request returns an empty response.
-        """
-        self._ensure_initialized()
-        progress_end_normalized = False
-        if self.total_size is not None:
-            progress, end_byte = self._normalize_start_end(start, end)
-            progress_end_normalized = True
-        else:
-            progress = start
-            end_byte = end
-        while (not progress_end_normalized or end_byte is None or
-               progress <= end_byte):
-            end_byte = self._compute_end_byte(progress, end=end_byte,
-                                              use_chunks=use_chunks)
-            response = self._get_chunk(progress, end_byte)
-            if not progress_end_normalized:
-                self._set_total(response.info)
-                progress, end_byte = self._normalize_start_end(start, end)
-                progress_end_normalized = True
-            response = self._process_response(response)
-            progress += response.length
-            if response.length == 0:
-                raise TransferRetryError(
-                    'Zero bytes unexpectedly returned in download response')
-
-    def stream_file(self, use_chunks=True, headers=None):
-        """Stream the entire download.
-
-        Writes retrieved bytes into :attr:`stream`.
-
-        :type use_chunks: bool
-        :param use_chunks: If False, ignore :attr:`chunksize`
-                           and stream this download in a single request.
-                           If True, streams via chunks.
-
-        :type headers: dict
-        :param headers: (Optional) Headers to be used for the ``Request``.
-        """
-        self._ensure_initialized()
-        while True:
-            if self._initial_response is not None:
-                response = self._initial_response
-                self._initial_response = None
-            else:
-                end_byte = self._compute_end_byte(self.progress,
-                                                  use_chunks=use_chunks)
-                response = self._get_chunk(self.progress, end_byte,
-                                           headers=headers)
-            if self.total_size is None:
-                self._set_total(response.info)
-            response = self._process_response(response)
-            if (response.status_code == http_client.OK or
-                    self.progress >= self.total_size):
-                break
-
-
-class Upload(_Transfer):
-    """Represent a single Upload.
-
-    :type stream: file-like object
-    :param stream: stream to/from which data is downloaded/uploaded.
-
-    :type mime_type: str:
-    :param mime_type: MIME type of the upload.
-
-    :type total_size: int
-    :param total_size: (Optional) Total upload size for the stream.
-
-    :type http: :class:`httplib2.Http` (or workalike)
-    :param http: Http instance used to perform requests.
-
-    :type close_stream: bool
-    :param close_stream: should this instance close the stream when deleted
-
-    :type auto_transfer: bool
-    :param auto_transfer: should this instance automatically begin transfering
-                          data when initialized
-
-    :type kwds: dict
-    :param kwds:  keyword arguments:  all except ``total_size`` are passed
-                  through to :meth:`_Transfer.__init__()`.
-    """
-    _REQUIRED_SERIALIZATION_KEYS = set((
-        'auto_transfer', 'mime_type', 'total_size', 'url'))
-
-    def __init__(self, stream, mime_type, total_size=None, http=None,
-                 close_stream=False, auto_transfer=True,
-                 **kwds):
-        super(Upload, self).__init__(
-            stream, close_stream=close_stream, auto_transfer=auto_transfer,
-            http=http, **kwds)
-        self._final_response = None
-        self._server_chunk_granularity = None
-        self._complete = False
-        self._mime_type = mime_type
-        self._progress = 0
-        self._strategy = None
-        self._total_size = total_size
-
-    @classmethod
-    def from_file(cls, filename, mime_type=None, auto_transfer=True, **kwds):
-        """Create a new Upload object from a filename.
-
-        :type filename: str
-        :param filename: path/filename to the file being uploaded
-
-        :type mime_type: str
-        :param mime_type:  MIMEtype of the file being uploaded
-
-        :type auto_transfer: bool
-        :param auto_transfer:
-            (Optional) should the transfer be started immediately
-
-        :type kwds: dict
-        :param kwds:  keyword arguments:  passed
-                      through to :meth:`_Transfer.__init__()`.
-
-        :rtype: :class:`Upload`
-        :returns: The upload initiated from the file passed.
-        """
-        path = os.path.expanduser(filename)
-        if not mime_type:
-            mime_type, _ = mimetypes.guess_type(path)
-            if mime_type is None:
-                raise ValueError(
-                    'Could not guess mime type for %s' % path)
-        size = os.stat(path).st_size
-        return cls(open(path, 'rb'), mime_type, total_size=size,
-                   close_stream=True, auto_transfer=auto_transfer, **kwds)
-
-    @classmethod
-    def from_stream(cls, stream, mime_type,
-                    total_size=None, auto_transfer=True, **kwds):
-        """Create a new Upload object from a stream.
-
-        :type stream: writable file-like object
-        :param stream: the target file
-
-        :type mime_type: str
-        :param mime_type:  MIMEtype of the file being uploaded
-
-        :type total_size: int
-        :param total_size: (Optional)  Size of the file being uploaded
-
-        :type auto_transfer: bool
-        :param auto_transfer:
-            (Optional) should the transfer be started immediately
-
-        :type kwds: dict
-        :param kwds:  keyword arguments:  passed
-                      through to :meth:`_Transfer.__init__()`.
-
-        :rtype: :class:`Upload`
-        :returns: The upload initiated from the stream passed.
-        """
-        if mime_type is None:
-            raise ValueError(
-                'No mime_type specified for stream')
-        return cls(stream, mime_type, total_size=total_size,
-                   close_stream=False, auto_transfer=auto_transfer, **kwds)
-
-    @property
-    def complete(self):
-        """Has the entire stream been uploaded.
-
-        :rtype: bool
-        :returns: Boolean indicated if the upload is complete.
-        """
-        return self._complete
-
-    @property
-    def mime_type(self):
-        """MIMEtype of the file being uploaded.
-
-        :rtype: str
-        :returns: The mime-type of the upload.
-        """
-        return self._mime_type
-
-    @property
-    def progress(self):
-        """Bytes uploaded so far
-
-        :rtype: int
-        :returns: The amount uploaded so far.
-        """
-        return self._progress
-
-    @property
-    def strategy(self):
-        """Upload strategy to use
-
-        :rtype: str or None
-        :returns: The strategy used to upload the data.
-        """
-        return self._strategy
-
-    @strategy.setter
-    def strategy(self, value):
-        """Update upload strategy to use
-
-        :type value: str (one of :data:`SIMPLE_UPLOAD` or
-                :data:`RESUMABLE_UPLOAD`)
-
-        :raises: :exc:`ValueError` if value is not one of the two allowed
-                 strings.
-        """
-        if value not in (SIMPLE_UPLOAD, RESUMABLE_UPLOAD):
-            raise ValueError((
-                'Invalid value "%s" for upload strategy, must be one of '
-                '"simple" or "resumable".') % value)
-        self._strategy = value
-
-    @property
-    def total_size(self):
-        """Total size of the stream to be uploaded.
-
-        :rtype: int or None
-        :returns: The total size to be uploaded.
-        """
-        return self._total_size
-
-    @total_size.setter
-    def total_size(self, value):
-        """Update total size of the stream to be uploaded.
-
-        :type value: int
-        :param value: (Optional) the size
-        """
-        self._ensure_uninitialized()
-        self._total_size = value
-
-    def __repr__(self):
-        if not self.initialized:
-            return 'Upload (uninitialized)'
-        else:
-            return 'Upload with %d/%s bytes transferred for url %s' % (
-                self.progress, self.total_size or '???', self.url)
-
-    def _set_default_strategy(self, upload_config, http_request):
-        """Determine and set the default upload strategy for this upload.
-
-        We generally prefer simple or multipart, unless we're forced to
-        use resumable. This happens when any of (1) the upload is too
-        large, (2) the simple endpoint doesn't support multipart requests
-        and we have metadata, or (3) there is no simple upload endpoint.
-
-        :type upload_config: instance w/ ``max_size`` and ``accept``
-                             attributes
-        :param upload_config: Configuration for the upload endpoint.
-
-        :type http_request: :class:`~.streaming.http_wrapper.Request`
-        :param http_request: The associated http request.
-        """
-        if upload_config.resumable_path is None:
-            self.strategy = SIMPLE_UPLOAD
-        if self.strategy is not None:
-            return
-        strategy = SIMPLE_UPLOAD
-        if (self.total_size is not None and
-                self.total_size > RESUMABLE_UPLOAD_THRESHOLD):
-            strategy = RESUMABLE_UPLOAD
-        if http_request.body and not upload_config.simple_multipart:
-            strategy = RESUMABLE_UPLOAD
-        if not upload_config.simple_path:
-            strategy = RESUMABLE_UPLOAD
-        self.strategy = strategy
-
-    def configure_request(self, upload_config, http_request, url_builder):
-        """Configure the request and url for this upload.
-
-        :type upload_config: instance w/ ``max_size`` and ``accept``
-                             attributes
-        :param upload_config: transfer policy object to be queried
-
-        :type http_request: :class:`~.streaming.http_wrapper.Request`
-        :param http_request: the request to be updated
-
-        :type url_builder: instance with settable 'relative_path' and
-                           'query_params' attributes.
-        :param url_builder: transfer policy object to be updated
-
-        :raises: :exc:`ValueError` if the requested upload is too big,
-                  or does not have an acceptable MIME type.
-        """
-        # Validate total_size vs. max_size
-        if (self.total_size and upload_config.max_size and
-                self.total_size > upload_config.max_size):
-            raise ValueError(
-                'Upload too big: %s larger than max size %s' % (
-                    self.total_size, upload_config.max_size))
-        # Validate mime type
-        if not acceptable_mime_type(upload_config.accept, self.mime_type):
-            raise ValueError(
-                'MIME type %s does not match any accepted MIME ranges %s' % (
-                    self.mime_type, upload_config.accept))
-
-        self._set_default_strategy(upload_config, http_request)
-        if self.strategy == SIMPLE_UPLOAD:
-            url_builder.relative_path = upload_config.simple_path
-            if http_request.body:
-                url_builder.query_params['uploadType'] = 'multipart'
-                self._configure_multipart_request(http_request)
-            else:
-                url_builder.query_params['uploadType'] = 'media'
-                self._configure_media_request(http_request)
-        else:
-            url_builder.relative_path = upload_config.resumable_path
-            url_builder.query_params['uploadType'] = 'resumable'
-            self._configure_resumable_request(http_request)
-
-    def _configure_media_request(self, http_request):
-        """Helper for 'configure_request': set up simple request."""
-        http_request.headers['content-type'] = self.mime_type
-        http_request.body = self.stream.read()
-        http_request.loggable_body = '<media body>'
-
-    def _configure_multipart_request(self, http_request):
-        """Helper for 'configure_request': set up multipart request."""
-        # This is a multipart/related upload.
-        msg_root = mime_multipart.MIMEMultipart('related')
-        # msg_root should not write out its own headers
-        setattr(msg_root, '_write_headers', lambda self: None)
-
-        # attach the body as one part
-        msg = mime_nonmultipart.MIMENonMultipart(
-            *http_request.headers['content-type'].split('/'))
-        msg.set_payload(http_request.body)
-        msg_root.attach(msg)
-
-        # attach the media as the second part
-        msg = mime_nonmultipart.MIMENonMultipart(*self.mime_type.split('/'))
-        msg['Content-Transfer-Encoding'] = 'binary'
-        msg.set_payload(self.stream.read())
-        msg_root.attach(msg)
-
-        # NOTE: generate multipart message as bytes, not text
-        stream = six.BytesIO()
-        if six.PY3:  # pragma: NO COVER  Python3
-            generator_class = email_generator.BytesGenerator
-        else:
-            generator_class = email_generator.Generator
-        generator = generator_class(stream, mangle_from_=False)
-        generator.flatten(msg_root, unixfrom=False)
-        http_request.body = stream.getvalue()
-
-        multipart_boundary = msg_root.get_boundary()
-        http_request.headers['content-type'] = (
-            'multipart/related; boundary="%s"' % multipart_boundary)
-
-        boundary_bytes = _to_bytes(multipart_boundary)
-        body_components = http_request.body.split(boundary_bytes)
-        headers, _, _ = body_components[-2].partition(b'\n\n')
-        body_components[-2] = b'\n\n'.join([headers, b'<media body>\n\n--'])
-        http_request.loggable_body = boundary_bytes.join(body_components)
-
-    def _configure_resumable_request(self, http_request):
-        """Helper for 'configure_request': set up resumable request."""
-        http_request.headers['X-Upload-Content-Type'] = self.mime_type
-        if self.total_size is not None:
-            http_request.headers[
-                'X-Upload-Content-Length'] = str(self.total_size)
-
-    def refresh_upload_state(self):
-        """Refresh the state of a resumable upload via query to the back-end.
-        """
-        if self.strategy != RESUMABLE_UPLOAD:
-            return
-        self._ensure_initialized()
-        # NOTE: Per RFC 2616[1]/7231[2], a 'PUT' request is inappropriate
-        #       here:  it is intended to be used to replace the entire
-        #       resource, not to  query for a status.
-        #
-        #       If the back-end doesn't provide a way to query for this state
-        #       via a 'GET' request, somebody should be spanked.
-        #
-        #       The violation is documented[3].
-        #
-        # [1] http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.6
-        # [2] http://tools.ietf.org/html/rfc7231#section-4.3.4
-        # [3]
-        # https://cloud.google.com/storage/docs/json_api/v1/how-tos/upload#resume-upload
-        refresh_request = Request(
-            url=self.url, http_method='PUT',
-            headers={'Content-Range': 'bytes */*'})
-        refresh_response = make_api_request(
-            self.http, refresh_request, redirections=0,
-            retries=self.num_retries)
-        range_header = self._get_range_header(refresh_response)
-        if refresh_response.status_code in (http_client.OK,
-                                            http_client.CREATED):
-            self._complete = True
-            self._progress = self.total_size
-            self.stream.seek(self.progress)
-            # If we're finished, the refresh response will contain the metadata
-            # originally requested. Cache it so it can be returned in
-            # StreamInChunks.
-            self._final_response = refresh_response
-        elif refresh_response.status_code == RESUME_INCOMPLETE:
-            if range_header is None:
-                self._progress = 0
-            else:
-                self._progress = self._last_byte(range_header) + 1
-            self.stream.seek(self.progress)
-        else:
-            raise HttpError.from_response(refresh_response)
-
-    @staticmethod
-    def _get_range_header(response):
-        """Return a 'Range' header from a response.
-
-        :type response: :class:`google.cloud.streaming.http_wrapper.Response`
-        :param response: response to be queried
-
-        :rtype: str
-        :returns: The header used to determine the bytes range.
-        """
-        # NOTE: Per RFC 2616[1]/7233[2][3], 'Range' is a request header,
-        #       not a response header.  If the back-end is actually setting
-        #       'Range' on responses, somebody should be spanked:  it should
-        #       be sending 'Content-Range' (including the # '/<length>'
-        #       trailer).
-        #
-        #       The violation is documented[4].
-        #
-        # [1] http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
-        # [2] http://tools.ietf.org/html/rfc7233#section-3.1
-        # [3] http://tools.ietf.org/html/rfc7233#section-4.2
-        # [4]
-        # https://cloud.google.com/storage/docs/json_api/v1/how-tos/upload#chunking
-        return response.info.get('Range', response.info.get('range'))
-
-    def initialize_upload(self, http_request, http):
-        """Initialize this upload from the given http_request.
-
-        :type http_request: :class:`~.streaming.http_wrapper.Request`
-        :param http_request: the request to be used
-
-        :type http: :class:`httplib2.Http` (or workalike)
-        :param http: Http instance for this request.
-
-        :raises: :exc:`ValueError` if the instance has not been configured
-                 with a strategy.
-        :rtype: :class:`~google.cloud.streaming.http_wrapper.Response`
-        :returns: The response if the upload is resumable and auto transfer
-                  is not used.
-        """
-        if self.strategy is None:
-            raise ValueError(
-                'No upload strategy set; did you call configure_request?')
-        if self.strategy != RESUMABLE_UPLOAD:
-            return
-        self._ensure_uninitialized()
-        http_response = make_api_request(http, http_request,
-                                         retries=self.num_retries)
-        if http_response.status_code != http_client.OK:
-            raise HttpError.from_response(http_response)
-
-        granularity = http_response.info.get('X-Goog-Upload-Chunk-Granularity')
-        if granularity is not None:
-            granularity = int(granularity)
-        self._server_chunk_granularity = granularity
-        url = http_response.info['location']
-        self._initialize(http, url)
-
-        # Unless the user has requested otherwise, we want to just
-        # go ahead and pump the bytes now.
-        if self.auto_transfer:
-            return self.stream_file(use_chunks=True)
-        else:
-            return http_response
-
-    @staticmethod
-    def _last_byte(range_header):
-        """Parse the last byte from a 'Range' header.
-
-        :type range_header: str
-        :param range_header: 'Range' header value per RFC 2616/7233
-
-        :rtype: int
-        :returns: The last byte from a range header.
-        """
-        _, _, end = range_header.partition('-')
-        return int(end)
-
-    def _validate_chunksize(self, chunksize=None):
-        """Validate chunksize against server-specified granularity.
-
-        Helper for :meth:`stream_file`.
-
-        :type chunksize: int
-        :param chunksize: (Optional) the chunk size to be tested.
-
-        :raises: :exc:`ValueError` if ``chunksize`` is not a multiple
-                 of the server-specified granulariy.
-        """
-        if self._server_chunk_granularity is None:
-            return
-        chunksize = chunksize or self.chunksize
-        if chunksize % self._server_chunk_granularity:
-            raise ValueError(
-                'Server requires chunksize to be a multiple of %d',
-                self._server_chunk_granularity)
-
-    def stream_file(self, use_chunks=True):
-        """Upload the stream.
-
-        :type use_chunks: bool
-        :param use_chunks: If False, send the stream in a single request.
-                           Otherwise, send it in chunks.
-
-        :rtype: :class:`google.cloud.streaming.http_wrapper.Response`
-        :returns: The response for the final request made.
-        """
-        if self.strategy != RESUMABLE_UPLOAD:
-            raise ValueError(
-                'Cannot stream non-resumable upload')
-        # final_response is set if we resumed an already-completed upload.
-        response = self._final_response
-        send_func = self._send_chunk if use_chunks else self._send_media_body
-        if use_chunks:
-            self._validate_chunksize(self.chunksize)
-        self._ensure_initialized()
-        while not self.complete:
-            response = send_func(self.stream.tell())
-            if response.status_code in (http_client.OK, http_client.CREATED):
-                self._complete = True
-                break
-            self._progress = self._last_byte(response.info['range'])
-            if self.progress + 1 != self.stream.tell():
-                raise CommunicationError(
-                    'Failed to transfer all bytes in chunk, upload paused at '
-                    'byte %d' % self.progress)
-        if self.complete and hasattr(self.stream, 'seek'):
-            if not hasattr(self.stream, 'seekable') or self.stream.seekable():
-                current_pos = self.stream.tell()
-                self.stream.seek(0, os.SEEK_END)
-                end_pos = self.stream.tell()
-                self.stream.seek(current_pos)
-                if current_pos != end_pos:
-                    raise TransferInvalidError(
-                        'Upload complete with %s '
-                        'additional bytes left in stream' %
-                        (int(end_pos) - int(current_pos)))
-        return response
-
-    def _send_media_request(self, request, end):
-        """Peform API upload request.
-
-        Helper for _send_media_body & _send_chunk:
-
-        :type request: :class:`google.cloud.streaming.http_wrapper.Request`
-        :param request: the request to upload
-
-        :type end: int
-        :param end: end byte of the to be uploaded
-
-        :rtype: :class:`google.cloud.streaming.http_wrapper.Response`
-        :returns: the response
-        :raises: :exc:`~.streaming.exceptions.HttpError` if the status
-                 code from the response indicates an error.
-        """
-        response = make_api_request(
-            self.bytes_http, request, retries=self.num_retries)
-        if response.status_code not in (http_client.OK, http_client.CREATED,
-                                        RESUME_INCOMPLETE):
-            # We want to reset our state to wherever the server left us
-            # before this failed request, and then raise.
-            self.refresh_upload_state()
-            raise HttpError.from_response(response)
-        if response.status_code == RESUME_INCOMPLETE:
-            last_byte = self._last_byte(
-                self._get_range_header(response))
-            if last_byte + 1 != end:
-                self.stream.seek(last_byte)
-        return response
-
-    def _send_media_body(self, start):
-        """Send the entire stream in a single request.
-
-        Helper for :meth:`stream_file`:
-
-        :type start: int
-        :param start: start byte of the range.
-
-        :rtype: :class:`google.cloud.streaming.http_wrapper.Response`
-        :returns: The response from the media upload request.
-        """
-        self._ensure_initialized()
-        if self.total_size is None:
-            raise TransferInvalidError(
-                'Total size must be known for SendMediaBody')
-        body_stream = StreamSlice(self.stream, self.total_size - start)
-
-        request = Request(url=self.url, http_method='PUT', body=body_stream)
-        request.headers['Content-Type'] = self.mime_type
-        if start == self.total_size:
-            # End of an upload with 0 bytes left to send; just finalize.
-            range_string = 'bytes */%s' % self.total_size
-        else:
-            range_string = 'bytes %s-%s/%s' % (start, self.total_size - 1,
-                                               self.total_size)
-
-        request.headers['Content-Range'] = range_string
-
-        return self._send_media_request(request, self.total_size)
-
-    def _send_chunk(self, start):
-        """Send a chunk of the stream.
-
-        Helper for :meth:`stream_file`:
-
-        :type start: int
-        :param start: start byte of the range.
-
-        :rtype: :class:`google.cloud.streaming.http_wrapper.Response`
-        :returns: The response from the chunked upload request.
-        """
-        self._ensure_initialized()
-        no_log_body = self.total_size is None
-        if self.total_size is None:
-            # For the streaming resumable case, we need to detect when
-            # we're at the end of the stream.
-            body_stream = BufferedStream(
-                self.stream, start, self.chunksize)
-            end = body_stream.stream_end_position
-            if body_stream.stream_exhausted:
-                self._total_size = end
-            # Here, change body_stream from a stream to a string object,
-            # which means reading a chunk into memory.  This works around
-            # https://code.google.com/p/httplib2/issues/detail?id=176 which can
-            # cause httplib2 to skip bytes on 401's for file objects.
-            body_stream = body_stream.read(self.chunksize)
-        else:
-            end = min(start + self.chunksize, self.total_size)
-            body_stream = StreamSlice(self.stream, end - start)
-        request = Request(url=self.url, http_method='PUT', body=body_stream)
-        request.headers['Content-Type'] = self.mime_type
-        if no_log_body:
-            # Disable logging of streaming body.
-            request.loggable_body = '<media body>'
-        if self.total_size is None:
-            # Streaming resumable upload case, unknown total size.
-            range_string = 'bytes %s-%s/*' % (start, end - 1)
-        elif end == start:
-            # End of an upload with 0 bytes left to send; just finalize.
-            range_string = 'bytes */%s' % self.total_size
-        else:
-            # Normal resumable upload case with known sizes.
-            range_string = 'bytes %s-%s/%s' % (start, end - 1, self.total_size)
-
-        request.headers['Content-Range'] = range_string
-
-        return self._send_media_request(request, end)
diff --git a/core/google/cloud/streaming/util.py b/core/google/cloud/streaming/util.py
deleted file mode 100644
index e896052f8a1c6..0000000000000
--- a/core/google/cloud/streaming/util.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Assorted utilities shared between parts of apitools."""
-
-import random
-
-
-_MAX_RETRY_WAIT = 60
-
-
-def calculate_wait_for_retry(retry_attempt):
-    """Calculate the amount of time to wait before a retry attempt.
-
-    Wait time grows exponentially with the number of attempts. A
-    random amount of jitter is added to spread out retry attempts from
-    different clients.
-
-    :type retry_attempt: int
-    :param retry_attempt: Retry attempt counter.
-
-    :rtype: int
-    :returns: Number of seconds to wait before retrying request.
-    """
-    wait_time = 2 ** retry_attempt
-    max_jitter = wait_time / 4.0
-    wait_time += random.uniform(-max_jitter, max_jitter)
-    return max(1, min(wait_time, _MAX_RETRY_WAIT))
-
-
-def acceptable_mime_type(accept_patterns, mime_type):
-    """Check that ``mime_type`` matches one of ``accept_patterns``.
-
-    Note that this function assumes that all patterns in accept_patterns
-    will be simple types of the form "type/subtype", where one or both
-    of these can be "*". We do not support parameters (i.e. "; q=") in
-    patterns.
-
-    :type accept_patterns: list of string
-    :param accept_patterns: acceptable MIME types.
-
-    :type mime_type: str
-    :param mime_type: the MIME being checked
-
-    :rtype: bool
-    :returns: True if the supplied MIME type matches at least one of the
-              patterns, else False.
-    """
-    if '/' not in mime_type:
-        raise ValueError(
-            'Invalid MIME type: "%s"' % mime_type)
-    unsupported_patterns = [p for p in accept_patterns if ';' in p]
-    if unsupported_patterns:
-        raise ValueError(
-            'MIME patterns with parameter unsupported: "%s"' % ', '.join(
-                unsupported_patterns))
-
-    def _match(pattern, mime_type):
-        """Return True iff mime_type is acceptable for pattern."""
-        return all(accept in ('*', provided) for accept, provided
-                   in zip(pattern.split('/'), mime_type.split('/')))
-
-    return any(_match(pattern, mime_type) for pattern in accept_patterns)
diff --git a/core/tests/unit/streaming/__init__.py b/core/tests/unit/streaming/__init__.py
deleted file mode 100644
index 58e0d91536321..0000000000000
--- a/core/tests/unit/streaming/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
diff --git a/core/tests/unit/streaming/test_buffered_stream.py b/core/tests/unit/streaming/test_buffered_stream.py
deleted file mode 100644
index 797ceea2d280a..0000000000000
--- a/core/tests/unit/streaming/test_buffered_stream.py
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import unittest
-
-
-class Test_BufferedStream(unittest.TestCase):
-
-    @staticmethod
-    def _get_target_class():
-        from google.cloud.streaming.buffered_stream import BufferedStream
-
-        return BufferedStream
-
-    def _make_one(self, *args, **kw):
-        return self._get_target_class()(*args, **kw)
-
-    def test_ctor_closed_stream(self):
-        class _Stream(object):
-            closed = True
-
-        start = 0
-        bufsize = 4
-        bufstream = self._make_one(_Stream, start, bufsize)
-        self.assertIs(bufstream._stream, _Stream)
-        self.assertEqual(bufstream._start_pos, start)
-        self.assertEqual(bufstream._buffer_pos, 0)
-        self.assertEqual(bufstream._buffered_data, b'')
-        self.assertTrue(bufstream._stream_at_end)
-        self.assertEqual(bufstream._end_pos, 0)
-
-    def test_ctor_start_zero_longer_than_buffer(self):
-        from io import BytesIO
-
-        CONTENT = b'CONTENT GOES HERE'
-        START = 0
-        BUFSIZE = 4
-        stream = BytesIO(CONTENT)
-        bufstream = self._make_one(stream, START, BUFSIZE)
-        self.assertIs(bufstream._stream, stream)
-        self.assertEqual(bufstream._start_pos, START)
-        self.assertEqual(bufstream._buffer_pos, 0)
-        self.assertEqual(bufstream._buffered_data, CONTENT[:BUFSIZE])
-        self.assertEqual(len(bufstream), BUFSIZE)
-        self.assertFalse(bufstream.stream_exhausted)
-        self.assertEqual(bufstream.stream_end_position, BUFSIZE)
-
-    def test_ctor_start_nonzero_shorter_than_buffer(self):
-        from io import BytesIO
-
-        CONTENT = b'CONTENT GOES HERE'
-        START = 8
-        BUFSIZE = 10
-        stream = BytesIO(CONTENT)
-        stream.read(START)  # already consumed
-        bufstream = self._make_one(stream, START, BUFSIZE)
-        self.assertIs(bufstream._stream, stream)
-        self.assertEqual(bufstream._start_pos, START)
-        self.assertEqual(bufstream._buffer_pos, 0)
-        self.assertEqual(bufstream._buffered_data, CONTENT[START:])
-        self.assertEqual(len(bufstream), len(CONTENT) - START)
-        self.assertTrue(bufstream.stream_exhausted)
-        self.assertEqual(bufstream.stream_end_position, len(CONTENT))
-
-    def test__bytes_remaining_start_zero_longer_than_buffer(self):
-        from io import BytesIO
-
-        CONTENT = b'CONTENT GOES HERE'
-        START = 0
-        BUFSIZE = 4
-        stream = BytesIO(CONTENT)
-        bufstream = self._make_one(stream, START, BUFSIZE)
-        self.assertEqual(bufstream._bytes_remaining, BUFSIZE)
-
-    def test__bytes_remaining_start_zero_shorter_than_buffer(self):
-        from io import BytesIO
-
-        CONTENT = b'CONTENT GOES HERE'
-        START = 8
-        BUFSIZE = 10
-        stream = BytesIO(CONTENT)
-        stream.read(START)  # already consumed
-        bufstream = self._make_one(stream, START, BUFSIZE)
-        self.assertEqual(bufstream._bytes_remaining, len(CONTENT) - START)
-
-    def test_read_w_none(self):
-        from io import BytesIO
-
-        CONTENT = b'CONTENT GOES HERE'
-        START = 0
-        BUFSIZE = 4
-        stream = BytesIO(CONTENT)
-        bufstream = self._make_one(stream, START, BUFSIZE)
-        with self.assertRaises(ValueError):
-            bufstream.read(None)
-
-    def test_read_w_negative_size(self):
-        from io import BytesIO
-
-        CONTENT = b'CONTENT GOES HERE'
-        START = 0
-        BUFSIZE = 4
-        stream = BytesIO(CONTENT)
-        bufstream = self._make_one(stream, START, BUFSIZE)
-        with self.assertRaises(ValueError):
-            bufstream.read(-2)
-
-    def test_read_from_start(self):
-        from io import BytesIO
-
-        CONTENT = b'CONTENT GOES HERE'
-        START = 0
-        BUFSIZE = 4
-        stream = BytesIO(CONTENT)
-        bufstream = self._make_one(stream, START, BUFSIZE)
-        self.assertEqual(bufstream.read(4), CONTENT[:4])
-
-    def test_read_exhausted(self):
-        from io import BytesIO
-
-        CONTENT = b'CONTENT GOES HERE'
-        START = len(CONTENT)
-        BUFSIZE = 10
-        stream = BytesIO(CONTENT)
-        stream.read(START)  # already consumed
-        bufstream = self._make_one(stream, START, BUFSIZE)
-        self.assertTrue(bufstream.stream_exhausted)
-        self.assertEqual(bufstream.stream_end_position, len(CONTENT))
-        self.assertEqual(bufstream._bytes_remaining, 0)
-        self.assertEqual(bufstream.read(10), b'')
diff --git a/core/tests/unit/streaming/test_exceptions.py b/core/tests/unit/streaming/test_exceptions.py
deleted file mode 100644
index b31c562c8e9d0..0000000000000
--- a/core/tests/unit/streaming/test_exceptions.py
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import unittest
-
-
-class Test_HttpError(unittest.TestCase):
-
-    @staticmethod
-    def _get_target_class():
-        from google.cloud.streaming.exceptions import HttpError
-
-        return HttpError
-
-    def _make_one(self, *args, **kw):
-        return self._get_target_class()(*args, **kw)
-
-    def test_ctor(self):
-        RESPONSE = {'status': '404'}
-        CONTENT = b'CONTENT'
-        URL = 'http://www.example.com'
-        exception = self._make_one(RESPONSE, CONTENT, URL)
-        self.assertEqual(exception.response, RESPONSE)
-        self.assertEqual(exception.content, CONTENT)
-        self.assertEqual(exception.url, URL)
-        self.assertEqual(exception.status_code, 404)
-        self.assertEqual(
-            str(exception),
-            "HttpError accessing <http://www.example.com>: "
-            "response: <{'status': '404'}>, content <CONTENT>")
-
-    def test_from_response(self):
-        RESPONSE = {'status': '404'}
-        CONTENT = b'CONTENT'
-        URL = 'http://www.example.com'
-
-        class _Response(object):
-            info = RESPONSE
-            content = CONTENT
-            request_url = URL
-
-        klass = self._get_target_class()
-        exception = klass.from_response(_Response())
-        self.assertIsInstance(exception, klass)
-        self.assertEqual(exception.response, RESPONSE)
-        self.assertEqual(exception.content, CONTENT)
-        self.assertEqual(exception.url, URL)
-
-
-class Test_RetryAfterError(unittest.TestCase):
-
-    @staticmethod
-    def _get_target_class():
-        from google.cloud.streaming.exceptions import RetryAfterError
-
-        return RetryAfterError
-
-    def _make_one(self, *args, **kw):
-        return self._get_target_class()(*args, **kw)
-
-    def test_ctor(self):
-        RESPONSE = {'status': '404'}
-        CONTENT = b'CONTENT'
-        URL = 'http://www.example.com'
-        RETRY_AFTER = 60
-        exception = self._make_one(RESPONSE, CONTENT, URL, RETRY_AFTER)
-        self.assertEqual(exception.response, RESPONSE)
-        self.assertEqual(exception.content, CONTENT)
-        self.assertEqual(exception.url, URL)
-        self.assertEqual(exception.retry_after, RETRY_AFTER)
-        self.assertEqual(
-            str(exception),
-            "HttpError accessing <http://www.example.com>: "
-            "response: <{'status': '404'}>, content <CONTENT>")
-
-    def test_from_response(self):
-        RESPONSE = {'status': '404'}
-        CONTENT = b'CONTENT'
-        URL = 'http://www.example.com'
-        RETRY_AFTER = 60
-
-        class _Response(object):
-            info = RESPONSE
-            content = CONTENT
-            request_url = URL
-            retry_after = RETRY_AFTER
-
-        klass = self._get_target_class()
-        exception = klass.from_response(_Response())
-        self.assertIsInstance(exception, klass)
-        self.assertEqual(exception.response, RESPONSE)
-        self.assertEqual(exception.content, CONTENT)
-        self.assertEqual(exception.url, URL)
-        self.assertEqual(exception.retry_after, RETRY_AFTER)
diff --git a/core/tests/unit/streaming/test_http_wrapper.py b/core/tests/unit/streaming/test_http_wrapper.py
deleted file mode 100644
index b0d3156ba42fe..0000000000000
--- a/core/tests/unit/streaming/test_http_wrapper.py
+++ /dev/null
@@ -1,498 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import unittest
-
-
-class Test__httplib2_debug_level(unittest.TestCase):
-
-    @staticmethod
-    def _get_target_class():
-        from google.cloud.streaming.http_wrapper import _httplib2_debug_level
-
-        return _httplib2_debug_level
-
-    def _make_one(self, *args, **kw):
-        return self._get_target_class()(*args, **kw)
-
-    def test_wo_loggable_body_wo_http(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import http_wrapper as MUT
-
-        request = _Request()
-        LEVEL = 1
-        _httplib2 = _Dummy(debuglevel=0)
-        with _Monkey(MUT, httplib2=_httplib2):
-            with self._make_one(request, LEVEL):
-                self.assertEqual(_httplib2.debuglevel, 0)
-
-    def test_w_loggable_body_wo_http(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import http_wrapper as MUT
-
-        request = _Request(loggable_body=object())
-        LEVEL = 1
-        _httplib2 = _Dummy(debuglevel=0)
-        with _Monkey(MUT, httplib2=_httplib2):
-            with self._make_one(request, LEVEL):
-                self.assertEqual(_httplib2.debuglevel, LEVEL)
-        self.assertEqual(_httplib2.debuglevel, 0)
-
-    def test_w_loggable_body_w_http(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import http_wrapper as MUT
-
-        class _Connection(object):
-            debuglevel = 0
-
-            def set_debuglevel(self, value):
-                self.debuglevel = value
-
-        request = _Request(loggable_body=object())
-        LEVEL = 1
-        _httplib2 = _Dummy(debuglevel=0)
-        update_me = _Connection()
-        skip_me = _Connection()
-        connections = {'update:me': update_me, 'skip_me': skip_me}
-        _http = _Dummy(connections=connections)
-        with _Monkey(MUT, httplib2=_httplib2):
-            with self._make_one(request, LEVEL, _http):
-                self.assertEqual(_httplib2.debuglevel, LEVEL)
-                self.assertEqual(update_me.debuglevel, LEVEL)
-                self.assertEqual(skip_me.debuglevel, 0)
-        self.assertEqual(_httplib2.debuglevel, 0)
-        self.assertEqual(update_me.debuglevel, 0)
-        self.assertEqual(skip_me.debuglevel, 0)
-
-
-class Test_Request(unittest.TestCase):
-
-    @staticmethod
-    def _get_target_class():
-        from google.cloud.streaming.http_wrapper import Request
-
-        return Request
-
-    def _make_one(self, *args, **kw):
-        return self._get_target_class()(*args, **kw)
-
-    def test_ctor_defaults(self):
-        request = self._make_one()
-        self.assertEqual(request.url, '')
-        self.assertEqual(request.http_method, 'GET')
-        self.assertEqual(request.headers, {'content-length': '0'})
-        self.assertEqual(request.body, '')
-        self.assertIsNone(request.loggable_body)
-
-    def test_loggable_body_setter_w_body_None(self):
-        from google.cloud.streaming.exceptions import RequestError
-
-        request = self._make_one(body=None)
-        with self.assertRaises(RequestError):
-            request.loggable_body = 'abc'
-
-    def test_body_setter_w_None(self):
-        request = self._make_one()
-        request.loggable_body = 'abc'
-        request.body = None
-        self.assertEqual(request.headers, {})
-        self.assertIsNone(request.body)
-        self.assertEqual(request.loggable_body, 'abc')
-
-    def test_body_setter_w_non_string(self):
-        request = self._make_one()
-        request.loggable_body = 'abc'
-        request.body = body = _Dummy(length=123)
-        self.assertEqual(request.headers, {'content-length': '123'})
-        self.assertIs(request.body, body)
-        self.assertEqual(request.loggable_body, '<media body>')
-
-
-class Test_Response(unittest.TestCase):
-
-    @staticmethod
-    def _get_target_class():
-        from google.cloud.streaming.http_wrapper import Response
-
-        return Response
-
-    def _make_one(self, *args, **kw):
-        return self._get_target_class()(*args, **kw)
-
-    def test_ctor(self):
-        CONTENT = 'CONTENT'
-        URL = 'http://example.com/api'
-        info = {'status': '200'}
-        response = self._make_one(info, CONTENT, URL)
-        self.assertEqual(len(response), len(CONTENT))
-        self.assertEqual(response.status_code, 200)
-        self.assertIsNone(response.retry_after)
-        self.assertFalse(response.is_redirect)
-
-    def test_length_w_content_encoding_w_content_range(self):
-        CONTENT = 'CONTENT'
-        URL = 'http://example.com/api'
-        RANGE = 'bytes 0-122/5678'
-        info = {
-            'status': '200',
-            'content-length': len(CONTENT),
-            'content-encoding': 'testing',
-            'content-range': RANGE,
-        }
-        response = self._make_one(info, CONTENT, URL)
-        self.assertEqual(len(response), 123)
-
-    def test_length_w_content_encoding_wo_content_range(self):
-        CONTENT = 'CONTENT'
-        URL = 'http://example.com/api'
-        info = {
-            'status': '200',
-            'content-length': len(CONTENT),
-            'content-encoding': 'testing',
-        }
-        response = self._make_one(info, CONTENT, URL)
-        self.assertEqual(len(response), len(CONTENT))
-
-    def test_length_w_content_length_w_content_range(self):
-        CONTENT = 'CONTENT'
-        URL = 'http://example.com/api'
-        RANGE = 'bytes 0-12/5678'
-        info = {
-            'status': '200',
-            'content-length': len(CONTENT) * 2,
-            'content-range': RANGE,
-        }
-        response = self._make_one(info, CONTENT, URL)
-        self.assertEqual(len(response), len(CONTENT) * 2)
-
-    def test_length_wo_content_length_w_content_range(self):
-        CONTENT = 'CONTENT'
-        URL = 'http://example.com/api'
-        RANGE = 'bytes 0-122/5678'
-        info = {
-            'status': '200',
-            'content-range': RANGE,
-        }
-        response = self._make_one(info, CONTENT, URL)
-        self.assertEqual(len(response), 123)
-
-    def test_retry_after_w_header(self):
-        CONTENT = 'CONTENT'
-        URL = 'http://example.com/api'
-        info = {
-            'status': '200',
-            'retry-after': '123',
-        }
-        response = self._make_one(info, CONTENT, URL)
-        self.assertEqual(response.retry_after, 123)
-
-    def test_is_redirect_w_code_wo_location(self):
-        CONTENT = 'CONTENT'
-        URL = 'http://example.com/api'
-        info = {
-            'status': '301',
-        }
-        response = self._make_one(info, CONTENT, URL)
-        self.assertFalse(response.is_redirect)
-
-    def test_is_redirect_w_code_w_location(self):
-        CONTENT = 'CONTENT'
-        URL = 'http://example.com/api'
-        info = {
-            'status': '301',
-            'location': 'http://example.com/other',
-        }
-        response = self._make_one(info, CONTENT, URL)
-        self.assertTrue(response.is_redirect)
-
-
-class Test__check_response(unittest.TestCase):
-
-    def _call_fut(self, *args, **kw):
-        from google.cloud.streaming.http_wrapper import _check_response
-
-        return _check_response(*args, **kw)
-
-    def test_w_none(self):
-        from google.cloud.streaming.exceptions import RequestError
-
-        with self.assertRaises(RequestError):
-            self._call_fut(None)
-
-    def test_w_TOO_MANY_REQUESTS(self):
-        from google.cloud.streaming.exceptions import BadStatusCodeError
-        from google.cloud.streaming.http_wrapper import TOO_MANY_REQUESTS
-
-        with self.assertRaises(BadStatusCodeError):
-            self._call_fut(_Response(TOO_MANY_REQUESTS))
-
-    def test_w_50x(self):
-        from google.cloud.streaming.exceptions import BadStatusCodeError
-
-        with self.assertRaises(BadStatusCodeError):
-            self._call_fut(_Response(500))
-
-        with self.assertRaises(BadStatusCodeError):
-            self._call_fut(_Response(503))
-
-    def test_w_retry_after(self):
-        from google.cloud.streaming.exceptions import RetryAfterError
-
-        with self.assertRaises(RetryAfterError):
-            self._call_fut(_Response(200, 20))
-
-    def test_pass(self):
-        self._call_fut(_Response(200))
-
-
-class Test__reset_http_connections(unittest.TestCase):
-
-    def _call_fut(self, *args, **kw):
-        from google.cloud.streaming.http_wrapper import _reset_http_connections
-
-        return _reset_http_connections(*args, **kw)
-
-    def test_wo_connections(self):
-        http = object()
-        self._call_fut(http)
-
-    def test_w_connections(self):
-        connections = {'delete:me': object(), 'skip_me': object()}
-        http = _Dummy(connections=connections)
-        self._call_fut(http)
-        self.assertFalse('delete:me' in connections)
-        self.assertTrue('skip_me' in connections)
-
-
-class Test___make_api_request_no_retry(unittest.TestCase):
-
-    def _call_fut(self, *args, **kw):
-        from google.cloud.streaming.http_wrapper import (
-            _make_api_request_no_retry)
-        return _make_api_request_no_retry(*args, **kw)
-
-    def _verify_requested(self, http, request,
-                          redirections=5, connection_type=None):
-        self.assertEqual(len(http._requested), 1)
-        url, kw = http._requested[0]
-        self.assertEqual(url, request.url)
-        self.assertEqual(kw['method'], request.http_method)
-        self.assertEqual(kw['body'], request.body)
-        self.assertEqual(kw['headers'], request.headers)
-        self.assertEqual(kw['redirections'], redirections)
-        self.assertEqual(kw['connection_type'], connection_type)
-
-    def test_defaults_wo_connections(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import http_wrapper as MUT
-
-        INFO = {'status': '200'}
-        CONTENT = 'CONTENT'
-        _http = _Http((INFO, CONTENT))
-        _httplib2 = _Dummy(debuglevel=1)
-        _request = _Request()
-        _checked = []
-        with _Monkey(MUT, httplib2=_httplib2,
-                     _check_response=_checked.append):
-            response = self._call_fut(_http, _request)
-
-        self.assertIsInstance(response, MUT.Response)
-        self.assertEqual(response.info, INFO)
-        self.assertEqual(response.content, CONTENT)
-        self.assertEqual(response.request_url, _request.url)
-        self.assertEqual(_checked, [response])
-        self._verify_requested(_http, _request)
-
-    def test_w_http_connections_miss(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import http_wrapper as MUT
-
-        INFO = {'status': '200'}
-        CONTENT = 'CONTENT'
-        CONN_TYPE = object()
-        _http = _Http((INFO, CONTENT))
-        _http.connections = {'https': CONN_TYPE}
-        _httplib2 = _Dummy(debuglevel=1)
-        _request = _Request()
-        _checked = []
-        with _Monkey(MUT, httplib2=_httplib2,
-                     _check_response=_checked.append):
-            response = self._call_fut(_http, _request)
-
-        self.assertIsInstance(response, MUT.Response)
-        self.assertEqual(response.info, INFO)
-        self.assertEqual(response.content, CONTENT)
-        self.assertEqual(response.request_url, _request.url)
-        self.assertEqual(_checked, [response])
-        self._verify_requested(_http, _request)
-
-    def test_w_http_connections_hit(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import http_wrapper as MUT
-
-        INFO = {'status': '200'}
-        CONTENT = 'CONTENT'
-        CONN_TYPE = object()
-        _http = _Http((INFO, CONTENT))
-        _http.connections = {'http': CONN_TYPE}
-        _httplib2 = _Dummy(debuglevel=1)
-        _request = _Request()
-        _checked = []
-        with _Monkey(MUT, httplib2=_httplib2,
-                     _check_response=_checked.append):
-            response = self._call_fut(_http, _request)
-
-        self.assertIsInstance(response, MUT.Response)
-        self.assertEqual(response.info, INFO)
-        self.assertEqual(response.content, CONTENT)
-        self.assertEqual(response.request_url, _request.url)
-        self.assertEqual(_checked, [response])
-        self._verify_requested(_http, _request, connection_type=CONN_TYPE)
-
-    def test_w_request_returning_None(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import http_wrapper as MUT
-        from google.cloud.streaming.exceptions import RequestError
-
-        INFO = None
-        CONTENT = None
-        CONN_TYPE = object()
-        _http = _Http((INFO, CONTENT))
-        _http.connections = {'http': CONN_TYPE}
-        _httplib2 = _Dummy(debuglevel=1)
-        _request = _Request()
-        with _Monkey(MUT, httplib2=_httplib2):
-            with self.assertRaises(RequestError):
-                self._call_fut(_http, _request)
-        self._verify_requested(_http, _request, connection_type=CONN_TYPE)
-
-
-class Test_make_api_request(unittest.TestCase):
-
-    def _call_fut(self, *args, **kw):
-        from google.cloud.streaming.http_wrapper import make_api_request
-
-        return make_api_request(*args, **kw)
-
-    def test_wo_exception(self):
-        from google.cloud.streaming import http_wrapper as MUT
-        from google.cloud._testing import _Monkey
-
-        HTTP, REQUEST, RESPONSE = object(), object(), object()
-        _created, _checked = [], []
-
-        def _wo_exception(*args, **kw):
-            _created.append((args, kw))
-            return RESPONSE
-
-        with _Monkey(MUT, _make_api_request_no_retry=_wo_exception,
-                     _check_response=_checked.append):
-            response = self._call_fut(HTTP, REQUEST)
-
-        self.assertIs(response, RESPONSE)
-        expected_kw = {'redirections': MUT._REDIRECTIONS}
-        self.assertEqual(_created, [((HTTP, REQUEST), expected_kw)])
-        self.assertEqual(_checked, [])  # not called by '_wo_exception'
-
-    def test_w_exceptions_lt_max_retries(self):
-        from google.cloud.streaming.exceptions import RetryAfterError
-        from google.cloud.streaming import http_wrapper as MUT
-        from google.cloud._testing import _Monkey
-
-        HTTP, RESPONSE = object(), object()
-        REQUEST = _Request()
-        _created, _checked = [], []
-        _counter = [None] * 4
-
-        def _wo_exception(*args, **kw):
-            _created.append((args, kw))
-            if _counter:
-                _counter.pop()
-                raise RetryAfterError(RESPONSE, '', REQUEST.url, 0.1)
-            return RESPONSE
-
-        with _Monkey(MUT, _make_api_request_no_retry=_wo_exception,
-                     _check_response=_checked.append):
-            response = self._call_fut(HTTP, REQUEST, retries=5)
-
-        self.assertIs(response, RESPONSE)
-        self.assertEqual(len(_created), 5)
-        expected_kw = {'redirections': MUT._REDIRECTIONS}
-        for attempt in _created:
-            self.assertEqual(attempt, ((HTTP, REQUEST), expected_kw))
-        self.assertEqual(_checked, [])  # not called by '_wo_exception'
-
-    def test_w_exceptions_gt_max_retries(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import http_wrapper as MUT
-
-        HTTP = object()
-        REQUEST = _Request()
-        _created, _checked = [], []
-
-        def _wo_exception(*args, **kw):
-            _created.append((args, kw))
-            raise ValueError('Retryable')
-
-        with _Monkey(MUT, calculate_wait_for_retry=lambda *ignored: 0.1,
-                     _make_api_request_no_retry=_wo_exception,
-                     _check_response=_checked.append):
-            with self.assertRaises(ValueError):
-                self._call_fut(HTTP, REQUEST, retries=3)
-
-        self.assertEqual(len(_created), 3)
-        expected_kw = {'redirections': MUT._REDIRECTIONS}
-        for attempt in _created:
-            self.assertEqual(attempt, ((HTTP, REQUEST), expected_kw))
-        self.assertEqual(_checked, [])  # not called by '_wo_exception'
-
-
-class _Dummy(object):
-    def __init__(self, **kw):
-        self.__dict__.update(kw)
-
-
-class _Request(object):
-    __slots__ = ('url', 'http_method', 'body', 'headers', 'loggable_body',)
-    URL = 'http://example.com/api'
-
-    def __init__(self, url=URL, http_method='GET', body='',
-                 loggable_body=None):
-        self.url = url
-        self.http_method = http_method
-        self.body = body
-        self.headers = {}
-        self.loggable_body = loggable_body
-
-
-class _Response(object):
-    content = ''
-    request_url = _Request.URL
-
-    def __init__(self, status_code, retry_after=None):
-        self.info = {'status': status_code}
-        self.status_code = status_code
-        self.retry_after = retry_after
-
-
-class _Http(object):
-
-    def __init__(self, *responses):
-        self._responses = responses
-        self._requested = []
-
-    def request(self, url, **kw):
-        self._requested.append((url, kw))
-        response, self._responses = self._responses[0], self._responses[1:]
-        return response
diff --git a/core/tests/unit/streaming/test_stream_slice.py b/core/tests/unit/streaming/test_stream_slice.py
deleted file mode 100644
index 47820078447d7..0000000000000
--- a/core/tests/unit/streaming/test_stream_slice.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import unittest
-
-
-class Test_StreamSlice(unittest.TestCase):
-
-    @staticmethod
-    def _get_target_class():
-        from google.cloud.streaming.stream_slice import StreamSlice
-
-        return StreamSlice
-
-    def _make_one(self, *args, **kw):
-        return self._get_target_class()(*args, **kw)
-
-    def test_ctor(self):
-        from io import BytesIO
-
-        CONTENT = b'CONTENT GOES HERE'
-        MAXSIZE = 4
-        stream = BytesIO(CONTENT)
-        stream_slice = self._make_one(stream, MAXSIZE)
-        self.assertIs(stream_slice._stream, stream)
-        self.assertEqual(stream_slice._remaining_bytes, MAXSIZE)
-        self.assertEqual(stream_slice._max_bytes, MAXSIZE)
-        self.assertEqual(len(stream_slice), MAXSIZE)
-        self.assertEqual(stream_slice.length, MAXSIZE)
-
-    def test___nonzero___empty(self):
-        from io import BytesIO
-
-        CONTENT = b''
-        MAXSIZE = 0
-        stream = BytesIO(CONTENT)
-        stream_slice = self._make_one(stream, MAXSIZE)
-        self.assertFalse(stream_slice)
-
-    def test___nonzero___nonempty(self):
-        from io import BytesIO
-
-        CONTENT = b'CONTENT GOES HERE'
-        MAXSIZE = 4
-        stream = BytesIO(CONTENT)
-        stream_slice = self._make_one(stream, MAXSIZE)
-        self.assertTrue(stream_slice)
-
-    def test_read_exhausted(self):
-        from io import BytesIO
-        from six.moves import http_client
-
-        CONTENT = b''
-        MAXSIZE = 4
-        stream = BytesIO(CONTENT)
-        stream_slice = self._make_one(stream, MAXSIZE)
-        with self.assertRaises(http_client.IncompleteRead):
-            stream_slice.read()
-
-    def test_read_implicit_size(self):
-        from io import BytesIO
-
-        CONTENT = b'CONTENT GOES HERE'
-        MAXSIZE = 4
-        stream = BytesIO(CONTENT)
-        stream_slice = self._make_one(stream, MAXSIZE)
-        self.assertEqual(stream_slice.read(), CONTENT[:MAXSIZE])
-        self.assertEqual(stream_slice._remaining_bytes, 0)
-
-    def test_read_explicit_size(self):
-        from io import BytesIO
-
-        CONTENT = b'CONTENT GOES HERE'
-        MAXSIZE = 4
-        SIZE = 3
-        stream = BytesIO(CONTENT)
-        stream_slice = self._make_one(stream, MAXSIZE)
-        self.assertEqual(stream_slice.read(SIZE), CONTENT[:SIZE])
-        self.assertEqual(stream_slice._remaining_bytes, MAXSIZE - SIZE)
diff --git a/core/tests/unit/streaming/test_transfer.py b/core/tests/unit/streaming/test_transfer.py
deleted file mode 100644
index 8bafd4a1cc475..0000000000000
--- a/core/tests/unit/streaming/test_transfer.py
+++ /dev/null
@@ -1,2035 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import unittest
-
-
-class Test__Transfer(unittest.TestCase):
-    URL = 'http://example.com/api'
-
-    @staticmethod
-    def _get_target_class():
-        from google.cloud.streaming.transfer import _Transfer
-
-        return _Transfer
-
-    def _make_one(self, *args, **kw):
-        return self._get_target_class()(*args, **kw)
-
-    def test_ctor_defaults(self):
-        from google.cloud.streaming.transfer import _DEFAULT_CHUNKSIZE
-
-        stream = _Stream()
-        xfer = self._make_one(stream)
-        self.assertIs(xfer.stream, stream)
-        self.assertFalse(xfer.close_stream)
-        self.assertEqual(xfer.chunksize, _DEFAULT_CHUNKSIZE)
-        self.assertTrue(xfer.auto_transfer)
-        self.assertIsNone(xfer.bytes_http)
-        self.assertIsNone(xfer.http)
-        self.assertEqual(xfer.num_retries, 5)
-        self.assertIsNone(xfer.url)
-        self.assertFalse(xfer.initialized)
-
-    def test_ctor_explicit(self):
-        stream = _Stream()
-        HTTP = object()
-        CHUNK_SIZE = 1 << 18
-        NUM_RETRIES = 8
-        xfer = self._make_one(stream,
-                              close_stream=True,
-                              chunksize=CHUNK_SIZE,
-                              auto_transfer=False,
-                              http=HTTP,
-                              num_retries=NUM_RETRIES)
-        self.assertIs(xfer.stream, stream)
-        self.assertTrue(xfer.close_stream)
-        self.assertEqual(xfer.chunksize, CHUNK_SIZE)
-        self.assertFalse(xfer.auto_transfer)
-        self.assertIs(xfer.bytes_http, HTTP)
-        self.assertIs(xfer.http, HTTP)
-        self.assertEqual(xfer.num_retries, NUM_RETRIES)
-
-    def test_bytes_http_fallback_to_http(self):
-        stream = _Stream()
-        HTTP = object()
-        xfer = self._make_one(stream, http=HTTP)
-        self.assertIs(xfer.bytes_http, HTTP)
-
-    def test_bytes_http_setter(self):
-        stream = _Stream()
-        HTTP = object()
-        BYTES_HTTP = object()
-        xfer = self._make_one(stream, http=HTTP)
-        xfer.bytes_http = BYTES_HTTP
-        self.assertIs(xfer.bytes_http, BYTES_HTTP)
-
-    def test_num_retries_setter_invalid(self):
-        stream = _Stream()
-        xfer = self._make_one(stream)
-        with self.assertRaises(ValueError):
-            xfer.num_retries = object()
-
-    def test_num_retries_setter_negative(self):
-        stream = _Stream()
-        xfer = self._make_one(stream)
-        with self.assertRaises(ValueError):
-            xfer.num_retries = -1
-
-    def test__initialize_not_already_initialized_w_http(self):
-        HTTP = object()
-        stream = _Stream()
-        xfer = self._make_one(stream)
-        xfer._initialize(HTTP, self.URL)
-        self.assertTrue(xfer.initialized)
-        self.assertIs(xfer.http, HTTP)
-        self.assertIs(xfer.url, self.URL)
-
-    def test__initialize_not_already_initialized_wo_http(self):
-        from httplib2 import Http
-
-        stream = _Stream()
-        xfer = self._make_one(stream)
-        xfer._initialize(None, self.URL)
-        self.assertTrue(xfer.initialized)
-        self.assertIsInstance(xfer.http, Http)
-        self.assertIs(xfer.url, self.URL)
-
-    def test__initialize_w_existing_http(self):
-        HTTP_1, HTTP_2 = object(), object()
-        stream = _Stream()
-        xfer = self._make_one(stream, http=HTTP_1)
-        xfer._initialize(HTTP_2, self.URL)
-        self.assertTrue(xfer.initialized)
-        self.assertIs(xfer.http, HTTP_1)
-        self.assertIs(xfer.url, self.URL)
-
-    def test__initialize_already_initialized(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-
-        URL_2 = 'http://example.com/other'
-        HTTP_1, HTTP_2 = object(), object()
-        stream = _Stream()
-        xfer = self._make_one(stream)
-        xfer._initialize(HTTP_1, self.URL)
-        with self.assertRaises(TransferInvalidError):
-            xfer._initialize(HTTP_2, URL_2)
-
-    def test__ensure_initialized_hit(self):
-        HTTP = object()
-        stream = _Stream()
-        xfer = self._make_one(stream)
-        xfer._initialize(HTTP, self.URL)
-        xfer._ensure_initialized()  # no raise
-
-    def test__ensure_initialized_miss(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-
-        stream = _Stream()
-        xfer = self._make_one(stream)
-        with self.assertRaises(TransferInvalidError):
-            xfer._ensure_initialized()
-
-    def test__ensure_uninitialized_hit(self):
-        stream = _Stream()
-        xfer = self._make_one(stream)
-        xfer._ensure_uninitialized()  # no raise
-
-    def test__ensure_uninitialized_miss(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-
-        stream = _Stream()
-        HTTP = object()
-        xfer = self._make_one(stream)
-        xfer._initialize(HTTP, self.URL)
-        with self.assertRaises(TransferInvalidError):
-            xfer._ensure_uninitialized()
-
-    def test___del___closes_stream(self):
-
-        stream = _Stream()
-        xfer = self._make_one(stream, close_stream=True)
-
-        self.assertFalse(stream._closed)
-        del xfer
-        self.assertTrue(stream._closed)
-
-
-class Test_Download(unittest.TestCase):
-    URL = "http://example.com/api"
-
-    @staticmethod
-    def _get_target_class():
-        from google.cloud.streaming.transfer import Download
-
-        return Download
-
-    def _make_one(self, *args, **kw):
-        return self._get_target_class()(*args, **kw)
-
-    def test_ctor_defaults(self):
-        stream = _Stream()
-        download = self._make_one(stream)
-        self.assertIs(download.stream, stream)
-        self.assertIsNone(download._initial_response)
-        self.assertEqual(download.progress, 0)
-        self.assertIsNone(download.total_size)
-        self.assertIsNone(download.encoding)
-
-    def test_ctor_w_kwds(self):
-        stream = _Stream()
-        CHUNK_SIZE = 123
-        download = self._make_one(stream, chunksize=CHUNK_SIZE)
-        self.assertIs(download.stream, stream)
-        self.assertEqual(download.chunksize, CHUNK_SIZE)
-
-    def test_ctor_w_total_size(self):
-        stream = _Stream()
-        SIZE = 123
-        download = self._make_one(stream, total_size=SIZE)
-        self.assertIs(download.stream, stream)
-        self.assertEqual(download.total_size, SIZE)
-
-    def test_from_file_w_existing_file_no_override(self):
-        import os
-        from google.cloud._testing import _tempdir
-
-        klass = self._get_target_class()
-        with _tempdir() as tempdir:
-            filename = os.path.join(tempdir, 'file.out')
-            with open(filename, 'w') as fileobj:
-                fileobj.write('EXISTING FILE')
-            with self.assertRaises(ValueError):
-                klass.from_file(filename)
-
-    def test_from_file_w_existing_file_w_override_wo_auto_transfer(self):
-        import os
-        from google.cloud._testing import _tempdir
-
-        klass = self._get_target_class()
-        with _tempdir() as tempdir:
-            filename = os.path.join(tempdir, 'file.out')
-            with open(filename, 'w') as fileobj:
-                fileobj.write('EXISTING FILE')
-            download = klass.from_file(filename, overwrite=True,
-                                       auto_transfer=False)
-            self.assertFalse(download.auto_transfer)
-            del download  # closes stream
-            with open(filename, 'rb') as fileobj:
-                self.assertEqual(fileobj.read(), b'')
-
-    def test_from_stream_defaults(self):
-        stream = _Stream()
-        klass = self._get_target_class()
-        download = klass.from_stream(stream)
-        self.assertIs(download.stream, stream)
-        self.assertTrue(download.auto_transfer)
-        self.assertIsNone(download.total_size)
-
-    def test_from_stream_explicit(self):
-        CHUNK_SIZE = 1 << 18
-        SIZE = 123
-        stream = _Stream()
-        klass = self._get_target_class()
-        download = klass.from_stream(stream, auto_transfer=False,
-                                     total_size=SIZE, chunksize=CHUNK_SIZE)
-        self.assertIs(download.stream, stream)
-        self.assertFalse(download.auto_transfer)
-        self.assertEqual(download.total_size, SIZE)
-        self.assertEqual(download.chunksize, CHUNK_SIZE)
-
-    def test_configure_request(self):
-        CHUNK_SIZE = 100
-        download = self._make_one(_Stream(), chunksize=CHUNK_SIZE)
-        request = _Dummy(headers={})
-        url_builder = _Dummy(query_params={})
-        download.configure_request(request, url_builder)
-        self.assertEqual(request.headers, {'Range': 'bytes=0-99'})
-        self.assertEqual(url_builder.query_params, {'alt': 'media'})
-
-    def test__set_total_wo_content_range_wo_existing_total(self):
-        info = {}
-        download = self._make_one(_Stream())
-        download._set_total(info)
-        self.assertEqual(download.total_size, 0)
-
-    def test__set_total_wo_content_range_w_existing_total(self):
-        SIZE = 123
-        info = {}
-        download = self._make_one(_Stream(), total_size=SIZE)
-        download._set_total(info)
-        self.assertEqual(download.total_size, SIZE)
-
-    def test__set_total_w_content_range_w_existing_total(self):
-        SIZE = 123
-        info = {'content-range': 'bytes 123-234/4567'}
-        download = self._make_one(_Stream(), total_size=SIZE)
-        download._set_total(info)
-        self.assertEqual(download.total_size, 4567)
-
-    def test__set_total_w_content_range_w_asterisk_total(self):
-        info = {'content-range': 'bytes 123-234/*'}
-        download = self._make_one(_Stream())
-        download._set_total(info)
-        self.assertEqual(download.total_size, 0)
-
-    def test_initialize_download_already_initialized(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-
-        request = _Request()
-        download = self._make_one(_Stream())
-        download._initialize(None, self.URL)
-        with self.assertRaises(TransferInvalidError):
-            download.initialize_download(request, http=object())
-
-    def test_initialize_download_wo_autotransfer(self):
-        request = _Request()
-        http = object()
-        download = self._make_one(_Stream(), auto_transfer=False)
-        download.initialize_download(request, http)
-        self.assertIs(download.http, http)
-        self.assertEqual(download.url, request.url)
-
-    def test_initialize_download_w_autotransfer_failing(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-        from google.cloud.streaming.exceptions import HttpError
-
-        request = _Request()
-        http = object()
-        download = self._make_one(_Stream(), auto_transfer=True)
-
-        response = _makeResponse(http_client.BAD_REQUEST)
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT, make_api_request=requester):
-            with self.assertRaises(HttpError):
-                download.initialize_download(request, http)
-
-        self.assertTrue(len(requester._requested), 1)
-        self.assertIs(requester._requested[0][0], request)
-
-    def test_initialize_download_w_autotransfer_w_content_location(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-
-        REDIRECT_URL = 'http://example.com/other'
-        request = _Request()
-        http = object()
-        info = {'content-location': REDIRECT_URL}
-        download = self._make_one(_Stream(), auto_transfer=True)
-
-        response = _makeResponse(http_client.NO_CONTENT, info)
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT, make_api_request=requester):
-            download.initialize_download(request, http)
-
-        self.assertIsNone(download._initial_response)
-        self.assertEqual(download.total_size, 0)
-        self.assertIs(download.http, http)
-        self.assertEqual(download.url, REDIRECT_URL)
-        self.assertTrue(len(requester._requested), 1)
-        self.assertIs(requester._requested[0][0], request)
-
-    def test__normalize_start_end_w_end_w_start_lt_0(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-
-        download = self._make_one(_Stream())
-
-        with self.assertRaises(TransferInvalidError):
-            download._normalize_start_end(-1, 0)
-
-    def test__normalize_start_end_w_end_w_start_gt_total(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-
-        download = self._make_one(_Stream())
-        download._set_total({'content-range': 'bytes 0-1/2'})
-
-        with self.assertRaises(TransferInvalidError):
-            download._normalize_start_end(3, 0)
-
-    def test__normalize_start_end_w_end_lt_start(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-
-        download = self._make_one(_Stream())
-        download._set_total({'content-range': 'bytes 0-1/2'})
-
-        with self.assertRaises(TransferInvalidError):
-            download._normalize_start_end(1, 0)
-
-    def test__normalize_start_end_w_end_gt_start(self):
-        download = self._make_one(_Stream())
-        download._set_total({'content-range': 'bytes 0-1/2'})
-        self.assertEqual(download._normalize_start_end(1, 2), (1, 1))
-
-    def test__normalize_start_end_wo_end_w_start_lt_0(self):
-        download = self._make_one(_Stream())
-        download._set_total({'content-range': 'bytes 0-1/2'})
-        self.assertEqual(download._normalize_start_end(-2), (0, 1))
-        self.assertEqual(download._normalize_start_end(-1), (1, 1))
-
-    def test__normalize_start_end_wo_end_w_start_ge_0(self):
-        download = self._make_one(_Stream())
-        download._set_total({'content-range': 'bytes 0-1/100'})
-        self.assertEqual(download._normalize_start_end(0), (0, 99))
-        self.assertEqual(download._normalize_start_end(1), (1, 99))
-
-    def test__set_range_header_w_start_lt_0(self):
-        request = _Request()
-        download = self._make_one(_Stream())
-        download._set_range_header(request, -1)
-        self.assertEqual(request.headers['range'], 'bytes=-1')
-
-    def test__set_range_header_w_start_ge_0_wo_end(self):
-        request = _Request()
-        download = self._make_one(_Stream())
-        download._set_range_header(request, 0)
-        self.assertEqual(request.headers['range'], 'bytes=0-')
-
-    def test__set_range_header_w_start_ge_0_w_end(self):
-        request = _Request()
-        download = self._make_one(_Stream())
-        download._set_range_header(request, 0, 1)
-        self.assertEqual(request.headers['range'], 'bytes=0-1')
-
-    def test__compute_end_byte_w_start_lt_0_w_end(self):
-        download = self._make_one(_Stream())
-        self.assertEqual(download._compute_end_byte(-1, 1), 1)
-
-    def test__compute_end_byte_w_start_ge_0_wo_end_w_use_chunks(self):
-        CHUNK_SIZE = 5
-        download = self._make_one(_Stream(), chunksize=CHUNK_SIZE)
-        self.assertEqual(download._compute_end_byte(0, use_chunks=True), 4)
-
-    def test__compute_end_byte_w_start_ge_0_w_end_w_use_chunks(self):
-        CHUNK_SIZE = 5
-        download = self._make_one(_Stream(), chunksize=CHUNK_SIZE)
-        self.assertEqual(download._compute_end_byte(0, 3, use_chunks=True), 3)
-        self.assertEqual(download._compute_end_byte(0, 5, use_chunks=True), 4)
-
-    def test__compute_end_byte_w_start_ge_0_w_end_w_total_size(self):
-        CHUNK_SIZE = 50
-        download = self._make_one(_Stream(), chunksize=CHUNK_SIZE)
-        download._set_total({'content-range': 'bytes 0-1/10'})
-        self.assertEqual(download._compute_end_byte(0, 100, use_chunks=False),
-                         9)
-        self.assertEqual(download._compute_end_byte(0, 8, use_chunks=False), 8)
-
-    def test__compute_end_byte_w_start_ge_0_wo_end_w_total_size(self):
-        CHUNK_SIZE = 50
-        download = self._make_one(_Stream(), chunksize=CHUNK_SIZE)
-        download._set_total({'content-range': 'bytes 0-1/10'})
-        self.assertEqual(download._compute_end_byte(0, use_chunks=False), 9)
-
-    def test__get_chunk_not_initialized(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-
-        download = self._make_one(_Stream())
-
-        with self.assertRaises(TransferInvalidError):
-            download._get_chunk(0, 10)
-
-    def test__get_chunk(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-
-        http = object()
-        download = self._make_one(_Stream())
-        download._initialize(http, self.URL)
-        response = _makeResponse(http_client.OK)
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            found = download._get_chunk(0, 10)
-
-        self.assertIs(found, response)
-        self.assertTrue(len(requester._requested), 1)
-        request = requester._requested[0][0]
-        self.assertEqual(request.headers['range'], 'bytes=0-10')
-
-    def test__process_response_w_FORBIDDEN(self):
-        from google.cloud.streaming.exceptions import HttpError
-        from six.moves import http_client
-
-        download = self._make_one(_Stream())
-        response = _makeResponse(http_client.FORBIDDEN)
-        with self.assertRaises(HttpError):
-            download._process_response(response)
-
-    def test__process_response_w_NOT_FOUND(self):
-        from google.cloud.streaming.exceptions import HttpError
-        from six.moves import http_client
-
-        download = self._make_one(_Stream())
-        response = _makeResponse(http_client.NOT_FOUND)
-        with self.assertRaises(HttpError):
-            download._process_response(response)
-
-    def test__process_response_w_other_error(self):
-        from google.cloud.streaming.exceptions import TransferRetryError
-        from six.moves import http_client
-
-        download = self._make_one(_Stream())
-        response = _makeResponse(http_client.BAD_REQUEST)
-        with self.assertRaises(TransferRetryError):
-            download._process_response(response)
-
-    def test__process_response_w_OK_wo_encoding(self):
-        from six.moves import http_client
-
-        stream = _Stream()
-        download = self._make_one(stream)
-        response = _makeResponse(http_client.OK, content='OK')
-        found = download._process_response(response)
-        self.assertIs(found, response)
-        self.assertEqual(stream._written, ['OK'])
-        self.assertEqual(download.progress, 2)
-        self.assertIsNone(download.encoding)
-
-    def test__process_response_w_PARTIAL_CONTENT_w_encoding(self):
-        from six.moves import http_client
-
-        stream = _Stream()
-        download = self._make_one(stream)
-        info = {'content-encoding': 'blah'}
-        response = _makeResponse(http_client.OK, info, 'PARTIAL')
-        found = download._process_response(response)
-        self.assertIs(found, response)
-        self.assertEqual(stream._written, ['PARTIAL'])
-        self.assertEqual(download.progress, 7)
-        self.assertEqual(download.encoding, 'blah')
-
-    def test__process_response_w_REQUESTED_RANGE_NOT_SATISFIABLE(self):
-        from six.moves import http_client
-
-        stream = _Stream()
-        download = self._make_one(stream)
-        response = _makeResponse(
-            http_client.REQUESTED_RANGE_NOT_SATISFIABLE)
-        found = download._process_response(response)
-        self.assertIs(found, response)
-        self.assertEqual(stream._written, [])
-        self.assertEqual(download.progress, 0)
-        self.assertIsNone(download.encoding)
-
-    def test__process_response_w_NO_CONTENT(self):
-        from six.moves import http_client
-
-        stream = _Stream()
-        download = self._make_one(stream)
-        response = _makeResponse(status_code=http_client.NO_CONTENT)
-        found = download._process_response(response)
-        self.assertIs(found, response)
-        self.assertEqual(stream._written, [''])
-        self.assertEqual(download.progress, 0)
-        self.assertIsNone(download.encoding)
-
-    def test_get_range_not_initialized(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-
-        download = self._make_one(_Stream())
-        with self.assertRaises(TransferInvalidError):
-            download.get_range(0, 10)
-
-    def test_get_range_wo_total_size_complete(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-
-        CONTENT = b'ABCDEFGHIJ'
-        LEN = len(CONTENT)
-        REQ_RANGE = 'bytes=0-%d' % (LEN,)
-        RESP_RANGE = 'bytes 0-%d/%d' % (LEN - 1, LEN)
-        http = object()
-        stream = _Stream()
-        download = self._make_one(stream)
-        download._initialize(http, self.URL)
-        info = {'content-range': RESP_RANGE}
-        response = _makeResponse(http_client.OK, info, CONTENT)
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            download.get_range(0, LEN)
-
-        self.assertTrue(len(requester._requested), 1)
-        request = requester._requested[0][0]
-        self.assertEqual(request.headers, {'range': REQ_RANGE})
-        self.assertEqual(stream._written, [CONTENT])
-        self.assertEqual(download.total_size, LEN)
-
-    def test_get_range_wo_total_size_wo_end(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-
-        CONTENT = b'ABCDEFGHIJ'
-        LEN = len(CONTENT)
-        START = 5
-        CHUNK_SIZE = 123
-        REQ_RANGE = 'bytes=%d-%d' % (START, START + CHUNK_SIZE - 1,)
-        RESP_RANGE = 'bytes %d-%d/%d' % (START, LEN - 1, LEN)
-        http = object()
-        stream = _Stream()
-        download = self._make_one(stream, chunksize=CHUNK_SIZE)
-        download._initialize(http, self.URL)
-        info = {'content-range': RESP_RANGE}
-        response = _makeResponse(http_client.OK, info, CONTENT[START:])
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            download.get_range(START)
-
-        self.assertTrue(len(requester._requested), 1)
-        request = requester._requested[0][0]
-        self.assertEqual(request.headers, {'range': REQ_RANGE})
-        self.assertEqual(stream._written, [CONTENT[START:]])
-        self.assertEqual(download.total_size, LEN)
-
-    def test_get_range_w_total_size_partial(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-
-        CONTENT = b'ABCDEFGHIJ'
-        LEN = len(CONTENT)
-        PARTIAL_LEN = 5
-        REQ_RANGE = 'bytes=0-%d' % (PARTIAL_LEN,)
-        RESP_RANGE = 'bytes 0-%d/%d' % (PARTIAL_LEN, LEN,)
-        http = object()
-        stream = _Stream()
-        download = self._make_one(stream, total_size=LEN)
-        download._initialize(http, self.URL)
-        info = {'content-range': RESP_RANGE}
-        response = _makeResponse(http_client.OK, info, CONTENT[:PARTIAL_LEN])
-        response.length = LEN
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            download.get_range(0, PARTIAL_LEN)
-
-        self.assertTrue(len(requester._requested), 1)
-        request = requester._requested[0][0]
-        self.assertEqual(request.headers, {'range': REQ_RANGE})
-        self.assertEqual(stream._written, [CONTENT[:PARTIAL_LEN]])
-        self.assertEqual(download.total_size, LEN)
-
-    def test_get_range_w_empty_chunk(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-        from google.cloud.streaming.exceptions import TransferRetryError
-
-        CONTENT = b'ABCDEFGHIJ'
-        LEN = len(CONTENT)
-        START = 5
-        CHUNK_SIZE = 123
-        REQ_RANGE = 'bytes=%d-%d' % (START, START + CHUNK_SIZE - 1,)
-        RESP_RANGE = 'bytes %d-%d/%d' % (START, LEN - 1, LEN)
-        http = object()
-        stream = _Stream()
-        download = self._make_one(stream, chunksize=CHUNK_SIZE)
-        download._initialize(http, self.URL)
-        info = {'content-range': RESP_RANGE}
-        response = _makeResponse(http_client.OK, info)
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            with self.assertRaises(TransferRetryError):
-                download.get_range(START)
-
-        self.assertTrue(len(requester._requested), 1)
-        request = requester._requested[0][0]
-        self.assertEqual(request.headers, {'range': REQ_RANGE})
-        self.assertEqual(stream._written, [''])
-        self.assertEqual(download.total_size, LEN)
-
-    def test_get_range_w_total_size_wo_use_chunks(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-
-        CONTENT = b'ABCDEFGHIJ'
-        LEN = len(CONTENT)
-        CHUNK_SIZE = 3
-        REQ_RANGE = 'bytes=0-%d' % (LEN - 1,)
-        RESP_RANGE = 'bytes 0-%d/%d' % (LEN - 1, LEN,)
-        http = object()
-        stream = _Stream()
-        download = self._make_one(stream, total_size=LEN, chunksize=CHUNK_SIZE)
-        download._initialize(http, self.URL)
-        info = {'content-range': RESP_RANGE}
-        response = _makeResponse(http_client.OK, info, CONTENT)
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            download.get_range(0, use_chunks=False)
-
-        self.assertTrue(len(requester._requested), 1)
-        request = requester._requested[0][0]
-        self.assertEqual(request.headers, {'range': REQ_RANGE})
-        self.assertEqual(stream._written, [CONTENT])
-        self.assertEqual(download.total_size, LEN)
-
-    def test_get_range_w_multiple_chunks(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-
-        CONTENT = b'ABCDE'
-        LEN = len(CONTENT)
-        CHUNK_SIZE = 3
-        REQ_RANGE_1 = 'bytes=0-%d' % (CHUNK_SIZE - 1,)
-        RESP_RANGE_1 = 'bytes 0-%d/%d' % (CHUNK_SIZE - 1, LEN)
-        REQ_RANGE_2 = 'bytes=%d-%d' % (CHUNK_SIZE, LEN - 1)
-        RESP_RANGE_2 = 'bytes %d-%d/%d' % (CHUNK_SIZE, LEN - 1, LEN)
-        http = object()
-        stream = _Stream()
-        download = self._make_one(stream, chunksize=CHUNK_SIZE)
-        download._initialize(http, self.URL)
-        info_1 = {'content-range': RESP_RANGE_1}
-        response_1 = _makeResponse(http_client.PARTIAL_CONTENT, info_1,
-                                   CONTENT[:CHUNK_SIZE])
-        info_2 = {'content-range': RESP_RANGE_2}
-        response_2 = _makeResponse(http_client.OK, info_2,
-                                   CONTENT[CHUNK_SIZE:])
-        requester = _MakeRequest(response_1, response_2)
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            download.get_range(0)
-
-        self.assertTrue(len(requester._requested), 2)
-        request_1 = requester._requested[0][0]
-        self.assertEqual(request_1.headers, {'range': REQ_RANGE_1})
-        request_2 = requester._requested[1][0]
-        self.assertEqual(request_2.headers, {'range': REQ_RANGE_2})
-        self.assertEqual(stream._written, [b'ABC', b'DE'])
-        self.assertEqual(download.total_size, LEN)
-
-    def test_stream_file_not_initialized(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-
-        download = self._make_one(_Stream())
-
-        with self.assertRaises(TransferInvalidError):
-            download.stream_file()
-
-    def test_stream_file_w_initial_response_complete(self):
-        from six.moves import http_client
-
-        CONTENT = b'ABCDEFGHIJ'
-        LEN = len(CONTENT)
-        RESP_RANGE = 'bytes 0-%d/%d' % (LEN - 1, LEN,)
-        stream = _Stream()
-        download = self._make_one(stream, total_size=LEN)
-        info = {'content-range': RESP_RANGE}
-        download._initial_response = _makeResponse(
-            http_client.OK, info, CONTENT)
-        http = object()
-        download._initialize(http, _Request.URL)
-
-        download.stream_file()
-
-        self.assertEqual(stream._written, [CONTENT])
-        self.assertEqual(download.total_size, LEN)
-
-    def test_stream_file_w_initial_response_incomplete(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-
-        CHUNK_SIZE = 3
-        CONTENT = b'ABCDEF'
-        LEN = len(CONTENT)
-        RESP_RANGE_1 = 'bytes 0-%d/%d' % (CHUNK_SIZE - 1, LEN,)
-        REQ_RANGE_2 = 'bytes=%d-%d' % (CHUNK_SIZE, LEN - 1)
-        RESP_RANGE_2 = 'bytes %d-%d/%d' % (CHUNK_SIZE, LEN - 1, LEN,)
-        stream = _Stream()
-        http = object()
-        download = self._make_one(stream, chunksize=CHUNK_SIZE)
-        info_1 = {'content-range': RESP_RANGE_1}
-        download._initial_response = _makeResponse(
-            http_client.PARTIAL_CONTENT, info_1, CONTENT[:CHUNK_SIZE])
-        info_2 = {'content-range': RESP_RANGE_2}
-        response_2 = _makeResponse(
-            http_client.OK, info_2, CONTENT[CHUNK_SIZE:])
-        requester = _MakeRequest(response_2)
-
-        download._initialize(http, _Request.URL)
-
-        request = _Request()
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            download.stream_file()
-
-        self.assertTrue(len(requester._requested), 1)
-        request = requester._requested[0][0]
-        self.assertEqual(request.headers, {'range': REQ_RANGE_2})
-        self.assertEqual(stream._written,
-                         [CONTENT[:CHUNK_SIZE], CONTENT[CHUNK_SIZE:]])
-        self.assertEqual(download.total_size, LEN)
-
-    def test_stream_file_wo_initial_response_wo_total_size(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-
-        CONTENT = b'ABCDEFGHIJ'
-        LEN = len(CONTENT)
-        CHUNK_SIZE = 123
-        REQ_RANGE = 'bytes=0-%d' % (CHUNK_SIZE - 1)
-        RESP_RANGE = 'bytes 0-%d/%d' % (LEN - 1, LEN,)
-        stream = _Stream()
-        http = object()
-        download = self._make_one(stream, chunksize=CHUNK_SIZE)
-        info = {'content-range': RESP_RANGE}
-        response = _makeResponse(http_client.OK, info, CONTENT)
-        requester = _MakeRequest(response)
-        download._initialize(http, _Request.URL)
-
-        request = _Request()
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            download.stream_file()
-
-        self.assertTrue(len(requester._requested), 1)
-        request = requester._requested[0][0]
-        self.assertEqual(request.headers, {'range': REQ_RANGE})
-        self.assertEqual(stream._written, [CONTENT])
-        self.assertEqual(download.total_size, LEN)
-
-
-class Test_Upload(unittest.TestCase):
-    URL = "http://example.com/api"
-    MIME_TYPE = 'application/octet-stream'
-    UPLOAD_URL = 'http://example.com/upload/id=foobar'
-
-    @staticmethod
-    def _get_target_class():
-        from google.cloud.streaming.transfer import Upload
-
-        return Upload
-
-    def _make_one(self, stream, mime_type=MIME_TYPE, *args, **kw):
-        return self._get_target_class()(stream, mime_type, *args, **kw)
-
-    def test_ctor_defaults(self):
-        from google.cloud.streaming.transfer import _DEFAULT_CHUNKSIZE
-
-        stream = _Stream()
-        upload = self._make_one(stream)
-        self.assertIs(upload.stream, stream)
-        self.assertIsNone(upload._final_response)
-        self.assertIsNone(upload._server_chunk_granularity)
-        self.assertFalse(upload.complete)
-        self.assertEqual(upload.mime_type, self.MIME_TYPE)
-        self.assertEqual(upload.progress, 0)
-        self.assertIsNone(upload.strategy)
-        self.assertIsNone(upload.total_size)
-        self.assertEqual(upload.chunksize, _DEFAULT_CHUNKSIZE)
-
-    def test_ctor_w_kwds(self):
-        stream = _Stream()
-        CHUNK_SIZE = 123
-        upload = self._make_one(stream, chunksize=CHUNK_SIZE)
-        self.assertIs(upload.stream, stream)
-        self.assertEqual(upload.mime_type, self.MIME_TYPE)
-        self.assertEqual(upload.chunksize, CHUNK_SIZE)
-
-    def test_from_file_w_nonesuch_file(self):
-        klass = self._get_target_class()
-        filename = '~nosuchuser/file.txt'
-        with self.assertRaises(OSError):
-            klass.from_file(filename)
-
-    def test_from_file_wo_mimetype_w_unguessable_filename(self):
-        import os
-        from google.cloud._testing import _tempdir
-
-        klass = self._get_target_class()
-        CONTENT = b'EXISTING FILE W/ UNGUESSABLE MIMETYPE'
-        with _tempdir() as tempdir:
-            filename = os.path.join(tempdir, 'file.unguessable')
-            with open(filename, 'wb') as fileobj:
-                fileobj.write(CONTENT)
-            with self.assertRaises(ValueError):
-                klass.from_file(filename)
-
-    def test_from_file_wo_mimetype_w_guessable_filename(self):
-        import os
-        from google.cloud._testing import _tempdir
-
-        klass = self._get_target_class()
-        CONTENT = b'EXISTING FILE W/ GUESSABLE MIMETYPE'
-        with _tempdir() as tempdir:
-            filename = os.path.join(tempdir, 'file.txt')
-            with open(filename, 'wb') as fileobj:
-                fileobj.write(CONTENT)
-            upload = klass.from_file(filename)
-            self.assertEqual(upload.mime_type, 'text/plain')
-            self.assertTrue(upload.auto_transfer)
-            self.assertEqual(upload.total_size, len(CONTENT))
-            upload._stream.close()
-
-    def test_from_file_w_mimetype_w_auto_transfer_w_kwds(self):
-        import os
-        from google.cloud._testing import _tempdir
-
-        klass = self._get_target_class()
-        CONTENT = b'EXISTING FILE W/ GUESSABLE MIMETYPE'
-        CHUNK_SIZE = 3
-        with _tempdir() as tempdir:
-            filename = os.path.join(tempdir, 'file.unguessable')
-            with open(filename, 'wb') as fileobj:
-                fileobj.write(CONTENT)
-            upload = klass.from_file(
-                filename,
-                mime_type=self.MIME_TYPE,
-                auto_transfer=False,
-                chunksize=CHUNK_SIZE)
-            self.assertEqual(upload.mime_type, self.MIME_TYPE)
-            self.assertFalse(upload.auto_transfer)
-            self.assertEqual(upload.total_size, len(CONTENT))
-            self.assertEqual(upload.chunksize, CHUNK_SIZE)
-            upload._stream.close()
-
-    def test_from_stream_wo_mimetype(self):
-        klass = self._get_target_class()
-        stream = _Stream()
-        with self.assertRaises(ValueError):
-            klass.from_stream(stream, mime_type=None)
-
-    def test_from_stream_defaults(self):
-        klass = self._get_target_class()
-        stream = _Stream()
-        upload = klass.from_stream(stream, mime_type=self.MIME_TYPE)
-        self.assertEqual(upload.mime_type, self.MIME_TYPE)
-        self.assertTrue(upload.auto_transfer)
-        self.assertIsNone(upload.total_size)
-
-    def test_from_stream_explicit(self):
-        klass = self._get_target_class()
-        stream = _Stream()
-        SIZE = 10
-        CHUNK_SIZE = 3
-        upload = klass.from_stream(
-            stream,
-            mime_type=self.MIME_TYPE,
-            auto_transfer=False,
-            total_size=SIZE,
-            chunksize=CHUNK_SIZE)
-        self.assertEqual(upload.mime_type, self.MIME_TYPE)
-        self.assertFalse(upload.auto_transfer)
-        self.assertEqual(upload.total_size, SIZE)
-        self.assertEqual(upload.chunksize, CHUNK_SIZE)
-
-    def test_strategy_setter_invalid(self):
-        upload = self._make_one(_Stream())
-        with self.assertRaises(ValueError):
-            upload.strategy = object()
-        with self.assertRaises(ValueError):
-            upload.strategy = 'unknown'
-
-    def test_strategy_setter_SIMPLE_UPLOAD(self):
-        from google.cloud.streaming.transfer import SIMPLE_UPLOAD
-
-        upload = self._make_one(_Stream())
-        upload.strategy = SIMPLE_UPLOAD
-        self.assertEqual(upload.strategy, SIMPLE_UPLOAD)
-
-    def test_strategy_setter_RESUMABLE_UPLOAD(self):
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        upload = self._make_one(_Stream())
-        upload.strategy = RESUMABLE_UPLOAD
-        self.assertEqual(upload.strategy, RESUMABLE_UPLOAD)
-
-    def test_total_size_setter_initialized(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-
-        SIZE = 123
-        upload = self._make_one(_Stream)
-        http = object()
-        upload._initialize(http, _Request.URL)
-        with self.assertRaises(TransferInvalidError):
-            upload.total_size = SIZE
-
-    def test_total_size_setter_not_initialized(self):
-        SIZE = 123
-        upload = self._make_one(_Stream)
-        upload.total_size = SIZE
-        self.assertEqual(upload.total_size, SIZE)
-
-    def test__set_default_strategy_w_existing_strategy(self):
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        config = _Dummy(
-            resumable_path='/resumable/endpoint',
-            simple_multipart=True,
-            simple_path='/upload/endpoint',
-        )
-        request = _Request()
-        upload = self._make_one(_Stream)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._set_default_strategy(config, request)
-        self.assertEqual(upload.strategy, RESUMABLE_UPLOAD)
-
-    def test__set_default_strategy_wo_resumable_path(self):
-        from google.cloud.streaming.transfer import SIMPLE_UPLOAD
-
-        config = _Dummy(
-            resumable_path=None,
-            simple_multipart=True,
-            simple_path='/upload/endpoint',
-        )
-        request = _Request()
-        upload = self._make_one(_Stream())
-        upload._set_default_strategy(config, request)
-        self.assertEqual(upload.strategy, SIMPLE_UPLOAD)
-
-    def test__set_default_strategy_w_total_size_gt_threshhold(self):
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD_THRESHOLD
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        config = _UploadConfig()
-        request = _Request()
-        upload = self._make_one(
-            _Stream(), total_size=RESUMABLE_UPLOAD_THRESHOLD + 1)
-        upload._set_default_strategy(config, request)
-        self.assertEqual(upload.strategy, RESUMABLE_UPLOAD)
-
-    def test__set_default_strategy_w_body_wo_multipart(self):
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        config = _UploadConfig()
-        config.simple_multipart = False
-        request = _Request(body=CONTENT)
-        upload = self._make_one(_Stream(), total_size=len(CONTENT))
-        upload._set_default_strategy(config, request)
-        self.assertEqual(upload.strategy, RESUMABLE_UPLOAD)
-
-    def test__set_default_strategy_w_body_w_multipart_wo_simple_path(self):
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        config = _UploadConfig()
-        config.simple_path = None
-        request = _Request(body=CONTENT)
-        upload = self._make_one(_Stream(), total_size=len(CONTENT))
-        upload._set_default_strategy(config, request)
-        self.assertEqual(upload.strategy, RESUMABLE_UPLOAD)
-
-    def test__set_default_strategy_w_body_w_multipart_w_simple_path(self):
-        from google.cloud.streaming.transfer import SIMPLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        config = _UploadConfig()
-        request = _Request(body=CONTENT)
-        upload = self._make_one(_Stream(), total_size=len(CONTENT))
-        upload._set_default_strategy(config, request)
-        self.assertEqual(upload.strategy, SIMPLE_UPLOAD)
-
-    def test_configure_request_w_total_size_gt_max_size(self):
-        MAX_SIZE = 1000
-        config = _UploadConfig()
-        config.max_size = MAX_SIZE
-        request = _Request()
-        url_builder = _Dummy()
-        upload = self._make_one(_Stream(), total_size=MAX_SIZE + 1)
-        with self.assertRaises(ValueError):
-            upload.configure_request(config, request, url_builder)
-
-    def test_configure_request_w_invalid_mimetype(self):
-        config = _UploadConfig()
-        config.accept = ('text/*',)
-        request = _Request()
-        url_builder = _Dummy()
-        upload = self._make_one(_Stream())
-        with self.assertRaises(ValueError):
-            upload.configure_request(config, request, url_builder)
-
-    def test_configure_request_w_simple_wo_body(self):
-        from google.cloud.streaming.transfer import SIMPLE_UPLOAD
-
-        CONTENT = b'CONTENT'
-        config = _UploadConfig()
-        request = _Request()
-        url_builder = _Dummy(query_params={})
-        upload = self._make_one(_Stream(CONTENT))
-        upload.strategy = SIMPLE_UPLOAD
-
-        upload.configure_request(config, request, url_builder)
-
-        self.assertEqual(url_builder.query_params, {'uploadType': 'media'})
-        self.assertEqual(url_builder.relative_path, config.simple_path)
-
-        self.assertEqual(request.headers, {'content-type': self.MIME_TYPE})
-        self.assertEqual(request.body, CONTENT)
-        self.assertEqual(request.loggable_body, '<media body>')
-
-    def test_configure_request_w_simple_w_body(self):
-        from google.cloud._helpers import _to_bytes
-        from google.cloud.streaming.transfer import SIMPLE_UPLOAD
-
-        CONTENT = b'CONTENT'
-        BODY = b'BODY'
-        config = _UploadConfig()
-        request = _Request(body=BODY)
-        request.headers['content-type'] = 'text/plain'
-        url_builder = _Dummy(query_params={})
-        upload = self._make_one(_Stream(CONTENT))
-        upload.strategy = SIMPLE_UPLOAD
-
-        upload.configure_request(config, request, url_builder)
-
-        self.assertEqual(url_builder.query_params, {'uploadType': 'multipart'})
-        self.assertEqual(url_builder.relative_path, config.simple_path)
-
-        self.assertEqual(list(request.headers), ['content-type'])
-        ctype, boundary = [x.strip()
-                           for x in request.headers['content-type'].split(';')]
-        self.assertEqual(ctype, 'multipart/related')
-        self.assertTrue(boundary.startswith('boundary="=='))
-        self.assertTrue(boundary.endswith('=="'))
-
-        divider = b'--' + _to_bytes(boundary[len('boundary="'):-1])
-        chunks = request.body.split(divider)[1:-1]  # discard prolog / epilog
-        self.assertEqual(len(chunks), 2)
-
-        parse_chunk = _email_chunk_parser()
-        text_msg = parse_chunk(chunks[0].strip())
-        self.assertEqual(dict(text_msg._headers),
-                         {'Content-Type': 'text/plain',
-                          'MIME-Version': '1.0'})
-        self.assertEqual(text_msg._payload, BODY.decode('ascii'))
-
-        app_msg = parse_chunk(chunks[1].strip())
-        self.assertEqual(dict(app_msg._headers),
-                         {'Content-Type': self.MIME_TYPE,
-                          'Content-Transfer-Encoding': 'binary',
-                          'MIME-Version': '1.0'})
-        self.assertEqual(app_msg._payload, CONTENT.decode('ascii'))
-        self.assertTrue(b'<media body>' in request.loggable_body)
-
-    def test_configure_request_w_resumable_wo_total_size(self):
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'CONTENT'
-        config = _UploadConfig()
-        request = _Request()
-        url_builder = _Dummy(query_params={})
-        upload = self._make_one(_Stream(CONTENT))
-        upload.strategy = RESUMABLE_UPLOAD
-
-        upload.configure_request(config, request, url_builder)
-
-        self.assertEqual(url_builder.query_params, {'uploadType': 'resumable'})
-        self.assertEqual(url_builder.relative_path, config.resumable_path)
-
-        self.assertEqual(request.headers,
-                         {'X-Upload-Content-Type': self.MIME_TYPE})
-
-    def test_configure_request_w_resumable_w_total_size(self):
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'CONTENT'
-        LEN = len(CONTENT)
-        config = _UploadConfig()
-        request = _Request()
-        url_builder = _Dummy(query_params={})
-        upload = self._make_one(_Stream(CONTENT))
-        upload.total_size = LEN
-        upload.strategy = RESUMABLE_UPLOAD
-
-        upload.configure_request(config, request, url_builder)
-
-        self.assertEqual(url_builder.query_params, {'uploadType': 'resumable'})
-        self.assertEqual(url_builder.relative_path, config.resumable_path)
-
-        self.assertEqual(request.headers,
-                         {'X-Upload-Content-Type': self.MIME_TYPE,
-                          'X-Upload-Content-Length': '%d' % (LEN,)})
-
-    def test_refresh_upload_state_w_simple_strategy(self):
-        from google.cloud.streaming.transfer import SIMPLE_UPLOAD
-
-        upload = self._make_one(_Stream())
-        upload.strategy = SIMPLE_UPLOAD
-        upload.refresh_upload_state()  # no-op
-
-    def test_refresh_upload_state_not_initialized(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        upload = self._make_one(_Stream())
-        upload.strategy = RESUMABLE_UPLOAD
-        with self.assertRaises(TransferInvalidError):
-            upload.refresh_upload_state()
-
-    def test_refresh_upload_state_w_OK(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        LEN = len(CONTENT)
-        RESP_RANGE = 'bytes 0-%d/%d' % (LEN - 1, LEN,)
-        http = object()
-        stream = _Stream()
-        upload = self._make_one(stream, total_size=LEN)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._initialize(http, _Request.URL)
-        info = {'content-range': RESP_RANGE}
-        response = _makeResponse(http_client.OK, info, CONTENT)
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            upload.refresh_upload_state()
-
-        self.assertTrue(upload.complete)
-        self.assertEqual(upload.progress, LEN)
-        self.assertEqual(stream.tell(), LEN)
-        self.assertIs(upload._final_response, response)
-
-    def test_refresh_upload_state_w_CREATED(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        LEN = len(CONTENT)
-        RESP_RANGE = 'bytes 0-%d/%d' % (LEN - 1, LEN,)
-        http = object()
-        stream = _Stream()
-        upload = self._make_one(stream, total_size=LEN)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._initialize(http, _Request.URL)
-        info = {'content-range': RESP_RANGE}
-        response = _makeResponse(http_client.CREATED, info, CONTENT)
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            upload.refresh_upload_state()
-
-        self.assertTrue(upload.complete)
-        self.assertEqual(upload.progress, LEN)
-        self.assertEqual(stream.tell(), LEN)
-        self.assertIs(upload._final_response, response)
-
-    def test_refresh_upload_state_w_RESUME_INCOMPLETE_w_range(self):
-        from google.cloud.streaming import transfer as MUT
-        from google.cloud.streaming.http_wrapper import RESUME_INCOMPLETE
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        LEN = len(CONTENT)
-        LAST = 5
-        http = object()
-        stream = _Stream()
-        upload = self._make_one(stream, total_size=LEN)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._initialize(http, _Request.URL)
-        info = {'range': '0-%d' % (LAST - 1,)}
-        response = _makeResponse(RESUME_INCOMPLETE, info, CONTENT)
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            upload.refresh_upload_state()
-
-        self.assertFalse(upload.complete)
-        self.assertEqual(upload.progress, LAST)
-        self.assertEqual(stream.tell(), LAST)
-        self.assertIsNot(upload._final_response, response)
-
-    def test_refresh_upload_state_w_RESUME_INCOMPLETE_wo_range(self):
-        from google.cloud.streaming import transfer as MUT
-        from google.cloud.streaming.http_wrapper import RESUME_INCOMPLETE
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        LEN = len(CONTENT)
-        http = object()
-        stream = _Stream()
-        upload = self._make_one(stream, total_size=LEN)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._initialize(http, _Request.URL)
-        response = _makeResponse(RESUME_INCOMPLETE, content=CONTENT)
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            upload.refresh_upload_state()
-
-        self.assertFalse(upload.complete)
-        self.assertEqual(upload.progress, 0)
-        self.assertEqual(stream.tell(), 0)
-        self.assertIsNot(upload._final_response, response)
-
-    def test_refresh_upload_state_w_error(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-        from google.cloud.streaming.exceptions import HttpError
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        LEN = len(CONTENT)
-        http = object()
-        stream = _Stream()
-        upload = self._make_one(stream, total_size=LEN)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._initialize(http, _Request.URL)
-        response = _makeResponse(http_client.FORBIDDEN)
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            with self.assertRaises(HttpError):
-                upload.refresh_upload_state()
-
-    def test__get_range_header_miss(self):
-        upload = self._make_one(_Stream())
-        response = _makeResponse(None)
-        self.assertIsNone(upload._get_range_header(response))
-
-    def test__get_range_header_w_Range(self):
-        upload = self._make_one(_Stream())
-        response = _makeResponse(None, {'Range': '123'})
-        self.assertEqual(upload._get_range_header(response), '123')
-
-    def test__get_range_header_w_range(self):
-        upload = self._make_one(_Stream())
-        response = _makeResponse(None, {'range': '123'})
-        self.assertEqual(upload._get_range_header(response), '123')
-
-    def test_initialize_upload_no_strategy(self):
-        request = _Request()
-        upload = self._make_one(_Stream())
-        with self.assertRaises(ValueError):
-            upload.initialize_upload(request, http=object())
-
-    def test_initialize_upload_simple_w_http(self):
-        from google.cloud.streaming.transfer import SIMPLE_UPLOAD
-
-        request = _Request()
-        upload = self._make_one(_Stream())
-        upload.strategy = SIMPLE_UPLOAD
-        upload.initialize_upload(request, http=object())  # no-op
-
-    def test_initialize_upload_resumable_already_initialized(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        request = _Request()
-        upload = self._make_one(_Stream())
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._initialize(None, self.URL)
-        with self.assertRaises(TransferInvalidError):
-            upload.initialize_upload(request, http=object())
-
-    def test_initialize_upload_w_http_resumable_not_initialized_w_error(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-        from google.cloud.streaming.exceptions import HttpError
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        request = _Request()
-        upload = self._make_one(_Stream())
-        upload.strategy = RESUMABLE_UPLOAD
-        response = _makeResponse(http_client.FORBIDDEN)
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT, make_api_request=requester):
-            with self.assertRaises(HttpError):
-                upload.initialize_upload(request, http=object())
-
-    def test_initialize_upload_w_http_wo_auto_transfer_w_OK(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        request = _Request()
-        upload = self._make_one(_Stream(), auto_transfer=False)
-        upload.strategy = RESUMABLE_UPLOAD
-        info = {'location': self.UPLOAD_URL}
-        response = _makeResponse(http_client.OK, info)
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT, make_api_request=requester):
-            upload.initialize_upload(request, http=object())
-
-        self.assertIsNone(upload._server_chunk_granularity)
-        self.assertEqual(upload.url, self.UPLOAD_URL)
-        self.assertEqual(requester._responses, [])
-        self.assertEqual(len(requester._requested), 1)
-        self.assertIs(requester._requested[0][0], request)
-
-    def test_initialize_upload_w_granularity_w_auto_transfer_w_OK(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        http = object()
-        request = _Request()
-        upload = self._make_one(_Stream(CONTENT), chunksize=1000)
-        upload.strategy = RESUMABLE_UPLOAD
-        info = {'X-Goog-Upload-Chunk-Granularity': '100',
-                'location': self.UPLOAD_URL}
-        response = _makeResponse(http_client.OK, info)
-        chunk_response = _makeResponse(http_client.OK)
-        requester = _MakeRequest(response, chunk_response)
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            upload.initialize_upload(request, http)
-
-        self.assertEqual(upload._server_chunk_granularity, 100)
-        self.assertEqual(upload.url, self.UPLOAD_URL)
-        self.assertEqual(requester._responses, [])
-        self.assertEqual(len(requester._requested), 2)
-        self.assertIs(requester._requested[0][0], request)
-        chunk_request = requester._requested[1][0]
-        self.assertIsInstance(chunk_request, _Request)
-        self.assertEqual(chunk_request.url, self.UPLOAD_URL)
-        self.assertEqual(chunk_request.http_method, 'PUT')
-        self.assertEqual(chunk_request.body, CONTENT)
-
-    def test__last_byte(self):
-        upload = self._make_one(_Stream())
-        self.assertEqual(upload._last_byte('123-456'), 456)
-
-    def test__validate_chunksize_wo__server_chunk_granularity(self):
-        upload = self._make_one(_Stream())
-        upload._validate_chunksize(123)  # no-op
-
-    def test__validate_chunksize_w__server_chunk_granularity_miss(self):
-        upload = self._make_one(_Stream())
-        upload._server_chunk_granularity = 100
-        with self.assertRaises(ValueError):
-            upload._validate_chunksize(123)
-
-    def test__validate_chunksize_w__server_chunk_granularity_hit(self):
-        upload = self._make_one(_Stream())
-        upload._server_chunk_granularity = 100
-        upload._validate_chunksize(400)
-
-    def test_stream_file_w_simple_strategy(self):
-        from google.cloud.streaming.transfer import SIMPLE_UPLOAD
-
-        upload = self._make_one(_Stream())
-        upload.strategy = SIMPLE_UPLOAD
-        with self.assertRaises(ValueError):
-            upload.stream_file()
-
-    def test_stream_file_w_use_chunks_invalid_chunk_size(self):
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        upload = self._make_one(_Stream(), chunksize=1024)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._server_chunk_granularity = 100
-        with self.assertRaises(ValueError):
-            upload.stream_file(use_chunks=True)
-
-    def test_stream_file_not_initialized(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        upload = self._make_one(_Stream(), chunksize=1024)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._server_chunk_granularity = 128
-        with self.assertRaises(TransferInvalidError):
-            upload.stream_file()
-
-    def test_stream_file_already_complete_w_unseekable_stream(self):
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        http = object()
-        stream = object()
-        response = object()
-        upload = self._make_one(stream, chunksize=1024)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._server_chunk_granularity = 128
-        upload._initialize(http, _Request.URL)
-        upload._final_response = response
-        upload._complete = True
-        self.assertIs(upload.stream_file(), response)
-
-    def test_stream_file_already_complete_w_seekable_stream_unsynced(self):
-        from google.cloud.streaming.exceptions import CommunicationError
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        http = object()
-        stream = _Stream(CONTENT)
-        response = object()
-        upload = self._make_one(stream, chunksize=1024)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._server_chunk_granularity = 128
-        upload._initialize(http, _Request.URL)
-        upload._final_response = response
-        upload._complete = True
-        with self.assertRaises(CommunicationError):
-            upload.stream_file()
-
-    def test_stream_file_already_complete_wo_seekable_method_synced(self):
-        import os
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        http = object()
-        stream = _Stream(CONTENT)
-        stream.seek(0, os.SEEK_END)
-        response = object()
-        upload = self._make_one(stream, chunksize=1024)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._server_chunk_granularity = 128
-        upload._initialize(http, _Request.URL)
-        upload._final_response = response
-        upload._complete = True
-        self.assertIs(upload.stream_file(use_chunks=False), response)
-
-    def test_stream_file_already_complete_w_seekable_method_true_synced(self):
-        import os
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        http = object()
-        stream = _StreamWithSeekableMethod(CONTENT, True)
-        stream.seek(0, os.SEEK_END)
-        response = object()
-        upload = self._make_one(stream, chunksize=1024)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._server_chunk_granularity = 128
-        upload._initialize(http, _Request.URL)
-        upload._final_response = response
-        upload._complete = True
-        self.assertIs(upload.stream_file(use_chunks=False), response)
-
-    def test_stream_file_already_complete_w_seekable_method_false(self):
-        import os
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        http = object()
-        stream = _StreamWithSeekableMethod(CONTENT, False)
-        stream.seek(0, os.SEEK_END)
-        response = object()
-        upload = self._make_one(stream, chunksize=1024)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._server_chunk_granularity = 128
-        upload._initialize(http, _Request.URL)
-        upload._final_response = response
-        upload._complete = True
-        self.assertIs(upload.stream_file(use_chunks=False), response)
-
-    def test_stream_file_incomplete(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-        from google.cloud.streaming.http_wrapper import RESUME_INCOMPLETE
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        http = object()
-        stream = _Stream(CONTENT)
-        upload = self._make_one(stream, chunksize=6)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._server_chunk_granularity = 6
-        upload._initialize(http, self.UPLOAD_URL)
-
-        info_1 = {'content-length': '0', 'range': 'bytes=0-5'}
-        response_1 = _makeResponse(RESUME_INCOMPLETE, info_1)
-        info_2 = {'content-length': '0', 'range': 'bytes=6-9'}
-        response_2 = _makeResponse(http_client.OK, info_2)
-        requester = _MakeRequest(response_1, response_2)
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            response = upload.stream_file()
-
-        self.assertIs(response, response_2)
-        self.assertEqual(len(requester._responses), 0)
-        self.assertEqual(len(requester._requested), 2)
-
-        request_1 = requester._requested[0][0]
-        self.assertEqual(request_1.url, self.UPLOAD_URL)
-        self.assertEqual(request_1.http_method, 'PUT')
-        self.assertEqual(request_1.headers,
-                         {'Content-Range': 'bytes 0-5/*',
-                          'Content-Type': self.MIME_TYPE})
-        self.assertEqual(request_1.body, CONTENT[:6])
-
-        request_2 = requester._requested[1][0]
-        self.assertEqual(request_2.url, self.UPLOAD_URL)
-        self.assertEqual(request_2.http_method, 'PUT')
-        self.assertEqual(request_2.headers,
-                         {'Content-Range': 'bytes 6-9/10',
-                          'Content-Type': self.MIME_TYPE})
-        self.assertEqual(request_2.body, CONTENT[6:])
-
-    def test_stream_file_incomplete_w_transfer_error(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-        from google.cloud.streaming.exceptions import CommunicationError
-        from google.cloud.streaming.http_wrapper import RESUME_INCOMPLETE
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        http = object()
-        stream = _Stream(CONTENT)
-        upload = self._make_one(stream, chunksize=6)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._server_chunk_granularity = 6
-        upload._initialize(http, self.UPLOAD_URL)
-
-        info = {
-            'content-length': '0',
-            'range': 'bytes=0-4',  # simulate error, s.b. '0-5'
-        }
-        response = _makeResponse(RESUME_INCOMPLETE, info)
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT,
-                     Request=_Request,
-                     make_api_request=requester):
-            with self.assertRaises(CommunicationError):
-                upload.stream_file()
-
-        self.assertEqual(len(requester._responses), 0)
-        self.assertEqual(len(requester._requested), 1)
-
-        request = requester._requested[0][0]
-        self.assertEqual(request.url, self.UPLOAD_URL)
-        self.assertEqual(request.http_method, 'PUT')
-        self.assertEqual(request.headers,
-                         {'Content-Range': 'bytes 0-5/*',
-                          'Content-Type': self.MIME_TYPE})
-        self.assertEqual(request.body, CONTENT[:6])
-
-    def test__send_media_request_wo_error(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-        from google.cloud.streaming.http_wrapper import RESUME_INCOMPLETE
-
-        CONTENT = b'ABCDEFGHIJ'
-        bytes_http = object()
-        stream = _Stream(CONTENT)
-        upload = self._make_one(stream)
-        upload.bytes_http = bytes_http
-
-        headers = {'Content-Range': 'bytes 0-9/10',
-                   'Content-Type': self.MIME_TYPE}
-        request = _Request(self.UPLOAD_URL, 'PUT', CONTENT, headers)
-        info = {'content-length': '0', 'range': 'bytes=0-4'}
-        response = _makeResponse(RESUME_INCOMPLETE, info)
-        requester = _MakeRequest(response)
-
-        with _Monkey(MUT, make_api_request=requester):
-            upload._send_media_request(request, 9)
-
-        self.assertEqual(len(requester._responses), 0)
-        self.assertEqual(len(requester._requested), 1)
-        used_request, used_http, _ = requester._requested[0]
-        self.assertIs(used_request, request)
-        self.assertIs(used_http, bytes_http)
-        self.assertEqual(stream.tell(), 4)
-
-    def test__send_media_request_w_error(self):
-        from six.moves import http_client
-        from google.cloud._testing import _Monkey
-        from google.cloud.streaming import transfer as MUT
-        from google.cloud.streaming.exceptions import HttpError
-        from google.cloud.streaming.http_wrapper import RESUME_INCOMPLETE
-        from google.cloud.streaming.transfer import RESUMABLE_UPLOAD
-
-        CONTENT = b'ABCDEFGHIJ'
-        bytes_http = object()
-        http = object()
-        stream = _Stream(CONTENT)
-        upload = self._make_one(stream)
-        upload.strategy = RESUMABLE_UPLOAD
-        upload._initialize(http, self.UPLOAD_URL)
-        upload.bytes_http = bytes_http
-
-        headers = {'Content-Range': 'bytes 0-9/10',
-                   'Content-Type': self.MIME_TYPE}
-        request = _Request(self.UPLOAD_URL, 'PUT', CONTENT, headers)
-        info_1 = {'content-length': '0', 'range': 'bytes=0-4'}
-        response_1 = _makeResponse(http_client.FORBIDDEN, info_1)
-        info_2 = {'Content-Length': '0', 'Range': 'bytes=0-4'}
-        response_2 = _makeResponse(RESUME_INCOMPLETE, info_2)
-        requester = _MakeRequest(response_1, response_2)
-
-        with _Monkey(MUT, Request=_Request, make_api_request=requester):
-            with self.assertRaises(HttpError):
-                upload._send_media_request(request, 9)
-
-        self.assertEqual(len(requester._responses), 0)
-        self.assertEqual(len(requester._requested), 2)
-        first_request, first_http, _ = requester._requested[0]
-        self.assertIs(first_request, request)
-        self.assertIs(first_http, bytes_http)
-        second_request, second_http, _ = requester._requested[1]
-        self.assertEqual(second_request.url, self.UPLOAD_URL)
-        self.assertEqual(second_request.http_method, 'PUT')  # ACK!
-        self.assertEqual(second_request.headers,
-                         {'Content-Range': 'bytes */*'})
-        self.assertIs(second_http, http)
-
-    def test__send_media_body_not_initialized(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-
-        upload = self._make_one(_Stream())
-        with self.assertRaises(TransferInvalidError):
-            upload._send_media_body(0)
-
-    def test__send_media_body_wo_total_size(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-
-        http = object()
-        upload = self._make_one(_Stream())
-        upload._initialize(http, _Request.URL)
-        with self.assertRaises(TransferInvalidError):
-            upload._send_media_body(0)
-
-    def test__send_media_body_start_lt_total_size(self):
-        from google.cloud.streaming.stream_slice import StreamSlice
-
-        SIZE = 1234
-        http = object()
-        stream = _Stream()
-        upload = self._make_one(stream, total_size=SIZE)
-        upload._initialize(http, self.UPLOAD_URL)
-        response = object()
-        streamer = _MediaStreamer(response)
-        upload._send_media_request = streamer
-
-        found = upload._send_media_body(0)
-
-        self.assertIs(found, response)
-        request, end = streamer._called_with
-        self.assertEqual(request.url, self.UPLOAD_URL)
-        self.assertEqual(request.http_method, 'PUT')
-        body_stream = request.body
-        self.assertIsInstance(body_stream, StreamSlice)
-        self.assertIs(body_stream._stream, stream)
-        self.assertEqual(len(body_stream), SIZE)
-        self.assertEqual(request.headers,
-                         {'content-length': '%d' % (SIZE,),  # speling!
-                          'Content-Type': self.MIME_TYPE,
-                          'Content-Range': 'bytes 0-%d/%d' % (SIZE - 1, SIZE)})
-        self.assertEqual(end, SIZE)
-
-    def test__send_media_body_start_eq_total_size(self):
-        from google.cloud.streaming.stream_slice import StreamSlice
-
-        SIZE = 1234
-        http = object()
-        stream = _Stream()
-        upload = self._make_one(stream, total_size=SIZE)
-        upload._initialize(http, self.UPLOAD_URL)
-        response = object()
-        streamer = _MediaStreamer(response)
-        upload._send_media_request = streamer
-
-        found = upload._send_media_body(SIZE)
-
-        self.assertIs(found, response)
-        request, end = streamer._called_with
-        self.assertEqual(request.url, self.UPLOAD_URL)
-        self.assertEqual(request.http_method, 'PUT')
-        body_stream = request.body
-        self.assertIsInstance(body_stream, StreamSlice)
-        self.assertIs(body_stream._stream, stream)
-        self.assertEqual(len(body_stream), 0)
-        self.assertEqual(request.headers,
-                         {'content-length': '0',  # speling!
-                          'Content-Type': self.MIME_TYPE,
-                          'Content-Range': 'bytes */%d' % (SIZE,)})
-        self.assertEqual(end, SIZE)
-
-    def test__send_chunk_not_initialized(self):
-        from google.cloud.streaming.exceptions import TransferInvalidError
-
-        upload = self._make_one(_Stream())
-        with self.assertRaises(TransferInvalidError):
-            upload._send_chunk(0)
-
-    def test__send_chunk_wo_total_size_stream_exhausted(self):
-        CONTENT = b'ABCDEFGHIJ'
-        SIZE = len(CONTENT)
-        http = object()
-        upload = self._make_one(_Stream(CONTENT), chunksize=1000)
-        upload._initialize(http, self.UPLOAD_URL)
-        response = object()
-        streamer = _MediaStreamer(response)
-        upload._send_media_request = streamer
-        self.assertIsNone(upload.total_size)
-
-        found = upload._send_chunk(0)
-
-        self.assertIs(found, response)
-        self.assertEqual(upload.total_size, SIZE)
-        request, end = streamer._called_with
-        self.assertEqual(request.url, self.UPLOAD_URL)
-        self.assertEqual(request.http_method, 'PUT')
-        self.assertEqual(request.body, CONTENT)
-        self.assertEqual(request.headers,
-                         {'content-length': '%d' % SIZE,  # speling!
-                          'Content-Type': self.MIME_TYPE,
-                          'Content-Range': 'bytes 0-%d/%d' % (SIZE - 1, SIZE)})
-        self.assertEqual(end, SIZE)
-
-    def test__send_chunk_wo_total_size_stream_not_exhausted(self):
-        CONTENT = b'ABCDEFGHIJ'
-        SIZE = len(CONTENT)
-        CHUNK_SIZE = SIZE - 5
-        http = object()
-        upload = self._make_one(_Stream(CONTENT), chunksize=CHUNK_SIZE)
-        upload._initialize(http, self.UPLOAD_URL)
-        response = object()
-        streamer = _MediaStreamer(response)
-        upload._send_media_request = streamer
-        self.assertIsNone(upload.total_size)
-
-        found = upload._send_chunk(0)
-
-        self.assertIs(found, response)
-        self.assertIsNone(upload.total_size)
-        request, end = streamer._called_with
-        self.assertEqual(request.url, self.UPLOAD_URL)
-        self.assertEqual(request.http_method, 'PUT')
-        self.assertEqual(request.body, CONTENT[:CHUNK_SIZE])
-        expected_headers = {
-            'content-length': '%d' % CHUNK_SIZE,  # speling!
-            'Content-Type': self.MIME_TYPE,
-            'Content-Range': 'bytes 0-%d/*' % (CHUNK_SIZE - 1,),
-        }
-        self.assertEqual(request.headers, expected_headers)
-        self.assertEqual(end, CHUNK_SIZE)
-
-    def test__send_chunk_w_total_size_stream_not_exhausted(self):
-        from google.cloud.streaming.stream_slice import StreamSlice
-
-        CONTENT = b'ABCDEFGHIJ'
-        SIZE = len(CONTENT)
-        CHUNK_SIZE = SIZE - 5
-        http = object()
-        stream = _Stream(CONTENT)
-        upload = self._make_one(stream, total_size=SIZE, chunksize=CHUNK_SIZE)
-        upload._initialize(http, self.UPLOAD_URL)
-        response = object()
-        streamer = _MediaStreamer(response)
-        upload._send_media_request = streamer
-
-        found = upload._send_chunk(0)
-
-        self.assertIs(found, response)
-        request, end = streamer._called_with
-        self.assertEqual(request.url, self.UPLOAD_URL)
-        self.assertEqual(request.http_method, 'PUT')
-        body_stream = request.body
-        self.assertIsInstance(body_stream, StreamSlice)
-        self.assertIs(body_stream._stream, stream)
-        self.assertEqual(len(body_stream), CHUNK_SIZE)
-        expected_headers = {
-            'content-length': '%d' % CHUNK_SIZE,  # speling!
-            'Content-Type': self.MIME_TYPE,
-            'Content-Range': 'bytes 0-%d/%d' % (CHUNK_SIZE - 1, SIZE),
-        }
-        self.assertEqual(request.headers, expected_headers)
-        self.assertEqual(end, CHUNK_SIZE)
-
-    def test__send_chunk_w_total_size_stream_exhausted(self):
-        from google.cloud.streaming.stream_slice import StreamSlice
-
-        CONTENT = b'ABCDEFGHIJ'
-        SIZE = len(CONTENT)
-        CHUNK_SIZE = 1000
-        http = object()
-        stream = _Stream(CONTENT)
-        upload = self._make_one(stream, total_size=SIZE, chunksize=CHUNK_SIZE)
-        upload._initialize(http, self.UPLOAD_URL)
-        response = object()
-        streamer = _MediaStreamer(response)
-        upload._send_media_request = streamer
-
-        found = upload._send_chunk(SIZE)
-
-        self.assertIs(found, response)
-        request, end = streamer._called_with
-        self.assertEqual(request.url, self.UPLOAD_URL)
-        self.assertEqual(request.http_method, 'PUT')
-        body_stream = request.body
-        self.assertIsInstance(body_stream, StreamSlice)
-        self.assertIs(body_stream._stream, stream)
-        self.assertEqual(len(body_stream), 0)
-        self.assertEqual(request.headers,
-                         {'content-length': '0',  # speling!
-                          'Content-Type': self.MIME_TYPE,
-                          'Content-Range': 'bytes */%d' % (SIZE,)})
-        self.assertEqual(end, SIZE)
-
-
-def _email_chunk_parser():
-    import six
-
-    if six.PY3:  # pragma: NO COVER  Python3
-        from email.parser import BytesParser
-
-        parser = BytesParser()
-        return parser.parsebytes
-    else:
-        from email.parser import Parser
-
-        parser = Parser()
-        return parser.parsestr
-
-
-class _Dummy(object):
-    def __init__(self, **kw):
-        self.__dict__.update(kw)
-
-
-class _UploadConfig(object):
-    accept = ('*/*',)
-    max_size = None
-    resumable_path = '/resumable/endpoint'
-    simple_multipart = True
-    simple_path = '/upload/endpoint'
-
-
-class _Stream(object):
-    _closed = False
-
-    def __init__(self, to_read=b''):
-        import io
-
-        self._written = []
-        self._to_read = io.BytesIO(to_read)
-
-    def write(self, to_write):
-        self._written.append(to_write)
-
-    def seek(self, offset, whence=0):
-        self._to_read.seek(offset, whence)
-
-    def read(self, size=None):
-        if size is not None:
-            return self._to_read.read(size)
-        return self._to_read.read()
-
-    def tell(self):
-        return self._to_read.tell()
-
-    def close(self):
-        self._closed = True
-
-
-class _StreamWithSeekableMethod(_Stream):
-
-    def __init__(self, to_read=b'', seekable=True):
-        super(_StreamWithSeekableMethod, self).__init__(to_read)
-        self._seekable = seekable
-
-    def seekable(self):
-        return self._seekable
-
-
-class _Request(object):
-    __slots__ = ('url', 'http_method', 'body', 'headers', 'loggable_body')
-    URL = 'http://example.com/api'
-
-    def __init__(self, url=URL, http_method='GET', body='', headers=None):
-        self.url = url
-        self.http_method = http_method
-        self.body = self.loggable_body = body
-        if headers is None:
-            headers = {}
-        self.headers = headers
-
-
-class _MakeRequest(object):
-
-    def __init__(self, *responses):
-        self._responses = list(responses)
-        self._requested = []
-
-    def __call__(self, http, request, **kw):
-        self._requested.append((request, http, kw))
-        return self._responses.pop(0)
-
-
-def _makeResponse(status_code, info=None, content='',
-                  request_url=_Request.URL):
-    if info is None:
-        info = {}
-    return _Dummy(status_code=status_code,
-                  info=info,
-                  content=content,
-                  length=len(content),
-                  request_url=request_url)
-
-
-class _MediaStreamer(object):
-
-    _called_with = None
-
-    def __init__(self, response):
-        self._response = response
-
-    def __call__(self, request, end):
-        assert self._called_with is None
-        self._called_with = (request, end)
-        return self._response
diff --git a/core/tests/unit/streaming/test_util.py b/core/tests/unit/streaming/test_util.py
deleted file mode 100644
index 4da788182cb93..0000000000000
--- a/core/tests/unit/streaming/test_util.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import unittest
-
-
-class Test_calculate_wait_for_retry(unittest.TestCase):
-
-    def _call_fut(self, *args, **kw):
-        from google.cloud.streaming.util import calculate_wait_for_retry
-
-        return calculate_wait_for_retry(*args, **kw)
-
-    def test_w_negative_jitter_lt_max_wait(self):
-        import random
-        from google.cloud._testing import _Monkey
-
-        with _Monkey(random, uniform=lambda lower, upper: lower):
-            self.assertEqual(self._call_fut(1), 1.5)
-
-    def test_w_positive_jitter_gt_max_wait(self):
-        import random
-        from google.cloud._testing import _Monkey
-
-        with _Monkey(random, uniform=lambda lower, upper: upper):
-            self.assertEqual(self._call_fut(4), 20)
-
-
-class Test_acceptable_mime_type(unittest.TestCase):
-
-    def _call_fut(self, *args, **kw):
-        from google.cloud.streaming.util import acceptable_mime_type
-
-        return acceptable_mime_type(*args, **kw)
-
-    def test_pattern_wo_slash(self):
-        with self.assertRaises(ValueError) as err:
-            self._call_fut(['text/*'], 'BOGUS')
-        self.assertEqual(
-            err.exception.args,
-            ('Invalid MIME type: "BOGUS"',))
-
-    def test_accept_pattern_w_semicolon(self):
-        with self.assertRaises(ValueError) as err:
-            self._call_fut(['text/*;charset=utf-8'], 'text/plain')
-        self.assertEqual(
-            err.exception.args,
-            ('MIME patterns with parameter unsupported: '
-             '"text/*;charset=utf-8"',))
-
-    def test_miss(self):
-        self.assertFalse(self._call_fut(['image/*'], 'text/plain'))
-
-    def test_hit(self):
-        self.assertTrue(self._call_fut(['text/*'], 'text/plain'))
diff --git a/setup.cfg b/setup.cfg
index 2a9acf13daa95..79874b7479391 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,5 @@
 [bdist_wheel]
 universal = 1
+
+[tool:pytest]
+addopts = --tb=native

From d0479d6beb082646f85cafa54a5659fcd9bdbebd Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Sat, 22 Jul 2017 16:38:30 -0700
Subject: [PATCH 109/211] Fix pylint for the main package

---
 core/.flake8                          |  1 +
 core/google/__init__.py               |  2 ++
 core/google/cloud/__init__.py         |  2 ++
 core/google/cloud/_helpers.py         |  5 +++--
 core/google/cloud/_http.py            |  4 +++-
 core/google/cloud/_testing.py         | 14 +++++++++-----
 core/google/cloud/client.py           |  2 +-
 core/google/cloud/future/operation.py |  2 +-
 core/google/cloud/iam.py              |  6 +++---
 core/google/cloud/iterator.py         |  5 ++++-
 core/google/cloud/operation.py        |  4 ++--
 core/nox.py                           |  3 ++-
 12 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/core/.flake8 b/core/.flake8
index 25168dc87605d..7f4ddb8072b02 100644
--- a/core/.flake8
+++ b/core/.flake8
@@ -1,4 +1,5 @@
 [flake8]
+import-order-style=google
 exclude =
   __pycache__,
   .git,
diff --git a/core/google/__init__.py b/core/google/__init__.py
index b2b8333738826..a35569c36339e 100644
--- a/core/google/__init__.py
+++ b/core/google/__init__.py
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+"""Google namespace package."""
+
 try:
     import pkg_resources
     pkg_resources.declare_namespace(__name__)
diff --git a/core/google/cloud/__init__.py b/core/google/cloud/__init__.py
index b2b8333738826..59a804265f5c3 100644
--- a/core/google/cloud/__init__.py
+++ b/core/google/cloud/__init__.py
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+"""Google Cloud namespace package."""
+
 try:
     import pkg_resources
     pkg_resources.declare_namespace(__name__)
diff --git a/core/google/cloud/_helpers.py b/core/google/cloud/_helpers.py
index 72918e0645071..8dc9bf1cf4123 100644
--- a/core/google/cloud/_helpers.py
+++ b/core/google/cloud/_helpers.py
@@ -17,7 +17,6 @@
 This module is not part of the public API surface.
 """
 
-# Avoid the grpc and google.cloud.grpc collision.
 from __future__ import absolute_import
 
 import calendar
@@ -32,6 +31,8 @@
 import google_auth_httplib2
 
 try:
+    # pylint: disable=ungrouped-imports
+    # We must import google.auth.transport.grpc within this try: catch.
     import grpc
     import google.auth.transport.grpc
 except ImportError:  # pragma: NO COVER
@@ -104,7 +105,7 @@ def top(self):
         :rtype: object
         :returns: the top-most item, or None if the stack is empty.
         """
-        if len(self._stack) > 0:
+        if self._stack:
             return self._stack[-1]
 
 
diff --git a/core/google/cloud/_http.py b/core/google/cloud/_http.py
index e1a481e581a79..ada60b4fb2c3b 100644
--- a/core/google/cloud/_http.py
+++ b/core/google/cloud/_http.py
@@ -279,7 +279,9 @@ def api_request(self, method, path, query_params=None,
             can allow custom behavior, for example, to defer an HTTP request
             and complete initialization of the object at a later time.
 
-        :raises: Exception if the response code is not 200 OK.
+        :raises ~google.cloud.exceptions.GoogleCloudError: if the response code
+            is not 200 OK.
+        :raises TypeError: if the response content type is not JSON.
         :rtype: dict or str
         :returns: The API response payload, either as a raw string or
                   a dictionary if the response is valid JSON.
diff --git a/core/google/cloud/_testing.py b/core/google/cloud/_testing.py
index a544fffc5fe4a..871b5f631bc79 100644
--- a/core/google/cloud/_testing.py
+++ b/core/google/cloud/_testing.py
@@ -14,17 +14,15 @@
 
 """Shared testing utilities."""
 
-
-# Avoid the grpc and google.cloud.grpc collision.
 from __future__ import absolute_import
 
 
 class _Monkey(object):
-    # context-manager for replacing module names in the scope of a test.
+    """Context-manager for replacing module names in the scope of a test."""
 
     def __init__(self, module, **kw):
         self.module = module
-        if len(kw) == 0:  # pragma: NO COVER
+        if not kw:  # pragma: NO COVER
             raise ValueError('_Monkey was used with nothing to monkey-patch')
         self.to_restore = {key: getattr(module, key) for key in kw}
         for key, value in kw.items():
@@ -68,8 +66,12 @@ def _tempdir_mgr():
     return _tempdir_mgr
 
 
+# pylint: disable=invalid-name
+# Retain _tempdir as a constant for backwards compatibility despite
+# being an invalid name.
 _tempdir = _tempdir_maker()
 del _tempdir_maker
+# pylint: enable=invalid-name
 
 
 class _GAXBaseAPI(object):
@@ -79,7 +81,8 @@ class _GAXBaseAPI(object):
     def __init__(self, **kw):
         self.__dict__.update(kw)
 
-    def _make_grpc_error(self, status_code, trailing=None):
+    @staticmethod
+    def _make_grpc_error(status_code, trailing=None):
         from grpc._channel import _RPCState
         from google.cloud.exceptions import GrpcRendezvous
 
@@ -111,6 +114,7 @@ def __init__(self, *pages, **kwargs):
         self.page_token = kwargs.get('page_token')
 
     def next(self):
+        """Iterate to the next page."""
         import six
         return six.next(self._pages)
 
diff --git a/core/google/cloud/client.py b/core/google/cloud/client.py
index 9bdbf507d2014..5fa7f7ef95a28 100644
--- a/core/google/cloud/client.py
+++ b/core/google/cloud/client.py
@@ -64,7 +64,7 @@ def from_service_account_json(cls, json_credentials_path, *args, **kwargs):
 
         :rtype: :class:`_ClientFactoryMixin`
         :returns: The client created with the retrieved JSON credentials.
-        :raises: :class:`TypeError` if there is a conflict with the kwargs
+        :raises TypeError: if there is a conflict with the kwargs
                  and the credentials created by the factory.
         """
         if 'credentials' in kwargs:
diff --git a/core/google/cloud/future/operation.py b/core/google/cloud/future/operation.py
index 5bbfda1a8f0b3..8064e5c13e1f3 100644
--- a/core/google/cloud/future/operation.py
+++ b/core/google/cloud/future/operation.py
@@ -34,7 +34,7 @@ class Operation(base.PollingFuture):
             initial operation.
         refresh (Callable[[], Operation]): A callable that returns the
             latest state of the operation.
-        cancel (Callable[[], None]), A callable that tries to cancel
+        cancel (Callable[[], None]): A callable that tries to cancel
             the operation.
         result_type (type): The protobuf type for the operation's result.
         metadata_type (type): The protobuf type for the operation's
diff --git a/core/google/cloud/iam.py b/core/google/cloud/iam.py
index 49bb11266ceef..bbc31c047a85b 100644
--- a/core/google/cloud/iam.py
+++ b/core/google/cloud/iam.py
@@ -226,14 +226,14 @@ def to_api_repr(self):
         if self.version is not None:
             resource['version'] = self.version
 
-        if len(self._bindings) > 0:
+        if self._bindings:
             bindings = resource['bindings'] = []
             for role, members in sorted(self._bindings.items()):
-                if len(members) > 0:
+                if members:
                     bindings.append(
                         {'role': role, 'members': sorted(set(members))})
 
-            if len(bindings) == 0:
+            if not bindings:
                 del resource['bindings']
 
         return resource
diff --git a/core/google/cloud/iterator.py b/core/google/cloud/iterator.py
index 7bb708e90f09d..742443ddc5f97 100644
--- a/core/google/cloud/iterator.py
+++ b/core/google/cloud/iterator.py
@@ -242,7 +242,8 @@ def _page_iter(self, increment):
                           results per page while an items iterator will want
                           to increment per item.
 
-        Yields :class:`Page` instances.
+        :rtype: :class:`Page`
+        :returns: pages
         """
         page = self._next_page()
         while page is not None:
@@ -387,6 +388,8 @@ def _get_next_page_response(self):
 
         :rtype: dict
         :returns: The parsed JSON response of the next page's contents.
+
+        :raises ValueError: If the HTTP method is not ``GET`` or ``POST``.
         """
         params = self._get_query_params()
         if self._HTTP_METHOD == 'GET':
diff --git a/core/google/cloud/operation.py b/core/google/cloud/operation.py
index 4e700a553e4fd..9f53c595f6582 100644
--- a/core/google/cloud/operation.py
+++ b/core/google/cloud/operation.py
@@ -50,7 +50,7 @@ def register_type(klass, type_url=None):
     :param type_url: (Optional) URL naming the type. If not provided,
                      infers the URL from the type descriptor.
 
-    :raises: ValueError if a registration already exists for the URL.
+    :raises ValueError: if a registration already exists for the URL.
     """
     if type_url is None:
         type_url = _compute_type_url(klass)
@@ -258,7 +258,7 @@ def poll(self):
 
         :rtype: bool
         :returns: A boolean indicating if the current operation has completed.
-        :raises: :class:`~exceptions.ValueError` if the operation
+        :raises ValueError: if the operation
                  has already completed.
         """
         if self.complete:
diff --git a/core/nox.py b/core/nox.py
index c8f4a942e7a24..8f025cce8b61f 100644
--- a/core/nox.py
+++ b/core/nox.py
@@ -50,7 +50,8 @@ def lint(session):
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', 'pylint', 'gcp-devrel-py-tools')
+    session.install(
+        'flake8', 'flake8-import-order', 'pylint', 'gcp-devrel-py-tools')
     session.install('.')
     session.run('flake8', 'google/cloud/core')
     session.run(

From 768d667b6c73f099935dd6f93f6596cdcaffecde Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Sat, 22 Jul 2017 16:39:52 -0700
Subject: [PATCH 110/211] Revert "Fix pylint for the main package" - accidental
 push

This reverts commit d0479d6beb082646f85cafa54a5659fcd9bdbebd.
---
 core/.flake8                          |  1 -
 core/google/__init__.py               |  2 --
 core/google/cloud/__init__.py         |  2 --
 core/google/cloud/_helpers.py         |  5 ++---
 core/google/cloud/_http.py            |  4 +---
 core/google/cloud/_testing.py         | 14 +++++---------
 core/google/cloud/client.py           |  2 +-
 core/google/cloud/future/operation.py |  2 +-
 core/google/cloud/iam.py              |  6 +++---
 core/google/cloud/iterator.py         |  5 +----
 core/google/cloud/operation.py        |  4 ++--
 core/nox.py                           |  3 +--
 12 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/core/.flake8 b/core/.flake8
index 7f4ddb8072b02..25168dc87605d 100644
--- a/core/.flake8
+++ b/core/.flake8
@@ -1,5 +1,4 @@
 [flake8]
-import-order-style=google
 exclude =
   __pycache__,
   .git,
diff --git a/core/google/__init__.py b/core/google/__init__.py
index a35569c36339e..b2b8333738826 100644
--- a/core/google/__init__.py
+++ b/core/google/__init__.py
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Google namespace package."""
-
 try:
     import pkg_resources
     pkg_resources.declare_namespace(__name__)
diff --git a/core/google/cloud/__init__.py b/core/google/cloud/__init__.py
index 59a804265f5c3..b2b8333738826 100644
--- a/core/google/cloud/__init__.py
+++ b/core/google/cloud/__init__.py
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Google Cloud namespace package."""
-
 try:
     import pkg_resources
     pkg_resources.declare_namespace(__name__)
diff --git a/core/google/cloud/_helpers.py b/core/google/cloud/_helpers.py
index 8dc9bf1cf4123..72918e0645071 100644
--- a/core/google/cloud/_helpers.py
+++ b/core/google/cloud/_helpers.py
@@ -17,6 +17,7 @@
 This module is not part of the public API surface.
 """
 
+# Avoid the grpc and google.cloud.grpc collision.
 from __future__ import absolute_import
 
 import calendar
@@ -31,8 +32,6 @@
 import google_auth_httplib2
 
 try:
-    # pylint: disable=ungrouped-imports
-    # We must import google.auth.transport.grpc within this try: catch.
     import grpc
     import google.auth.transport.grpc
 except ImportError:  # pragma: NO COVER
@@ -105,7 +104,7 @@ def top(self):
         :rtype: object
         :returns: the top-most item, or None if the stack is empty.
         """
-        if self._stack:
+        if len(self._stack) > 0:
             return self._stack[-1]
 
 
diff --git a/core/google/cloud/_http.py b/core/google/cloud/_http.py
index ada60b4fb2c3b..e1a481e581a79 100644
--- a/core/google/cloud/_http.py
+++ b/core/google/cloud/_http.py
@@ -279,9 +279,7 @@ def api_request(self, method, path, query_params=None,
             can allow custom behavior, for example, to defer an HTTP request
             and complete initialization of the object at a later time.
 
-        :raises ~google.cloud.exceptions.GoogleCloudError: if the response code
-            is not 200 OK.
-        :raises TypeError: if the response content type is not JSON.
+        :raises: Exception if the response code is not 200 OK.
         :rtype: dict or str
         :returns: The API response payload, either as a raw string or
                   a dictionary if the response is valid JSON.
diff --git a/core/google/cloud/_testing.py b/core/google/cloud/_testing.py
index 871b5f631bc79..a544fffc5fe4a 100644
--- a/core/google/cloud/_testing.py
+++ b/core/google/cloud/_testing.py
@@ -14,15 +14,17 @@
 
 """Shared testing utilities."""
 
+
+# Avoid the grpc and google.cloud.grpc collision.
 from __future__ import absolute_import
 
 
 class _Monkey(object):
-    """Context-manager for replacing module names in the scope of a test."""
+    # context-manager for replacing module names in the scope of a test.
 
     def __init__(self, module, **kw):
         self.module = module
-        if not kw:  # pragma: NO COVER
+        if len(kw) == 0:  # pragma: NO COVER
             raise ValueError('_Monkey was used with nothing to monkey-patch')
         self.to_restore = {key: getattr(module, key) for key in kw}
         for key, value in kw.items():
@@ -66,12 +68,8 @@ def _tempdir_mgr():
     return _tempdir_mgr
 
 
-# pylint: disable=invalid-name
-# Retain _tempdir as a constant for backwards compatibility despite
-# being an invalid name.
 _tempdir = _tempdir_maker()
 del _tempdir_maker
-# pylint: enable=invalid-name
 
 
 class _GAXBaseAPI(object):
@@ -81,8 +79,7 @@ class _GAXBaseAPI(object):
     def __init__(self, **kw):
         self.__dict__.update(kw)
 
-    @staticmethod
-    def _make_grpc_error(status_code, trailing=None):
+    def _make_grpc_error(self, status_code, trailing=None):
         from grpc._channel import _RPCState
         from google.cloud.exceptions import GrpcRendezvous
 
@@ -114,7 +111,6 @@ def __init__(self, *pages, **kwargs):
         self.page_token = kwargs.get('page_token')
 
     def next(self):
-        """Iterate to the next page."""
         import six
         return six.next(self._pages)
 
diff --git a/core/google/cloud/client.py b/core/google/cloud/client.py
index 5fa7f7ef95a28..9bdbf507d2014 100644
--- a/core/google/cloud/client.py
+++ b/core/google/cloud/client.py
@@ -64,7 +64,7 @@ def from_service_account_json(cls, json_credentials_path, *args, **kwargs):
 
         :rtype: :class:`_ClientFactoryMixin`
         :returns: The client created with the retrieved JSON credentials.
-        :raises TypeError: if there is a conflict with the kwargs
+        :raises: :class:`TypeError` if there is a conflict with the kwargs
                  and the credentials created by the factory.
         """
         if 'credentials' in kwargs:
diff --git a/core/google/cloud/future/operation.py b/core/google/cloud/future/operation.py
index 8064e5c13e1f3..5bbfda1a8f0b3 100644
--- a/core/google/cloud/future/operation.py
+++ b/core/google/cloud/future/operation.py
@@ -34,7 +34,7 @@ class Operation(base.PollingFuture):
             initial operation.
         refresh (Callable[[], Operation]): A callable that returns the
             latest state of the operation.
-        cancel (Callable[[], None]): A callable that tries to cancel
+        cancel (Callable[[], None]), A callable that tries to cancel
             the operation.
         result_type (type): The protobuf type for the operation's result.
         metadata_type (type): The protobuf type for the operation's
diff --git a/core/google/cloud/iam.py b/core/google/cloud/iam.py
index bbc31c047a85b..49bb11266ceef 100644
--- a/core/google/cloud/iam.py
+++ b/core/google/cloud/iam.py
@@ -226,14 +226,14 @@ def to_api_repr(self):
         if self.version is not None:
             resource['version'] = self.version
 
-        if self._bindings:
+        if len(self._bindings) > 0:
             bindings = resource['bindings'] = []
             for role, members in sorted(self._bindings.items()):
-                if members:
+                if len(members) > 0:
                     bindings.append(
                         {'role': role, 'members': sorted(set(members))})
 
-            if not bindings:
+            if len(bindings) == 0:
                 del resource['bindings']
 
         return resource
diff --git a/core/google/cloud/iterator.py b/core/google/cloud/iterator.py
index 742443ddc5f97..7bb708e90f09d 100644
--- a/core/google/cloud/iterator.py
+++ b/core/google/cloud/iterator.py
@@ -242,8 +242,7 @@ def _page_iter(self, increment):
                           results per page while an items iterator will want
                           to increment per item.
 
-        :rtype: :class:`Page`
-        :returns: pages
+        Yields :class:`Page` instances.
         """
         page = self._next_page()
         while page is not None:
@@ -388,8 +387,6 @@ def _get_next_page_response(self):
 
         :rtype: dict
         :returns: The parsed JSON response of the next page's contents.
-
-        :raises ValueError: If the HTTP method is not ``GET`` or ``POST``.
         """
         params = self._get_query_params()
         if self._HTTP_METHOD == 'GET':
diff --git a/core/google/cloud/operation.py b/core/google/cloud/operation.py
index 9f53c595f6582..4e700a553e4fd 100644
--- a/core/google/cloud/operation.py
+++ b/core/google/cloud/operation.py
@@ -50,7 +50,7 @@ def register_type(klass, type_url=None):
     :param type_url: (Optional) URL naming the type. If not provided,
                      infers the URL from the type descriptor.
 
-    :raises ValueError: if a registration already exists for the URL.
+    :raises: ValueError if a registration already exists for the URL.
     """
     if type_url is None:
         type_url = _compute_type_url(klass)
@@ -258,7 +258,7 @@ def poll(self):
 
         :rtype: bool
         :returns: A boolean indicating if the current operation has completed.
-        :raises ValueError: if the operation
+        :raises: :class:`~exceptions.ValueError` if the operation
                  has already completed.
         """
         if self.complete:
diff --git a/core/nox.py b/core/nox.py
index 8f025cce8b61f..c8f4a942e7a24 100644
--- a/core/nox.py
+++ b/core/nox.py
@@ -50,8 +50,7 @@ def lint(session):
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install(
-        'flake8', 'flake8-import-order', 'pylint', 'gcp-devrel-py-tools')
+    session.install('flake8', 'pylint', 'gcp-devrel-py-tools')
     session.install('.')
     session.run('flake8', 'google/cloud/core')
     session.run(

From 506a3044660b17e287a5723dc2d90f7284ab2b31 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Mon, 24 Jul 2017 14:08:55 -0700
Subject: [PATCH 111/211] Fix pylint for the main package (#3658)

---
 core/.flake8                          |  1 +
 core/google/__init__.py               |  2 ++
 core/google/cloud/__init__.py         |  2 ++
 core/google/cloud/_helpers.py         |  3 +--
 core/google/cloud/_http.py            |  4 +++-
 core/google/cloud/_testing.py         | 14 +++++++++-----
 core/google/cloud/client.py           |  2 +-
 core/google/cloud/future/operation.py |  2 +-
 core/google/cloud/iam.py              |  6 +++---
 core/google/cloud/iterator.py         |  5 ++++-
 core/google/cloud/operation.py        |  4 ++--
 core/nox.py                           |  3 ++-
 12 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/core/.flake8 b/core/.flake8
index 25168dc87605d..7f4ddb8072b02 100644
--- a/core/.flake8
+++ b/core/.flake8
@@ -1,4 +1,5 @@
 [flake8]
+import-order-style=google
 exclude =
   __pycache__,
   .git,
diff --git a/core/google/__init__.py b/core/google/__init__.py
index b2b8333738826..a35569c36339e 100644
--- a/core/google/__init__.py
+++ b/core/google/__init__.py
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+"""Google namespace package."""
+
 try:
     import pkg_resources
     pkg_resources.declare_namespace(__name__)
diff --git a/core/google/cloud/__init__.py b/core/google/cloud/__init__.py
index b2b8333738826..59a804265f5c3 100644
--- a/core/google/cloud/__init__.py
+++ b/core/google/cloud/__init__.py
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+"""Google Cloud namespace package."""
+
 try:
     import pkg_resources
     pkg_resources.declare_namespace(__name__)
diff --git a/core/google/cloud/_helpers.py b/core/google/cloud/_helpers.py
index 72918e0645071..62bbccf74b150 100644
--- a/core/google/cloud/_helpers.py
+++ b/core/google/cloud/_helpers.py
@@ -17,7 +17,6 @@
 This module is not part of the public API surface.
 """
 
-# Avoid the grpc and google.cloud.grpc collision.
 from __future__ import absolute_import
 
 import calendar
@@ -104,7 +103,7 @@ def top(self):
         :rtype: object
         :returns: the top-most item, or None if the stack is empty.
         """
-        if len(self._stack) > 0:
+        if self._stack:
             return self._stack[-1]
 
 
diff --git a/core/google/cloud/_http.py b/core/google/cloud/_http.py
index e1a481e581a79..ada60b4fb2c3b 100644
--- a/core/google/cloud/_http.py
+++ b/core/google/cloud/_http.py
@@ -279,7 +279,9 @@ def api_request(self, method, path, query_params=None,
             can allow custom behavior, for example, to defer an HTTP request
             and complete initialization of the object at a later time.
 
-        :raises: Exception if the response code is not 200 OK.
+        :raises ~google.cloud.exceptions.GoogleCloudError: if the response code
+            is not 200 OK.
+        :raises TypeError: if the response content type is not JSON.
         :rtype: dict or str
         :returns: The API response payload, either as a raw string or
                   a dictionary if the response is valid JSON.
diff --git a/core/google/cloud/_testing.py b/core/google/cloud/_testing.py
index a544fffc5fe4a..871b5f631bc79 100644
--- a/core/google/cloud/_testing.py
+++ b/core/google/cloud/_testing.py
@@ -14,17 +14,15 @@
 
 """Shared testing utilities."""
 
-
-# Avoid the grpc and google.cloud.grpc collision.
 from __future__ import absolute_import
 
 
 class _Monkey(object):
-    # context-manager for replacing module names in the scope of a test.
+    """Context-manager for replacing module names in the scope of a test."""
 
     def __init__(self, module, **kw):
         self.module = module
-        if len(kw) == 0:  # pragma: NO COVER
+        if not kw:  # pragma: NO COVER
             raise ValueError('_Monkey was used with nothing to monkey-patch')
         self.to_restore = {key: getattr(module, key) for key in kw}
         for key, value in kw.items():
@@ -68,8 +66,12 @@ def _tempdir_mgr():
     return _tempdir_mgr
 
 
+# pylint: disable=invalid-name
+# Retain _tempdir as a constant for backwards compatibility despite
+# being an invalid name.
 _tempdir = _tempdir_maker()
 del _tempdir_maker
+# pylint: enable=invalid-name
 
 
 class _GAXBaseAPI(object):
@@ -79,7 +81,8 @@ class _GAXBaseAPI(object):
     def __init__(self, **kw):
         self.__dict__.update(kw)
 
-    def _make_grpc_error(self, status_code, trailing=None):
+    @staticmethod
+    def _make_grpc_error(status_code, trailing=None):
         from grpc._channel import _RPCState
         from google.cloud.exceptions import GrpcRendezvous
 
@@ -111,6 +114,7 @@ def __init__(self, *pages, **kwargs):
         self.page_token = kwargs.get('page_token')
 
     def next(self):
+        """Iterate to the next page."""
         import six
         return six.next(self._pages)
 
diff --git a/core/google/cloud/client.py b/core/google/cloud/client.py
index 9bdbf507d2014..5fa7f7ef95a28 100644
--- a/core/google/cloud/client.py
+++ b/core/google/cloud/client.py
@@ -64,7 +64,7 @@ def from_service_account_json(cls, json_credentials_path, *args, **kwargs):
 
         :rtype: :class:`_ClientFactoryMixin`
         :returns: The client created with the retrieved JSON credentials.
-        :raises: :class:`TypeError` if there is a conflict with the kwargs
+        :raises TypeError: if there is a conflict with the kwargs
                  and the credentials created by the factory.
         """
         if 'credentials' in kwargs:
diff --git a/core/google/cloud/future/operation.py b/core/google/cloud/future/operation.py
index 5bbfda1a8f0b3..8064e5c13e1f3 100644
--- a/core/google/cloud/future/operation.py
+++ b/core/google/cloud/future/operation.py
@@ -34,7 +34,7 @@ class Operation(base.PollingFuture):
             initial operation.
         refresh (Callable[[], Operation]): A callable that returns the
             latest state of the operation.
-        cancel (Callable[[], None]), A callable that tries to cancel
+        cancel (Callable[[], None]): A callable that tries to cancel
             the operation.
         result_type (type): The protobuf type for the operation's result.
         metadata_type (type): The protobuf type for the operation's
diff --git a/core/google/cloud/iam.py b/core/google/cloud/iam.py
index 49bb11266ceef..bbc31c047a85b 100644
--- a/core/google/cloud/iam.py
+++ b/core/google/cloud/iam.py
@@ -226,14 +226,14 @@ def to_api_repr(self):
         if self.version is not None:
             resource['version'] = self.version
 
-        if len(self._bindings) > 0:
+        if self._bindings:
             bindings = resource['bindings'] = []
             for role, members in sorted(self._bindings.items()):
-                if len(members) > 0:
+                if members:
                     bindings.append(
                         {'role': role, 'members': sorted(set(members))})
 
-            if len(bindings) == 0:
+            if not bindings:
                 del resource['bindings']
 
         return resource
diff --git a/core/google/cloud/iterator.py b/core/google/cloud/iterator.py
index 7bb708e90f09d..742443ddc5f97 100644
--- a/core/google/cloud/iterator.py
+++ b/core/google/cloud/iterator.py
@@ -242,7 +242,8 @@ def _page_iter(self, increment):
                           results per page while an items iterator will want
                           to increment per item.
 
-        Yields :class:`Page` instances.
+        :rtype: :class:`Page`
+        :returns: pages
         """
         page = self._next_page()
         while page is not None:
@@ -387,6 +388,8 @@ def _get_next_page_response(self):
 
         :rtype: dict
         :returns: The parsed JSON response of the next page's contents.
+
+        :raises ValueError: If the HTTP method is not ``GET`` or ``POST``.
         """
         params = self._get_query_params()
         if self._HTTP_METHOD == 'GET':
diff --git a/core/google/cloud/operation.py b/core/google/cloud/operation.py
index 4e700a553e4fd..9f53c595f6582 100644
--- a/core/google/cloud/operation.py
+++ b/core/google/cloud/operation.py
@@ -50,7 +50,7 @@ def register_type(klass, type_url=None):
     :param type_url: (Optional) URL naming the type. If not provided,
                      infers the URL from the type descriptor.
 
-    :raises: ValueError if a registration already exists for the URL.
+    :raises ValueError: if a registration already exists for the URL.
     """
     if type_url is None:
         type_url = _compute_type_url(klass)
@@ -258,7 +258,7 @@ def poll(self):
 
         :rtype: bool
         :returns: A boolean indicating if the current operation has completed.
-        :raises: :class:`~exceptions.ValueError` if the operation
+        :raises ValueError: if the operation
                  has already completed.
         """
         if self.complete:
diff --git a/core/nox.py b/core/nox.py
index c8f4a942e7a24..8f025cce8b61f 100644
--- a/core/nox.py
+++ b/core/nox.py
@@ -50,7 +50,8 @@ def lint(session):
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', 'pylint', 'gcp-devrel-py-tools')
+    session.install(
+        'flake8', 'flake8-import-order', 'pylint', 'gcp-devrel-py-tools')
     session.install('.')
     session.run('flake8', 'google/cloud/core')
     session.run(

From 40a3b4929f3fe9b6568b271900979ca486c083a6 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Mon, 24 Jul 2017 14:17:14 -0700
Subject: [PATCH 112/211] Remove QueryJob.results() (#3661)

---
 .../google/cloud/bigquery/dbapi/_helpers.py   | 21 -----------
 .../google/cloud/bigquery/dbapi/cursor.py     | 10 +++--
 bigquery/google/cloud/bigquery/job.py         | 16 --------
 bigquery/tests/unit/test_dbapi__helpers.py    | 37 -------------------
 bigquery/tests/unit/test_dbapi_cursor.py      | 20 +++++++++-
 bigquery/tests/unit/test_job.py               | 11 ------
 6 files changed, 25 insertions(+), 90 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/dbapi/_helpers.py b/bigquery/google/cloud/bigquery/dbapi/_helpers.py
index 1a9a02fd7cc7d..a9a358cbf0f55 100644
--- a/bigquery/google/cloud/bigquery/dbapi/_helpers.py
+++ b/bigquery/google/cloud/bigquery/dbapi/_helpers.py
@@ -15,7 +15,6 @@
 import collections
 import datetime
 import numbers
-import time
 
 import six
 
@@ -23,26 +22,6 @@
 from google.cloud.bigquery.dbapi import exceptions
 
 
-def wait_for_job(job):
-    """Waits for a job to complete by polling until the state is `DONE`.
-
-    Sleeps 1 second between calls to the BigQuery API.
-
-    :type job: :class:`~google.cloud.bigquery.job._AsyncJob`
-    :param job: Wait for this job to finish.
-
-    :raises: :class:`~google.cloud.bigquery.dbapi.exceptions.DatabaseError`
-        if the job fails.
-    """
-    while True:
-        job.reload()
-        if job.state == 'DONE':
-            if job.error_result:
-                raise exceptions.DatabaseError(job.errors)
-            return
-        time.sleep(1)
-
-
 def scalar_to_query_parameter(value, name=None):
     """Convert a scalar value into a query parameter.
 
diff --git a/bigquery/google/cloud/bigquery/dbapi/cursor.py b/bigquery/google/cloud/bigquery/dbapi/cursor.py
index bcbb19cfd0660..7519c762ae1e5 100644
--- a/bigquery/google/cloud/bigquery/dbapi/cursor.py
+++ b/bigquery/google/cloud/bigquery/dbapi/cursor.py
@@ -21,7 +21,7 @@
 
 from google.cloud.bigquery.dbapi import _helpers
 from google.cloud.bigquery.dbapi import exceptions
-
+import google.cloud.exceptions
 
 # Per PEP 249: A 7-item sequence containing information describing one result
 # column. The first two items (name and type_code) are mandatory, the other
@@ -148,9 +148,11 @@ def execute(self, operation, parameters=None):
             formatted_operation,
             query_parameters=query_parameters)
         query_job.use_legacy_sql = False
-        query_job.begin()
-        _helpers.wait_for_job(query_job)
-        query_results = query_job.results()
+
+        try:
+            query_results = query_job.result()
+        except google.cloud.exceptions.GoogleCloudError:
+            raise exceptions.DatabaseError(query_job.errors)
 
         # Force the iterator to run because the query_results doesn't
         # have the total_rows populated. See:
diff --git a/bigquery/google/cloud/bigquery/job.py b/bigquery/google/cloud/bigquery/job.py
index 35a423b755b97..3e6a9f93418b6 100644
--- a/bigquery/google/cloud/bigquery/job.py
+++ b/bigquery/google/cloud/bigquery/job.py
@@ -16,7 +16,6 @@
 
 import collections
 import threading
-import warnings
 
 import six
 from six.moves import http_client
@@ -1264,21 +1263,6 @@ def query_results(self):
         from google.cloud.bigquery.query import QueryResults
         return QueryResults.from_query_job(self)
 
-    def results(self):
-        """DEPRECATED.
-
-        This method is deprecated. Use :meth:`query_results` or :meth:`result`.
-
-        Construct a QueryResults instance, bound to this job.
-
-        :rtype: :class:`~google.cloud.bigquery.query.QueryResults`
-        :returns: The query results.
-        """
-        warnings.warn(
-            'QueryJob.results() is deprecated. Please use query_results() or '
-            'result().', DeprecationWarning)
-        return self.query_results()
-
     def result(self, timeout=None):
         """Start the job and wait for it to complete and get the result.
 
diff --git a/bigquery/tests/unit/test_dbapi__helpers.py b/bigquery/tests/unit/test_dbapi__helpers.py
index e030ed49df0c4..48bca5ae9a594 100644
--- a/bigquery/tests/unit/test_dbapi__helpers.py
+++ b/bigquery/tests/unit/test_dbapi__helpers.py
@@ -16,48 +16,11 @@
 import math
 import unittest
 
-import mock
-
 import google.cloud._helpers
 from google.cloud.bigquery.dbapi import _helpers
 from google.cloud.bigquery.dbapi import exceptions
 
 
-class Test_wait_for_job(unittest.TestCase):
-
-    def _mock_job(self):
-        from google.cloud.bigquery import job
-        mock_job = mock.create_autospec(job.QueryJob)
-        mock_job.state = 'RUNNING'
-        mock_job._mocked_iterations = 0
-
-        def mock_reload():
-            mock_job._mocked_iterations += 1
-            if mock_job._mocked_iterations >= 2:
-                mock_job.state = 'DONE'
-
-        mock_job.reload.side_effect = mock_reload
-        return mock_job
-
-    def _call_fut(self, job):
-        from google.cloud.bigquery.dbapi._helpers import wait_for_job
-        with mock.patch('time.sleep'):
-            wait_for_job(job)
-
-    def test_wo_error(self):
-        mock_job = self._mock_job()
-        mock_job.error_result = None
-        self._call_fut(mock_job)
-        self.assertEqual('DONE', mock_job.state)
-
-    def test_w_error(self):
-        from google.cloud.bigquery.dbapi import exceptions
-        mock_job = self._mock_job()
-        mock_job.error_result = {'reason': 'invalidQuery'}
-        self.assertRaises(exceptions.DatabaseError, self._call_fut, mock_job)
-        self.assertEqual('DONE', mock_job.state)
-
-
 class TestQueryParameters(unittest.TestCase):
 
     def test_scalar_to_query_parameter(self):
diff --git a/bigquery/tests/unit/test_dbapi_cursor.py b/bigquery/tests/unit/test_dbapi_cursor.py
index 9671a27b8f8f7..2a2ccfd989a63 100644
--- a/bigquery/tests/unit/test_dbapi_cursor.py
+++ b/bigquery/tests/unit/test_dbapi_cursor.py
@@ -42,7 +42,7 @@ def _mock_job(
         mock_job = mock.create_autospec(job.QueryJob)
         mock_job.error_result = None
         mock_job.state = 'DONE'
-        mock_job.results.return_value = self._mock_results(
+        mock_job.result.return_value = self._mock_results(
             rows=rows, schema=schema,
             num_dml_affected_rows=num_dml_affected_rows)
         return mock_job
@@ -219,6 +219,24 @@ def test_execute_w_query(self):
         row = cursor.fetchone()
         self.assertIsNone(row)
 
+    def test_execute_raises_if_result_raises(self):
+        import google.cloud.exceptions
+
+        from google.cloud.bigquery import client
+        from google.cloud.bigquery import job
+        from google.cloud.bigquery.dbapi import connect
+        from google.cloud.bigquery.dbapi import exceptions
+
+        job = mock.create_autospec(job.QueryJob)
+        job.result.side_effect = google.cloud.exceptions.GoogleCloudError('')
+        client = mock.create_autospec(client.Client)
+        client.run_async_query.return_value = job
+        connection = connect(client)
+        cursor = connection.cursor()
+
+        with self.assertRaises(exceptions.DatabaseError):
+            cursor.execute('SELECT 1')
+
     def test_executemany_w_dml(self):
         from google.cloud.bigquery.dbapi import connect
         connection = connect(
diff --git a/bigquery/tests/unit/test_job.py b/bigquery/tests/unit/test_job.py
index 8b9d079df148c..fcb518d9c502f 100644
--- a/bigquery/tests/unit/test_job.py
+++ b/bigquery/tests/unit/test_job.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import copy
-import warnings
 
 from six.moves import http_client
 import unittest
@@ -1560,16 +1559,6 @@ def test_query_results(self):
         self.assertIsInstance(results, QueryResults)
         self.assertIs(results._job, job)
 
-    def test_results_is_deprecated(self):
-        client = _Client(self.PROJECT)
-        job = self._make_one(self.JOB_NAME, self.QUERY, client)
-
-        with warnings.catch_warnings(record=True) as warned:
-            warnings.simplefilter('always')
-            job.results()
-            self.assertEqual(len(warned), 1)
-            self.assertIn('deprecated', str(warned[0]))
-
     def test_result(self):
         from google.cloud.bigquery.query import QueryResults
 

From 1598d5d2d8f5690ce77463bee834bf6721ac846d Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Mon, 24 Jul 2017 15:29:38 -0700
Subject: [PATCH 113/211] Split polling future into its own module (#3662)

---
 bigquery/google/cloud/bigquery/job.py         |   4 +-
 core/google/cloud/future/base.py              | 149 ---------------
 core/google/cloud/future/operation.py         |   4 +-
 core/google/cloud/future/polling.py           | 169 ++++++++++++++++++
 core/tests/unit/future/test_operation.py      |   2 +-
 .../future/{test_base.py => test_polling.py}  |   4 +-
 6 files changed, 176 insertions(+), 156 deletions(-)
 create mode 100644 core/google/cloud/future/polling.py
 rename core/tests/unit/future/{test_base.py => test_polling.py} (97%)

diff --git a/bigquery/google/cloud/bigquery/job.py b/bigquery/google/cloud/bigquery/job.py
index 3e6a9f93418b6..ef5353f9ff14a 100644
--- a/bigquery/google/cloud/bigquery/job.py
+++ b/bigquery/google/cloud/bigquery/job.py
@@ -32,7 +32,7 @@
 from google.cloud.bigquery._helpers import UDFResourcesProperty
 from google.cloud.bigquery._helpers import _EnumProperty
 from google.cloud.bigquery._helpers import _TypedProperty
-import google.cloud.future.base
+import google.cloud.future.polling
 
 _DONE_STATE = 'DONE'
 _STOPPED_REASON = 'stopped'
@@ -141,7 +141,7 @@ class WriteDisposition(_EnumProperty):
     ALLOWED = (WRITE_APPEND, WRITE_TRUNCATE, WRITE_EMPTY)
 
 
-class _AsyncJob(google.cloud.future.base.PollingFuture):
+class _AsyncJob(google.cloud.future.polling.PollingFuture):
     """Base class for asynchronous jobs.
 
     :type name: str
diff --git a/core/google/cloud/future/base.py b/core/google/cloud/future/base.py
index aed1dfd80e5d6..243913640d62c 100644
--- a/core/google/cloud/future/base.py
+++ b/core/google/cloud/future/base.py
@@ -15,14 +15,8 @@
 """Abstract and helper bases for Future implementations."""
 
 import abc
-import concurrent.futures
-import functools
-import operator
 
 import six
-import tenacity
-
-from google.cloud.future import _helpers
 
 
 @six.add_metaclass(abc.ABCMeta)
@@ -71,146 +65,3 @@ def set_result(self, result):
     @abc.abstractmethod
     def set_exception(self, exception):
         raise NotImplementedError()
-
-
-class PollingFuture(Future):
-    """A Future that needs to poll some service to check its status.
-
-    The :meth:`done` method should be implemented by subclasses. The polling
-    behavior will repeatedly call ``done`` until it returns True.
-
-    .. note: Privacy here is intended to prevent the final class from
-    overexposing, not to prevent subclasses from accessing methods.
-    """
-    def __init__(self):
-        super(PollingFuture, self).__init__()
-        self._result = None
-        self._exception = None
-        self._result_set = False
-        """bool: Set to True when the result has been set via set_result or
-        set_exception."""
-        self._polling_thread = None
-        self._done_callbacks = []
-
-    @abc.abstractmethod
-    def done(self):
-        """Checks to see if the operation is complete.
-
-        Returns:
-            bool: True if the operation is complete, False otherwise.
-        """
-        # pylint: disable=redundant-returns-doc, missing-raises-doc
-        raise NotImplementedError()
-
-    def running(self):
-        """True if the operation is currently running."""
-        return not self.done()
-
-    def _blocking_poll(self, timeout=None):
-        """Poll and wait for the Future to be resolved.
-
-        Args:
-            timeout (int): How long to wait for the operation to complete.
-                If None, wait indefinitely.
-        """
-        if self._result_set:
-            return
-
-        retry_on = tenacity.retry_if_result(
-            functools.partial(operator.is_not, True))
-        # Use exponential backoff with jitter.
-        wait_on = (
-            tenacity.wait_exponential(multiplier=1, max=10) +
-            tenacity.wait_random(0, 1))
-
-        if timeout is None:
-            retry = tenacity.retry(retry=retry_on, wait=wait_on)
-        else:
-            retry = tenacity.retry(
-                retry=retry_on,
-                wait=wait_on,
-                stop=tenacity.stop_after_delay(timeout))
-
-        try:
-            retry(self.done)()
-        except tenacity.RetryError as exc:
-            six.raise_from(
-                concurrent.futures.TimeoutError(
-                    'Operation did not complete within the designated '
-                    'timeout.'),
-                exc)
-
-    def result(self, timeout=None):
-        """Get the result of the operation, blocking if necessary.
-
-        Args:
-            timeout (int): How long to wait for the operation to complete.
-                If None, wait indefinitely.
-
-        Returns:
-            google.protobuf.Message: The Operation's result.
-
-        Raises:
-            google.gax.GaxError: If the operation errors or if the timeout is
-                reached before the operation completes.
-        """
-        self._blocking_poll(timeout=timeout)
-
-        if self._exception is not None:
-            # pylint: disable=raising-bad-type
-            # Pylint doesn't recognize that this is valid in this case.
-            raise self._exception
-
-        return self._result
-
-    def exception(self, timeout=None):
-        """Get the exception from the operation, blocking if necessary.
-
-        Args:
-            timeout (int): How long to wait for the operation to complete.
-                If None, wait indefinitely.
-
-        Returns:
-            Optional[google.gax.GaxError]: The operation's error.
-        """
-        self._blocking_poll()
-        return self._exception
-
-    def add_done_callback(self, fn):
-        """Add a callback to be executed when the operation is complete.
-
-        If the operation is not already complete, this will start a helper
-        thread to poll for the status of the operation in the background.
-
-        Args:
-            fn (Callable[Future]): The callback to execute when the operation
-                is complete.
-        """
-        if self._result_set:
-            _helpers.safe_invoke_callback(fn, self)
-            return
-
-        self._done_callbacks.append(fn)
-
-        if self._polling_thread is None:
-            # The polling thread will exit on its own as soon as the operation
-            # is done.
-            self._polling_thread = _helpers.start_daemon_thread(
-                target=self._blocking_poll)
-
-    def _invoke_callbacks(self, *args, **kwargs):
-        """Invoke all done callbacks."""
-        for callback in self._done_callbacks:
-            _helpers.safe_invoke_callback(callback, *args, **kwargs)
-
-    def set_result(self, result):
-        """Set the Future's result."""
-        self._result = result
-        self._result_set = True
-        self._invoke_callbacks(self)
-
-    def set_exception(self, exception):
-        """Set the Future's exception."""
-        self._exception = exception
-        self._result_set = True
-        self._invoke_callbacks(self)
diff --git a/core/google/cloud/future/operation.py b/core/google/cloud/future/operation.py
index 8064e5c13e1f3..21da738ca0ff8 100644
--- a/core/google/cloud/future/operation.py
+++ b/core/google/cloud/future/operation.py
@@ -23,10 +23,10 @@
 
 from google.cloud import _helpers
 from google.cloud import exceptions
-from google.cloud.future import base
+from google.cloud.future import polling
 
 
-class Operation(base.PollingFuture):
+class Operation(polling.PollingFuture):
     """A Future for interacting with a Google API Long-Running Operation.
 
     Args:
diff --git a/core/google/cloud/future/polling.py b/core/google/cloud/future/polling.py
new file mode 100644
index 0000000000000..6b7ae4221f64f
--- /dev/null
+++ b/core/google/cloud/future/polling.py
@@ -0,0 +1,169 @@
+# Copyright 2017, Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Abstract and helper bases for Future implementations."""
+
+import abc
+import concurrent.futures
+import functools
+import operator
+
+import six
+import tenacity
+
+from google.cloud.future import _helpers
+from google.cloud.future import base
+
+
+class PollingFuture(base.Future):
+    """A Future that needs to poll some service to check its status.
+
+    The :meth:`done` method should be implemented by subclasses. The polling
+    behavior will repeatedly call ``done`` until it returns True.
+
+    .. note: Privacy here is intended to prevent the final class from
+    overexposing, not to prevent subclasses from accessing methods.
+    """
+    def __init__(self):
+        super(PollingFuture, self).__init__()
+        self._result = None
+        self._exception = None
+        self._result_set = False
+        """bool: Set to True when the result has been set via set_result or
+        set_exception."""
+        self._polling_thread = None
+        self._done_callbacks = []
+
+    @abc.abstractmethod
+    def done(self):
+        """Checks to see if the operation is complete.
+
+        Returns:
+            bool: True if the operation is complete, False otherwise.
+        """
+        # pylint: disable=redundant-returns-doc, missing-raises-doc
+        raise NotImplementedError()
+
+    def running(self):
+        """True if the operation is currently running."""
+        return not self.done()
+
+    def _blocking_poll(self, timeout=None):
+        """Poll and wait for the Future to be resolved.
+
+        Args:
+            timeout (int): How long to wait for the operation to complete.
+                If None, wait indefinitely.
+        """
+        if self._result_set:
+            return
+
+        retry_on = tenacity.retry_if_result(
+            functools.partial(operator.is_not, True))
+        # Use exponential backoff with jitter.
+        wait_on = (
+            tenacity.wait_exponential(multiplier=1, max=10) +
+            tenacity.wait_random(0, 1))
+
+        if timeout is None:
+            retry = tenacity.retry(retry=retry_on, wait=wait_on)
+        else:
+            retry = tenacity.retry(
+                retry=retry_on,
+                wait=wait_on,
+                stop=tenacity.stop_after_delay(timeout))
+
+        try:
+            retry(self.done)()
+        except tenacity.RetryError as exc:
+            six.raise_from(
+                concurrent.futures.TimeoutError(
+                    'Operation did not complete within the designated '
+                    'timeout.'),
+                exc)
+
+    def result(self, timeout=None):
+        """Get the result of the operation, blocking if necessary.
+
+        Args:
+            timeout (int): How long to wait for the operation to complete.
+                If None, wait indefinitely.
+
+        Returns:
+            google.protobuf.Message: The Operation's result.
+
+        Raises:
+            google.gax.GaxError: If the operation errors or if the timeout is
+                reached before the operation completes.
+        """
+        self._blocking_poll(timeout=timeout)
+
+        if self._exception is not None:
+            # pylint: disable=raising-bad-type
+            # Pylint doesn't recognize that this is valid in this case.
+            raise self._exception
+
+        return self._result
+
+    def exception(self, timeout=None):
+        """Get the exception from the operation, blocking if necessary.
+
+        Args:
+            timeout (int): How long to wait for the operation to complete.
+                If None, wait indefinitely.
+
+        Returns:
+            Optional[google.gax.GaxError]: The operation's error.
+        """
+        self._blocking_poll()
+        return self._exception
+
+    def add_done_callback(self, fn):
+        """Add a callback to be executed when the operation is complete.
+
+        If the operation is not already complete, this will start a helper
+        thread to poll for the status of the operation in the background.
+
+        Args:
+            fn (Callable[Future]): The callback to execute when the operation
+                is complete.
+        """
+        if self._result_set:
+            _helpers.safe_invoke_callback(fn, self)
+            return
+
+        self._done_callbacks.append(fn)
+
+        if self._polling_thread is None:
+            # The polling thread will exit on its own as soon as the operation
+            # is done.
+            self._polling_thread = _helpers.start_daemon_thread(
+                target=self._blocking_poll)
+
+    def _invoke_callbacks(self, *args, **kwargs):
+        """Invoke all done callbacks."""
+        for callback in self._done_callbacks:
+            _helpers.safe_invoke_callback(callback, *args, **kwargs)
+
+    def set_result(self, result):
+        """Set the Future's result."""
+        self._result = result
+        self._result_set = True
+        self._invoke_callbacks(self)
+
+    def set_exception(self, exception):
+        """Set the Future's exception."""
+        self._exception = exception
+        self._result_set = True
+        self._invoke_callbacks(self)
diff --git a/core/tests/unit/future/test_operation.py b/core/tests/unit/future/test_operation.py
index 0e29aa687ee6c..2d281694001a7 100644
--- a/core/tests/unit/future/test_operation.py
+++ b/core/tests/unit/future/test_operation.py
@@ -61,7 +61,7 @@ def make_operation_future(client_operations_responses=None):
 
 
 def test_constructor():
-    future, refresh, cancel = make_operation_future()
+    future, refresh, _ = make_operation_future()
 
     assert future.operation == refresh.responses[0]
     assert future.operation.done is False
diff --git a/core/tests/unit/future/test_base.py b/core/tests/unit/future/test_polling.py
similarity index 97%
rename from core/tests/unit/future/test_base.py
rename to core/tests/unit/future/test_polling.py
index 69a0348e68d95..c8fde1c203850 100644
--- a/core/tests/unit/future/test_base.py
+++ b/core/tests/unit/future/test_polling.py
@@ -19,10 +19,10 @@
 import mock
 import pytest
 
-from google.cloud.future import base
+from google.cloud.future import polling
 
 
-class PollingFutureImpl(base.PollingFuture):
+class PollingFutureImpl(polling.PollingFuture):
     def done(self):
         return False
 

From c5922c6424b82ba44c9e80ec97075ca7267b8346 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Mon, 24 Jul 2017 16:09:58 -0700
Subject: [PATCH 114/211] Re-enable flake8 for core package and tests (#3664)

---
 core/.flake8                          |  3 +++
 core/google/cloud/_helpers.py         | 10 +++++-----
 core/google/cloud/_http.py            |  2 +-
 core/google/cloud/client.py           |  4 ++--
 core/google/cloud/credentials.py      |  6 +++---
 core/google/cloud/exceptions.py       |  5 +++--
 core/google/cloud/future/operation.py |  7 +++----
 core/nox.py                           |  2 +-
 core/tests/unit/test_credentials.py   | 11 +++++------
 core/tests/unit/test_iam.py           |  1 -
 10 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/core/.flake8 b/core/.flake8
index 7f4ddb8072b02..3db9b737d6bc9 100644
--- a/core/.flake8
+++ b/core/.flake8
@@ -1,5 +1,8 @@
 [flake8]
 import-order-style=google
+# Note: this forces all google imports to be in the third group. See
+# https://github.com/PyCQA/flake8-import-order/issues/111
+application-import-names=google
 exclude =
   __pycache__,
   .git,
diff --git a/core/google/cloud/_helpers.py b/core/google/cloud/_helpers.py
index 62bbccf74b150..fdb22ecdf09c4 100644
--- a/core/google/cloud/_helpers.py
+++ b/core/google/cloud/_helpers.py
@@ -25,10 +25,14 @@
 import re
 from threading import local as Local
 
+import google_auth_httplib2
+import httplib2
+import six
+from six.moves import http_client
+
 import google.auth
 from google.protobuf import duration_pb2
 from google.protobuf import timestamp_pb2
-import google_auth_httplib2
 
 try:
     import grpc
@@ -36,10 +40,6 @@
 except ImportError:  # pragma: NO COVER
     grpc = None
 
-import httplib2
-import six
-from six.moves import http_client
-
 
 _NOW = datetime.datetime.utcnow  # To be replaced by tests.
 _RFC3339_MICROS = '%Y-%m-%dT%H:%M:%S.%fZ'
diff --git a/core/google/cloud/_http.py b/core/google/cloud/_http.py
index ada60b4fb2c3b..186d6216e7eb8 100644
--- a/core/google/cloud/_http.py
+++ b/core/google/cloud/_http.py
@@ -16,8 +16,8 @@
 
 import json
 import platform
-from pkg_resources import get_distribution
 
+from pkg_resources import get_distribution
 import six
 from six.moves.urllib.parse import urlencode
 
diff --git a/core/google/cloud/client.py b/core/google/cloud/client.py
index 5fa7f7ef95a28..5906ab5ed1086 100644
--- a/core/google/cloud/client.py
+++ b/core/google/cloud/client.py
@@ -18,13 +18,13 @@
 import json
 from pickle import PicklingError
 
-import google.auth.credentials
-from google.oauth2 import service_account
 import google_auth_httplib2
 import six
 
+import google.auth.credentials
 from google.cloud._helpers import _determine_default_project
 from google.cloud.credentials import get_credentials
+from google.oauth2 import service_account
 
 
 _GOOGLE_AUTH_CREDENTIALS_HELP = (
diff --git a/core/google/cloud/credentials.py b/core/google/cloud/credentials.py
index e5fe30245ea59..29c4a5d310f4f 100644
--- a/core/google/cloud/credentials.py
+++ b/core/google/cloud/credentials.py
@@ -16,15 +16,15 @@
 
 import base64
 import datetime
+
 import six
 from six.moves.urllib.parse import urlencode
 
 import google.auth
 import google.auth.credentials
-
-from google.cloud._helpers import UTC
-from google.cloud._helpers import _NOW
 from google.cloud._helpers import _microseconds_from_datetime
+from google.cloud._helpers import _NOW
+from google.cloud._helpers import UTC
 
 
 def get_credentials():
diff --git a/core/google/cloud/exceptions.py b/core/google/cloud/exceptions.py
index 32080de7ff501..e911980c63284 100644
--- a/core/google/cloud/exceptions.py
+++ b/core/google/cloud/exceptions.py
@@ -22,17 +22,18 @@
 
 import copy
 import json
+
 import six
 
 from google.cloud._helpers import _to_bytes
 
-_HTTP_CODE_TO_EXCEPTION = {}  # populated at end of module
-
 try:
     from grpc._channel import _Rendezvous
 except ImportError:  # pragma: NO COVER
     _Rendezvous = None
 
+_HTTP_CODE_TO_EXCEPTION = {}  # populated at end of module
+
 
 # pylint: disable=invalid-name
 GrpcRendezvous = _Rendezvous
diff --git a/core/google/cloud/future/operation.py b/core/google/cloud/future/operation.py
index 21da738ca0ff8..ec430cd9c55b4 100644
--- a/core/google/cloud/future/operation.py
+++ b/core/google/cloud/future/operation.py
@@ -17,13 +17,12 @@
 import functools
 import threading
 
-from google.longrunning import operations_pb2
-from google.protobuf import json_format
-from google.rpc import code_pb2
-
 from google.cloud import _helpers
 from google.cloud import exceptions
 from google.cloud.future import polling
+from google.longrunning import operations_pb2
+from google.protobuf import json_format
+from google.rpc import code_pb2
 
 
 class Operation(polling.PollingFuture):
diff --git a/core/nox.py b/core/nox.py
index 8f025cce8b61f..48b55332283ea 100644
--- a/core/nox.py
+++ b/core/nox.py
@@ -53,7 +53,7 @@ def lint(session):
     session.install(
         'flake8', 'flake8-import-order', 'pylint', 'gcp-devrel-py-tools')
     session.install('.')
-    session.run('flake8', 'google/cloud/core')
+    session.run('flake8', 'google', 'tests')
     session.run(
         'gcp-devrel-py-tools', 'run-pylint',
         '--config', 'pylint.config.py',
diff --git a/core/tests/unit/test_credentials.py b/core/tests/unit/test_credentials.py
index 53370a0614947..aaffa907dda1c 100644
--- a/core/tests/unit/test_credentials.py
+++ b/core/tests/unit/test_credentials.py
@@ -15,6 +15,7 @@
 import unittest
 
 import mock
+import six
 
 
 class Test_get_credentials(unittest.TestCase):
@@ -169,12 +170,10 @@ def test_w_int(self):
         self.assertEqual(self._call_fut(123), 123)
 
     def test_w_long(self):
-        try:
-            long
-        except NameError:  # pragma: NO COVER Py3K
-            pass
-        else:
-            self.assertEqual(self._call_fut(long(123)), 123)
+        if six.PY3:
+            raise unittest.SkipTest('No long on Python 3')
+
+        self.assertEqual(self._call_fut(long(123)), 123)  # noqa: F821
 
     def test_w_naive_datetime(self):
         import datetime
diff --git a/core/tests/unit/test_iam.py b/core/tests/unit/test_iam.py
index d076edd6eba95..4a17c61ce1734 100644
--- a/core/tests/unit/test_iam.py
+++ b/core/tests/unit/test_iam.py
@@ -200,7 +200,6 @@ def test_from_api_repr_complete(self):
                 {'role': VIEWER_ROLE, 'members': [VIEWER1, VIEWER2]},
             ],
         }
-        empty = frozenset()
         klass = self._get_target_class()
         policy = klass.from_api_repr(RESOURCE)
         self.assertEqual(policy.etag, 'DEADBEEF')

From dd372df41fb0abb349f438118207078d01093cea Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 24 Jul 2017 20:44:03 -0400
Subject: [PATCH 115/211] Add systest for round-trip of NULL INT64. (#3665)

Include NULL values in ARRAY<INT64>.
---
 spanner/tests/system/test_system.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spanner/tests/system/test_system.py b/spanner/tests/system/test_system.py
index e6d73f977e942..b2f83ce9fa1de 100644
--- a/spanner/tests/system/test_system.py
+++ b/spanner/tests/system/test_system.py
@@ -371,10 +371,11 @@ class TestSessionAPI(unittest.TestCase, _TestData):
     BYTES_1 = b'Ymlu'
     BYTES_2 = b'Ym9vdHM='
     ALL_TYPES_ROWDATA = (
+        ([], False, None, None, 0.0, None, None, None),
         ([1], True, BYTES_1, SOME_DATE, 0.0, 19, u'dog', SOME_TIME),
         ([5, 10], True, BYTES_1, None, 1.25, 99, u'cat', None),
         ([], False, BYTES_2, None, float('inf'), 107, u'frog', None),
-        ([], False, None, None, float('-inf'), 207, None, None),
+        ([3, None, 9], False, None, None, float('-inf'), 207, None, None),
         ([], False, None, None, float('nan'), 1207, None, None),
         ([], False, None, None, OTHER_NAN, 2000, None, NANO_TIME),
     )
@@ -903,7 +904,7 @@ def test_execute_sql_w_query_param(self):
             params={'lower': 0.0, 'upper': 1.0},
             param_types={
                 'lower': Type(code=FLOAT64), 'upper': Type(code=FLOAT64)},
-            expected=[(19,)],
+            expected=[(None,), (19,)],
         )
 
         # Find -inf

From 70088aadf2c82b95f1dce7420e1d3c39e5b8323f Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Tue, 25 Jul 2017 10:31:53 -0700
Subject: [PATCH 116/211] Adding getter/setter note for Blob.metadata property.
 (#3647)

Fixes #3645.
---
 storage/google/cloud/storage/blob.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index d03d1364cf400..8d6ec2619ea16 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -1400,6 +1400,11 @@ def metadata(self):
 
         See https://cloud.google.com/storage/docs/json_api/v1/objects
 
+        :setter: Update arbitrary/application specific metadata for the
+                 object.
+        :getter: Retrieve arbitrary/application specific metadata for
+                 the object.
+
         :rtype: dict or ``NoneType``
         :returns: The metadata associated with the blob or ``None`` if the
                   property is not set locally.

From a88a334ab62c79cf5713f543b5751061a7e18e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isra=C3=ABl=20Hall=C3=A9?= <isra17@users.noreply.github.com>
Date: Tue, 25 Jul 2017 14:10:47 -0400
Subject: [PATCH 117/211] Correctly url-encode list parameters (#3657)

---
 core/google/cloud/_http.py    |  2 +-
 core/tests/unit/test__http.py | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/core/google/cloud/_http.py b/core/google/cloud/_http.py
index 186d6216e7eb8..b7c17ca91d6da 100644
--- a/core/google/cloud/_http.py
+++ b/core/google/cloud/_http.py
@@ -135,7 +135,7 @@ def build_api_url(cls, path, query_params=None,
 
         query_params = query_params or {}
         if query_params:
-            url += '?' + urlencode(query_params)
+            url += '?' + urlencode(query_params, doseq=True)
 
         return url
 
diff --git a/core/tests/unit/test__http.py b/core/tests/unit/test__http.py
index 1226042b58591..22df115668118 100644
--- a/core/tests/unit/test__http.py
+++ b/core/tests/unit/test__http.py
@@ -94,12 +94,15 @@ def test_build_api_url_no_extra_query_params(self):
         self.assertEqual(conn.build_api_url('/foo'), URI)
 
     def test_build_api_url_w_extra_query_params(self):
-        from six.moves.urllib.parse import parse_qsl
+        from six.moves.urllib.parse import parse_qs
         from six.moves.urllib.parse import urlsplit
 
         client = object()
         conn = self._make_mock_one(client)
-        uri = conn.build_api_url('/foo', {'bar': 'baz'})
+        uri = conn.build_api_url('/foo', {
+            'bar': 'baz',
+            'qux': ['quux', 'corge']
+        })
 
         scheme, netloc, path, qs, _ = urlsplit(uri)
         self.assertEqual('%s://%s' % (scheme, netloc), conn.API_BASE_URL)
@@ -111,8 +114,9 @@ def test_build_api_url_w_extra_query_params(self):
             'foo',
         ])
         self.assertEqual(path, PATH)
-        parms = dict(parse_qsl(qs))
-        self.assertEqual(parms['bar'], 'baz')
+        parms = dict(parse_qs(qs))
+        self.assertEqual(parms['bar'], ['baz'])
+        self.assertEqual(parms['qux'], ['quux', 'corge'])
 
     def test__make_request_no_data_no_content_type_no_headers(self):
         http = _Http(
@@ -222,7 +226,7 @@ def test_api_request_wo_json_expected(self):
                          b'CONTENT')
 
     def test_api_request_w_query_params(self):
-        from six.moves.urllib.parse import parse_qsl
+        from six.moves.urllib.parse import parse_qs
         from six.moves.urllib.parse import urlsplit
 
         http = _Http(
@@ -231,7 +235,10 @@ def test_api_request_w_query_params(self):
         )
         client = mock.Mock(_http=http, spec=['_http'])
         conn = self._make_mock_one(client)
-        self.assertEqual(conn.api_request('GET', '/', {'foo': 'bar'}), {})
+        self.assertEqual(conn.api_request('GET', '/', {
+            'foo': 'bar',
+            'baz': ['qux', 'quux']
+        }), {})
         self.assertEqual(http._called_with['method'], 'GET')
         uri = http._called_with['uri']
         scheme, netloc, path, qs, _ = urlsplit(uri)
@@ -244,8 +251,9 @@ def test_api_request_w_query_params(self):
             '',
         ])
         self.assertEqual(path, PATH)
-        parms = dict(parse_qsl(qs))
-        self.assertEqual(parms['foo'], 'bar')
+        parms = dict(parse_qs(qs))
+        self.assertEqual(parms['foo'], ['bar'])
+        self.assertEqual(parms['baz'], ['qux', 'quux'])
         self.assertIsNone(http._called_with['body'])
         expected_headers = {
             'Accept-Encoding': 'gzip',

From c3ab2c03d9a73b5824a4444c8a3da66d76b46d37 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Tue, 25 Jul 2017 13:10:24 -0700
Subject: [PATCH 118/211] Moving bytes signing helpers from `core` to
 `storage`. (#3668)

---
 core/google/cloud/credentials.py         | 173 ------------------
 core/tests/unit/test_credentials.py      | 199 --------------------
 storage/google/cloud/storage/_signing.py | 189 +++++++++++++++++++
 storage/google/cloud/storage/blob.py     |   2 +-
 storage/nox.py                           |  12 +-
 storage/tests/unit/test__signing.py      | 222 +++++++++++++++++++++++
 6 files changed, 421 insertions(+), 376 deletions(-)
 create mode 100644 storage/google/cloud/storage/_signing.py
 create mode 100644 storage/tests/unit/test__signing.py

diff --git a/core/google/cloud/credentials.py b/core/google/cloud/credentials.py
index 29c4a5d310f4f..b434cac2f1e7a 100644
--- a/core/google/cloud/credentials.py
+++ b/core/google/cloud/credentials.py
@@ -14,17 +14,7 @@
 
 """A simple wrapper around the OAuth2 credentials library."""
 
-import base64
-import datetime
-
-import six
-from six.moves.urllib.parse import urlencode
-
 import google.auth
-import google.auth.credentials
-from google.cloud._helpers import _microseconds_from_datetime
-from google.cloud._helpers import _NOW
-from google.cloud._helpers import UTC
 
 
 def get_credentials():
@@ -38,166 +28,3 @@ def get_credentials():
     """
     credentials, _ = google.auth.default()
     return credentials
-
-
-def _get_signed_query_params(credentials, expiration, string_to_sign):
-    """Gets query parameters for creating a signed URL.
-
-    :type credentials: :class:`google.auth.credentials.Signer`
-    :param credentials: The credentials used to create a private key
-                        for signing text.
-
-    :type expiration: int or long
-    :param expiration: When the signed URL should expire.
-
-    :type string_to_sign: str
-    :param string_to_sign: The string to be signed by the credentials.
-
-    :raises AttributeError: If :meth: sign_blob is unavailable.
-
-    :rtype: dict
-    :returns: Query parameters matching the signing credentials with a
-              signed payload.
-    """
-    if not isinstance(credentials, google.auth.credentials.Signing):
-        auth_uri = ('https://google-cloud-python.readthedocs.io/en/latest/'
-                    'core/auth.html?highlight=authentication#setting-up-'
-                    'a-service-account')
-        raise AttributeError('you need a private key to sign credentials.'
-                             'the credentials you are currently using %s '
-                             'just contains a token. see %s for more '
-                             'details.' % (type(credentials), auth_uri))
-
-    signature_bytes = credentials.sign_bytes(string_to_sign)
-    signature = base64.b64encode(signature_bytes)
-    service_account_name = credentials.signer_email
-    return {
-        'GoogleAccessId': service_account_name,
-        'Expires': str(expiration),
-        'Signature': signature,
-    }
-
-
-def _get_expiration_seconds(expiration):
-    """Convert 'expiration' to a number of seconds in the future.
-
-    :type expiration: int, long, datetime.datetime, datetime.timedelta
-    :param expiration: When the signed URL should expire.
-
-    :raises TypeError: When expiration is not an integer.
-
-    :rtype: int
-    :returns: a timestamp as an absolute number of seconds.
-    """
-    # If it's a timedelta, add it to `now` in UTC.
-    if isinstance(expiration, datetime.timedelta):
-        now = _NOW().replace(tzinfo=UTC)
-        expiration = now + expiration
-
-    # If it's a datetime, convert to a timestamp.
-    if isinstance(expiration, datetime.datetime):
-        micros = _microseconds_from_datetime(expiration)
-        expiration = micros // 10**6
-
-    if not isinstance(expiration, six.integer_types):
-        raise TypeError('Expected an integer timestamp, datetime, or '
-                        'timedelta. Got %s' % type(expiration))
-    return expiration
-
-
-def generate_signed_url(credentials, resource, expiration,
-                        api_access_endpoint='',
-                        method='GET', content_md5=None,
-                        content_type=None, response_type=None,
-                        response_disposition=None, generation=None):
-    """Generate signed URL to provide query-string auth'n to a resource.
-
-    .. note::
-
-        Assumes ``credentials`` implements the
-        :class:`google.auth.credentials.Signing` interface. Also assumes
-        ``credentials`` has a ``service_account_email`` property which
-        identifies the credentials.
-
-    .. note::
-
-        If you are on Google Compute Engine, you can't generate a signed URL.
-        Follow `Issue 922`_ for updates on this. If you'd like to be able to
-        generate a signed URL from GCE, you can use a standard service account
-        from a JSON file rather than a GCE service account.
-
-    See headers `reference`_ for more details on optional arguments.
-
-    .. _Issue 922: https://github.com/GoogleCloudPlatform/\
-                   google-cloud-python/issues/922
-    .. _reference: https://cloud.google.com/storage/docs/reference-headers
-
-    :type credentials: :class:`google.auth.credentials.Signing`
-    :param credentials: Credentials object with an associated private key to
-                        sign text.
-
-    :type resource: str
-    :param resource: A pointer to a specific resource
-                     (typically, ``/bucket-name/path/to/blob.txt``).
-
-    :type expiration: :class:`int`, :class:`long`, :class:`datetime.datetime`,
-                      :class:`datetime.timedelta`
-    :param expiration: When the signed URL should expire.
-
-    :type api_access_endpoint: str
-    :param api_access_endpoint: Optional URI base. Defaults to empty string.
-
-    :type method: str
-    :param method: The HTTP verb that will be used when requesting the URL.
-                   Defaults to ``'GET'``.
-
-    :type content_md5: str
-    :param content_md5: (Optional) The MD5 hash of the object referenced by
-                        ``resource``.
-
-    :type content_type: str
-    :param content_type: (Optional) The content type of the object referenced
-                         by ``resource``.
-
-    :type response_type: str
-    :param response_type: (Optional) Content type of responses to requests for
-                          the signed URL. Used to over-ride the content type of
-                          the underlying resource.
-
-    :type response_disposition: str
-    :param response_disposition: (Optional) Content disposition of responses to
-                                 requests for the signed URL.
-
-    :type generation: str
-    :param generation: (Optional) A value that indicates which generation of
-                       the resource to fetch.
-
-    :rtype: str
-    :returns: A signed URL you can use to access the resource
-              until expiration.
-    """
-    expiration = _get_expiration_seconds(expiration)
-
-    # Generate the string to sign.
-    string_to_sign = '\n'.join([
-        method,
-        content_md5 or '',
-        content_type or '',
-        str(expiration),
-        resource])
-
-    # Set the right query parameters.
-    query_params = _get_signed_query_params(credentials,
-                                            expiration,
-                                            string_to_sign)
-    if response_type is not None:
-        query_params['response-content-type'] = response_type
-    if response_disposition is not None:
-        query_params['response-content-disposition'] = response_disposition
-    if generation is not None:
-        query_params['generation'] = generation
-
-    # Return the built URL.
-    return '{endpoint}{resource}?{querystring}'.format(
-        endpoint=api_access_endpoint, resource=resource,
-        querystring=urlencode(query_params))
diff --git a/core/tests/unit/test_credentials.py b/core/tests/unit/test_credentials.py
index aaffa907dda1c..3b313c1dc1d65 100644
--- a/core/tests/unit/test_credentials.py
+++ b/core/tests/unit/test_credentials.py
@@ -15,7 +15,6 @@
 import unittest
 
 import mock
-import six
 
 
 class Test_get_credentials(unittest.TestCase):
@@ -33,201 +32,3 @@ def test_it(self):
 
         self.assertIs(found, mock.sentinel.credentials)
         default.assert_called_once_with()
-
-
-class Test_generate_signed_url(unittest.TestCase):
-
-    def _call_fut(self, *args, **kwargs):
-        from google.cloud.credentials import generate_signed_url
-
-        return generate_signed_url(*args, **kwargs)
-
-    def _generate_helper(self, response_type=None, response_disposition=None,
-                         generation=None):
-        import base64
-        from six.moves.urllib.parse import parse_qs
-        from six.moves.urllib.parse import urlsplit
-        import google.auth.credentials
-        from google.cloud._testing import _Monkey
-        from google.cloud import credentials as MUT
-
-        ENDPOINT = 'http://api.example.com'
-        RESOURCE = '/name/path'
-        SIGNED = base64.b64encode(b'DEADBEEF')
-        CREDENTIALS = mock.Mock(spec=google.auth.credentials.Signing)
-        CREDENTIALS.signer_email = 'service@example.com'
-
-        def _get_signed_query_params(*args):
-            credentials, expiration = args[:2]
-            return {
-                'GoogleAccessId': credentials.signer_email,
-                'Expires': str(expiration),
-                'Signature': SIGNED,
-            }
-
-        with _Monkey(MUT, _get_signed_query_params=_get_signed_query_params):
-            url = self._call_fut(CREDENTIALS, RESOURCE, 1000,
-                                 api_access_endpoint=ENDPOINT,
-                                 response_type=response_type,
-                                 response_disposition=response_disposition,
-                                 generation=generation)
-
-        scheme, netloc, path, qs, frag = urlsplit(url)
-        self.assertEqual(scheme, 'http')
-        self.assertEqual(netloc, 'api.example.com')
-        self.assertEqual(path, RESOURCE)
-        params = parse_qs(qs)
-        # In Py3k, parse_qs gives us text values:
-        self.assertEqual(params.pop('Signature'), [SIGNED.decode('ascii')])
-        self.assertEqual(params.pop('Expires'), ['1000'])
-        self.assertEqual(params.pop('GoogleAccessId'),
-                         [CREDENTIALS.signer_email])
-        if response_type is not None:
-            self.assertEqual(params.pop('response-content-type'),
-                             [response_type])
-        if response_disposition is not None:
-            self.assertEqual(params.pop('response-content-disposition'),
-                             [response_disposition])
-        if generation is not None:
-            self.assertEqual(params.pop('generation'), [generation])
-        # Make sure we have checked them all.
-        self.assertEqual(len(params), 0)
-        self.assertEqual(frag, '')
-
-    def test_w_expiration_int(self):
-        self._generate_helper()
-
-    def test_w_custom_fields(self):
-        response_type = 'text/plain'
-        response_disposition = 'attachment; filename=blob.png'
-        generation = '123'
-        self._generate_helper(response_type=response_type,
-                              response_disposition=response_disposition,
-                              generation=generation)
-
-
-class Test_generate_signed_url_exception(unittest.TestCase):
-    def test_with_google_credentials(self):
-        import time
-        import google.auth.credentials
-        from google.cloud.credentials import generate_signed_url
-
-        RESOURCE = '/name/path'
-
-        credentials = mock.Mock(spec=google.auth.credentials.Credentials)
-        expiration = int(time.time() + 5)
-        self.assertRaises(AttributeError, generate_signed_url, credentials,
-                          resource=RESOURCE, expiration=expiration)
-
-
-class Test__get_signed_query_params(unittest.TestCase):
-
-    def _call_fut(self, credentials, expiration, string_to_sign):
-        from google.cloud.credentials import _get_signed_query_params
-
-        return _get_signed_query_params(credentials, expiration,
-                                        string_to_sign)
-
-    def test_it(self):
-        import base64
-        import google.auth.credentials
-
-        SIG_BYTES = b'DEADBEEF'
-        ACCOUNT_NAME = mock.sentinel.service_account_email
-        CREDENTIALS = mock.Mock(spec=google.auth.credentials.Signing)
-        CREDENTIALS.signer_email = ACCOUNT_NAME
-        CREDENTIALS.sign_bytes.return_value = SIG_BYTES
-        EXPIRATION = 100
-        STRING_TO_SIGN = 'dummy_signature'
-        result = self._call_fut(CREDENTIALS, EXPIRATION,
-                                STRING_TO_SIGN)
-
-        self.assertEqual(result, {
-            'GoogleAccessId': ACCOUNT_NAME,
-            'Expires': str(EXPIRATION),
-            'Signature': base64.b64encode(b'DEADBEEF'),
-        })
-        CREDENTIALS.sign_bytes.assert_called_once_with(STRING_TO_SIGN)
-
-
-class Test__get_expiration_seconds(unittest.TestCase):
-
-    def _call_fut(self, expiration):
-        from google.cloud.credentials import _get_expiration_seconds
-
-        return _get_expiration_seconds(expiration)
-
-    def _utc_seconds(self, when):
-        import calendar
-
-        return int(calendar.timegm(when.timetuple()))
-
-    def test_w_invalid(self):
-        self.assertRaises(TypeError, self._call_fut, object())
-        self.assertRaises(TypeError, self._call_fut, None)
-
-    def test_w_int(self):
-        self.assertEqual(self._call_fut(123), 123)
-
-    def test_w_long(self):
-        if six.PY3:
-            raise unittest.SkipTest('No long on Python 3')
-
-        self.assertEqual(self._call_fut(long(123)), 123)  # noqa: F821
-
-    def test_w_naive_datetime(self):
-        import datetime
-
-        expiration_no_tz = datetime.datetime(2004, 8, 19, 0, 0, 0, 0)
-        utc_seconds = self._utc_seconds(expiration_no_tz)
-        self.assertEqual(self._call_fut(expiration_no_tz), utc_seconds)
-
-    def test_w_utc_datetime(self):
-        import datetime
-        from google.cloud._helpers import UTC
-
-        expiration_utc = datetime.datetime(2004, 8, 19, 0, 0, 0, 0, UTC)
-        utc_seconds = self._utc_seconds(expiration_utc)
-        self.assertEqual(self._call_fut(expiration_utc), utc_seconds)
-
-    def test_w_other_zone_datetime(self):
-        import datetime
-        from google.cloud._helpers import _UTC
-
-        class CET(_UTC):
-            _tzname = 'CET'
-            _utcoffset = datetime.timedelta(hours=1)
-
-        zone = CET()
-        expiration_other = datetime.datetime(2004, 8, 19, 0, 0, 0, 0, zone)
-        utc_seconds = self._utc_seconds(expiration_other)
-        cet_seconds = utc_seconds - (60 * 60)  # CET one hour earlier than UTC
-        self.assertEqual(self._call_fut(expiration_other), cet_seconds)
-
-    def test_w_timedelta_seconds(self):
-        import datetime
-        from google.cloud._testing import _Monkey
-        from google.cloud import credentials as MUT
-
-        dummy_utcnow = datetime.datetime(2004, 8, 19, 0, 0, 0, 0)
-        utc_seconds = self._utc_seconds(dummy_utcnow)
-        expiration_as_delta = datetime.timedelta(seconds=10)
-
-        with _Monkey(MUT, _NOW=lambda: dummy_utcnow):
-            result = self._call_fut(expiration_as_delta)
-
-        self.assertEqual(result, utc_seconds + 10)
-
-    def test_w_timedelta_days(self):
-        import datetime
-        from google.cloud._testing import _Monkey
-        from google.cloud import credentials as MUT
-
-        dummy_utcnow = datetime.datetime(2004, 8, 19, 0, 0, 0, 0)
-        utc_seconds = self._utc_seconds(dummy_utcnow)
-        expiration_as_delta = datetime.timedelta(days=1)
-
-        with _Monkey(MUT, _NOW=lambda: dummy_utcnow):
-            result = self._call_fut(expiration_as_delta)
-
-        self.assertEqual(result, utc_seconds + 86400)
diff --git a/storage/google/cloud/storage/_signing.py b/storage/google/cloud/storage/_signing.py
new file mode 100644
index 0000000000000..58e62ac1502dc
--- /dev/null
+++ b/storage/google/cloud/storage/_signing.py
@@ -0,0 +1,189 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import base64
+import datetime
+
+import six
+
+import google.auth.credentials
+from google.cloud import _helpers
+
+
+NOW = datetime.datetime.utcnow  # To be replaced by tests.
+
+
+def get_signed_query_params(credentials, expiration, string_to_sign):
+    """Gets query parameters for creating a signed URL.
+
+    :type credentials: :class:`google.auth.credentials.Signer`
+    :param credentials: The credentials used to create a private key
+                        for signing text.
+
+    :type expiration: int or long
+    :param expiration: When the signed URL should expire.
+
+    :type string_to_sign: str
+    :param string_to_sign: The string to be signed by the credentials.
+
+    :raises AttributeError: If :meth: sign_blob is unavailable.
+
+    :rtype: dict
+    :returns: Query parameters matching the signing credentials with a
+              signed payload.
+    """
+    if not isinstance(credentials, google.auth.credentials.Signing):
+        auth_uri = ('https://google-cloud-python.readthedocs.io/en/latest/'
+                    'core/auth.html?highlight=authentication#setting-up-'
+                    'a-service-account')
+        raise AttributeError('you need a private key to sign credentials.'
+                             'the credentials you are currently using %s '
+                             'just contains a token. see %s for more '
+                             'details.' % (type(credentials), auth_uri))
+
+    signature_bytes = credentials.sign_bytes(string_to_sign)
+    signature = base64.b64encode(signature_bytes)
+    service_account_name = credentials.signer_email
+    return {
+        'GoogleAccessId': service_account_name,
+        'Expires': str(expiration),
+        'Signature': signature,
+    }
+
+
+def get_expiration_seconds(expiration):
+    """Convert 'expiration' to a number of seconds in the future.
+
+    :type expiration: int, long, datetime.datetime, datetime.timedelta
+    :param expiration: When the signed URL should expire.
+
+    :raises TypeError: When expiration is not an integer.
+
+    :rtype: int
+    :returns: a timestamp as an absolute number of seconds.
+    """
+    # If it's a timedelta, add it to `now` in UTC.
+    if isinstance(expiration, datetime.timedelta):
+        now = NOW().replace(tzinfo=_helpers.UTC)
+        expiration = now + expiration
+
+    # If it's a datetime, convert to a timestamp.
+    if isinstance(expiration, datetime.datetime):
+        micros = _helpers._microseconds_from_datetime(expiration)
+        expiration = micros // 10**6
+
+    if not isinstance(expiration, six.integer_types):
+        raise TypeError('Expected an integer timestamp, datetime, or '
+                        'timedelta. Got %s' % type(expiration))
+    return expiration
+
+
+def generate_signed_url(credentials, resource, expiration,
+                        api_access_endpoint='',
+                        method='GET', content_md5=None,
+                        content_type=None, response_type=None,
+                        response_disposition=None, generation=None):
+    """Generate signed URL to provide query-string auth'n to a resource.
+
+    .. note::
+
+        Assumes ``credentials`` implements the
+        :class:`google.auth.credentials.Signing` interface. Also assumes
+        ``credentials`` has a ``service_account_email`` property which
+        identifies the credentials.
+
+    .. note::
+
+        If you are on Google Compute Engine, you can't generate a signed URL.
+        Follow `Issue 922`_ for updates on this. If you'd like to be able to
+        generate a signed URL from GCE, you can use a standard service account
+        from a JSON file rather than a GCE service account.
+
+    See headers `reference`_ for more details on optional arguments.
+
+    .. _Issue 922: https://github.com/GoogleCloudPlatform/\
+                   google-cloud-python/issues/922
+    .. _reference: https://cloud.google.com/storage/docs/reference-headers
+
+    :type credentials: :class:`google.auth.credentials.Signing`
+    :param credentials: Credentials object with an associated private key to
+                        sign text.
+
+    :type resource: str
+    :param resource: A pointer to a specific resource
+                     (typically, ``/bucket-name/path/to/blob.txt``).
+
+    :type expiration: :class:`int`, :class:`long`, :class:`datetime.datetime`,
+                      :class:`datetime.timedelta`
+    :param expiration: When the signed URL should expire.
+
+    :type api_access_endpoint: str
+    :param api_access_endpoint: Optional URI base. Defaults to empty string.
+
+    :type method: str
+    :param method: The HTTP verb that will be used when requesting the URL.
+                   Defaults to ``'GET'``.
+
+    :type content_md5: str
+    :param content_md5: (Optional) The MD5 hash of the object referenced by
+                        ``resource``.
+
+    :type content_type: str
+    :param content_type: (Optional) The content type of the object referenced
+                         by ``resource``.
+
+    :type response_type: str
+    :param response_type: (Optional) Content type of responses to requests for
+                          the signed URL. Used to over-ride the content type of
+                          the underlying resource.
+
+    :type response_disposition: str
+    :param response_disposition: (Optional) Content disposition of responses to
+                                 requests for the signed URL.
+
+    :type generation: str
+    :param generation: (Optional) A value that indicates which generation of
+                       the resource to fetch.
+
+    :rtype: str
+    :returns: A signed URL you can use to access the resource
+              until expiration.
+    """
+    expiration = get_expiration_seconds(expiration)
+
+    # Generate the string to sign.
+    string_to_sign = '\n'.join([
+        method,
+        content_md5 or '',
+        content_type or '',
+        str(expiration),
+        resource,
+    ])
+
+    # Set the right query parameters.
+    query_params = get_signed_query_params(
+        credentials, expiration, string_to_sign)
+
+    if response_type is not None:
+        query_params['response-content-type'] = response_type
+    if response_disposition is not None:
+        query_params['response-content-disposition'] = response_disposition
+    if generation is not None:
+        query_params['generation'] = generation
+
+    # Return the built URL.
+    return '{endpoint}{resource}?{querystring}'.format(
+        endpoint=api_access_endpoint, resource=resource,
+        querystring=six.moves.urllib.parse.urlencode(query_params))
diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index 8d6ec2619ea16..dfefc3c1a4faf 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -47,12 +47,12 @@
 from google.cloud._helpers import _rfc3339_to_datetime
 from google.cloud._helpers import _to_bytes
 from google.cloud._helpers import _bytes_to_unicode
-from google.cloud.credentials import generate_signed_url
 from google.cloud.exceptions import NotFound
 from google.cloud.exceptions import make_exception
 from google.cloud.iam import Policy
 from google.cloud.storage._helpers import _PropertyMixin
 from google.cloud.storage._helpers import _scalar_property
+from google.cloud.storage._signing import generate_signed_url
 from google.cloud.storage.acl import ObjectACL
 
 
diff --git a/storage/nox.py b/storage/nox.py
index 3de8efed3fd9e..18ccf81aaff28 100644
--- a/storage/nox.py
+++ b/storage/nox.py
@@ -39,10 +39,16 @@ def unit_tests(session, python_version):
 
     # Run py.test against the unit tests.
     session.run(
-        'py.test', '--quiet',
-        '--cov=google.cloud.storage', '--cov=tests.unit', '--cov-append',
-        '--cov-config=.coveragerc', '--cov-report=', '--cov-fail-under=97',
+        'py.test',
+        '--quiet',
+        '--cov=google.cloud.storage',
+        '--cov=tests.unit',
+        '--cov-append',
+        '--cov-config=.coveragerc',
+        '--cov-report=',
+        '--cov-fail-under=97',
         'tests/unit',
+        *session.posargs
     )
 
 
diff --git a/storage/tests/unit/test__signing.py b/storage/tests/unit/test__signing.py
new file mode 100644
index 0000000000000..1e2aabb9d25ef
--- /dev/null
+++ b/storage/tests/unit/test__signing.py
@@ -0,0 +1,222 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import base64
+import calendar
+import datetime
+import time
+import unittest
+
+import mock
+import six
+from six.moves import urllib_parse
+
+
+class Test_get_expiration_seconds(unittest.TestCase):
+
+    @staticmethod
+    def _call_fut(expiration):
+        from google.cloud.storage._signing import get_expiration_seconds
+
+        return get_expiration_seconds(expiration)
+
+    @staticmethod
+    def _utc_seconds(when):
+        return int(calendar.timegm(when.timetuple()))
+
+    def test_w_invalid(self):
+        self.assertRaises(TypeError, self._call_fut, object())
+        self.assertRaises(TypeError, self._call_fut, None)
+
+    def test_w_int(self):
+        self.assertEqual(self._call_fut(123), 123)
+
+    def test_w_long(self):
+        if six.PY3:
+            raise unittest.SkipTest('No long on Python 3')
+
+        self.assertEqual(self._call_fut(long(123)), 123)  # noqa: F821
+
+    def test_w_naive_datetime(self):
+        expiration_no_tz = datetime.datetime(2004, 8, 19, 0, 0, 0, 0)
+        utc_seconds = self._utc_seconds(expiration_no_tz)
+        self.assertEqual(self._call_fut(expiration_no_tz), utc_seconds)
+
+    def test_w_utc_datetime(self):
+        from google.cloud._helpers import UTC
+
+        expiration_utc = datetime.datetime(2004, 8, 19, 0, 0, 0, 0, UTC)
+        utc_seconds = self._utc_seconds(expiration_utc)
+        self.assertEqual(self._call_fut(expiration_utc), utc_seconds)
+
+    def test_w_other_zone_datetime(self):
+        from google.cloud._helpers import _UTC
+
+        class CET(_UTC):
+            _tzname = 'CET'
+            _utcoffset = datetime.timedelta(hours=1)
+
+        zone = CET()
+        expiration_other = datetime.datetime(2004, 8, 19, 0, 0, 0, 0, zone)
+        utc_seconds = self._utc_seconds(expiration_other)
+        cet_seconds = utc_seconds - (60 * 60)  # CET one hour earlier than UTC
+        self.assertEqual(self._call_fut(expiration_other), cet_seconds)
+
+    def test_w_timedelta_seconds(self):
+        dummy_utcnow = datetime.datetime(2004, 8, 19, 0, 0, 0, 0)
+        utc_seconds = self._utc_seconds(dummy_utcnow)
+        expiration_as_delta = datetime.timedelta(seconds=10)
+
+        patch = mock.patch(
+            'google.cloud.storage._signing.NOW',
+            return_value=dummy_utcnow)
+        with patch as utcnow:
+            result = self._call_fut(expiration_as_delta)
+
+        self.assertEqual(result, utc_seconds + 10)
+        utcnow.assert_called_once_with()
+
+    def test_w_timedelta_days(self):
+        dummy_utcnow = datetime.datetime(2004, 8, 19, 0, 0, 0, 0)
+        utc_seconds = self._utc_seconds(dummy_utcnow)
+        expiration_as_delta = datetime.timedelta(days=1)
+
+        patch = mock.patch(
+            'google.cloud.storage._signing.NOW',
+            return_value=dummy_utcnow)
+        with patch as utcnow:
+            result = self._call_fut(expiration_as_delta)
+
+        self.assertEqual(result, utc_seconds + 86400)
+        utcnow.assert_called_once_with()
+
+
+class Test_get_signed_query_params(unittest.TestCase):
+
+    @staticmethod
+    def _call_fut(credentials, expiration, string_to_sign):
+        from google.cloud.storage._signing import get_signed_query_params
+
+        return get_signed_query_params(
+            credentials, expiration, string_to_sign)
+
+    def test_it(self):
+        sig_bytes = b'DEADBEEF'
+        account_name = mock.sentinel.service_account_email
+        credentials = _make_credentials(
+            signing=True, signer_email=account_name)
+        credentials.sign_bytes.return_value = sig_bytes
+        expiration = 100
+        string_to_sign = 'dummy_signature'
+        result = self._call_fut(
+            credentials, expiration, string_to_sign)
+
+        expected = {
+            'GoogleAccessId': account_name,
+            'Expires': str(expiration),
+            'Signature': base64.b64encode(sig_bytes),
+        }
+        self.assertEqual(result, expected)
+        credentials.sign_bytes.assert_called_once_with(string_to_sign)
+
+
+class Test_generate_signed_url(unittest.TestCase):
+
+    @staticmethod
+    def _call_fut(*args, **kwargs):
+        from google.cloud.storage._signing import generate_signed_url
+
+        return generate_signed_url(*args, **kwargs)
+
+    def _generate_helper(self, response_type=None, response_disposition=None,
+                         generation=None):
+        endpoint = 'http://api.example.com'
+        resource = '/name/path'
+        credentials = _make_credentials(
+            signing=True, signer_email='service@example.com')
+        credentials.sign_bytes.return_value = b'DEADBEEF'
+        signed = base64.b64encode(credentials.sign_bytes.return_value)
+        signed = signed.decode('ascii')
+
+        expiration = 1000
+        url = self._call_fut(
+            credentials,
+            resource,
+            expiration,
+            api_access_endpoint=endpoint,
+            response_type=response_type,
+            response_disposition=response_disposition,
+            generation=generation,
+        )
+
+        # Check the mock was called.
+        string_to_sign = '\n'.join([
+            'GET',
+            '',
+            '',
+            str(expiration),
+            resource,
+        ])
+        credentials.sign_bytes.assert_called_once_with(string_to_sign)
+
+        scheme, netloc, path, qs, frag = urllib_parse.urlsplit(url)
+        self.assertEqual(scheme, 'http')
+        self.assertEqual(netloc, 'api.example.com')
+        self.assertEqual(path, resource)
+        self.assertEqual(frag, '')
+
+        # Check the URL parameters.
+        params = urllib_parse.parse_qs(qs)
+        expected_params = {
+            'GoogleAccessId': [credentials.signer_email],
+            'Expires': [str(expiration)],
+            'Signature': [signed],
+        }
+        if response_type is not None:
+            expected_params['response-content-type'] = [response_type]
+        if response_disposition is not None:
+            expected_params['response-content-disposition'] = [
+                response_disposition]
+        if generation is not None:
+            expected_params['generation'] = [generation]
+        self.assertEqual(params, expected_params)
+
+    def test_w_expiration_int(self):
+        self._generate_helper()
+
+    def test_w_custom_fields(self):
+        response_type = 'text/plain'
+        response_disposition = 'attachment; filename=blob.png'
+        generation = '123'
+        self._generate_helper(response_type=response_type,
+                              response_disposition=response_disposition,
+                              generation=generation)
+
+    def test_with_google_credentials(self):
+        resource = '/name/path'
+        credentials = _make_credentials()
+        expiration = int(time.time() + 5)
+        self.assertRaises(AttributeError, self._call_fut, credentials,
+                          resource=resource, expiration=expiration)
+
+
+def _make_credentials(signing=False, signer_email=None):
+    import google.auth.credentials
+
+    if signing:
+        credentials = mock.Mock(spec=google.auth.credentials.Signing)
+        credentials.signer_email = signer_email
+        return credentials
+    else:
+        return mock.Mock(spec=google.auth.credentials.Credentials)

From b56e8d4f6cde16abfa668053562cc489bdc149f2 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Tue, 25 Jul 2017 16:51:34 -0400
Subject: [PATCH 119/211] Unbind transaction from session on commit/rollback.
 (#3669)

Closes #3014.
---
 spanner/google/cloud/spanner/session.py     |  2 --
 spanner/google/cloud/spanner/transaction.py |  2 ++
 spanner/tests/unit/test_transaction.py      | 10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/spanner/google/cloud/spanner/session.py b/spanner/google/cloud/spanner/session.py
index 45baffa92d43e..f25abdd6261a2 100644
--- a/spanner/google/cloud/spanner/session.py
+++ b/spanner/google/cloud/spanner/session.py
@@ -302,7 +302,6 @@ def run_in_transaction(self, func, *args, **kw):
                 continue
             except Exception:
                 txn.rollback()
-                del self._transaction
                 raise
 
             try:
@@ -312,7 +311,6 @@ def run_in_transaction(self, func, *args, **kw):
                 del self._transaction
             else:
                 committed = txn.committed
-                del self._transaction
                 return committed
 
 
diff --git a/spanner/google/cloud/spanner/transaction.py b/spanner/google/cloud/spanner/transaction.py
index af21408968305..7c0272d411324 100644
--- a/spanner/google/cloud/spanner/transaction.py
+++ b/spanner/google/cloud/spanner/transaction.py
@@ -93,6 +93,7 @@ def rollback(self):
         options = _options_with_prefix(database.name)
         api.rollback(self._session.name, self._id, options=options)
         self._rolled_back = True
+        del self._session._transaction
 
     def commit(self):
         """Commit mutations to the database.
@@ -114,6 +115,7 @@ def commit(self):
             transaction_id=self._id, options=options)
         self.committed = _pb_timestamp_to_datetime(
             response.commit_timestamp)
+        del self._session._transaction
         return self.committed
 
     def __enter__(self):
diff --git a/spanner/tests/unit/test_transaction.py b/spanner/tests/unit/test_transaction.py
index 997f4d5153c84..973aeedb179da 100644
--- a/spanner/tests/unit/test_transaction.py
+++ b/spanner/tests/unit/test_transaction.py
@@ -42,8 +42,10 @@ def _getTargetClass(self):
 
         return Transaction
 
-    def _make_one(self, *args, **kwargs):
-        return self._getTargetClass()(*args, **kwargs)
+    def _make_one(self, session, *args, **kwargs):
+        transaction = self._getTargetClass()(session, *args, **kwargs)
+        session._transaction = transaction
+        return transaction
 
     def test_ctor_defaults(self):
         session = _Session()
@@ -208,6 +210,7 @@ def test_rollback_ok(self):
         transaction.rollback()
 
         self.assertTrue(transaction._rolled_back)
+        self.assertIsNone(session._transaction)
 
         session_id, txn_id, options = api._rolled_back
         self.assertEqual(session_id, session.name)
@@ -290,6 +293,7 @@ def test_commit_ok(self):
         transaction.commit()
 
         self.assertEqual(transaction.committed, now)
+        self.assertIsNone(session._transaction)
 
         session_id, mutations, txn_id, options = api._committed
         self.assertEqual(session_id, session.name)
@@ -368,6 +372,8 @@ class _Database(object):
 
 class _Session(object):
 
+    _transaction = None
+
     def __init__(self, database=None, name=TestTransaction.SESSION_NAME):
         self._database = database
         self.name = name

From 2083542f3d799a5011fcd4d3092257b958d5511a Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Tue, 25 Jul 2017 14:13:44 -0700
Subject: [PATCH 120/211] Removing `get_credentials()` from `core`. (#3667)

* Removing `get_credentials()` from `core`.

In the process also:

- Slight re-org on `nox.py` config (to pass posargs) for `core`
  and `datastore`
- Getting rid of last usage of `_Monkey` in datastore

This is part of `@jonparrott`'s effort to slim down / stabilize
`core`.

* Removing `google.cloud.credentials` module from docs.
---
 bigtable/google/cloud/bigtable/client.py |  4 +-
 bigtable/tests/unit/test_client.py       | 13 ++--
 core/google/cloud/client.py              |  4 +-
 core/google/cloud/credentials.py         | 30 ---------
 core/nox.py                              | 23 +++++--
 core/tests/unit/test_client.py           | 83 ++++++++++--------------
 core/tests/unit/test_credentials.py      | 34 ----------
 datastore/nox.py                         | 15 +++--
 datastore/tests/unit/test_client.py      | 18 ++---
 datastore/tests/unit/test_query.py       | 23 +++----
 docs/core/modules.rst                    |  7 --
 spanner/google/cloud/spanner/client.py   |  4 +-
 spanner/tests/unit/test_client.py        | 12 ++--
 13 files changed, 95 insertions(+), 175 deletions(-)
 delete mode 100644 core/google/cloud/credentials.py
 delete mode 100644 core/tests/unit/test_credentials.py

diff --git a/bigtable/google/cloud/bigtable/client.py b/bigtable/google/cloud/bigtable/client.py
index 86ee7173c917b..62877371a945a 100644
--- a/bigtable/google/cloud/bigtable/client.py
+++ b/bigtable/google/cloud/bigtable/client.py
@@ -31,6 +31,7 @@
 
 import os
 
+import google.auth
 import google.auth.credentials
 from google.gax.utils import metrics
 from google.longrunning import operations_grpc
@@ -40,7 +41,6 @@
 from google.cloud._http import DEFAULT_USER_AGENT
 from google.cloud.client import _ClientFactoryMixin
 from google.cloud.client import _ClientProjectMixin
-from google.cloud.credentials import get_credentials
 from google.cloud.environment_vars import BIGTABLE_EMULATOR
 
 from google.cloud.bigtable import __version__
@@ -211,7 +211,7 @@ def __init__(self, project=None, credentials=None,
                  read_only=False, admin=False, user_agent=DEFAULT_USER_AGENT):
         _ClientProjectMixin.__init__(self, project=project)
         if credentials is None:
-            credentials = get_credentials()
+            credentials, _ = google.auth.default()
 
         if read_only and admin:
             raise ValueError('A read-only client cannot also perform'
diff --git a/bigtable/tests/unit/test_client.py b/bigtable/tests/unit/test_client.py
index 17656be60c00d..c3ab8d1ed8887 100644
--- a/bigtable/tests/unit/test_client.py
+++ b/bigtable/tests/unit/test_client.py
@@ -360,20 +360,19 @@ def test_constructor_both_admin_and_read_only(self):
                                           read_only=True)
 
     def test_constructor_implicit_credentials(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.bigtable import client as MUT
+        from google.cloud.bigtable.client import DATA_SCOPE
 
         creds = _make_credentials()
-        expected_scopes = [MUT.DATA_SCOPE]
-
-        def mock_get_credentials():
-            return creds
+        expected_scopes = [DATA_SCOPE]
 
-        with _Monkey(MUT, get_credentials=mock_get_credentials):
+        patch = mock.patch(
+            'google.auth.default', return_value=(creds, None))
+        with patch as default:
             self._constructor_test_helper(
                 None, None,
                 expected_creds=creds.with_scopes.return_value)
 
+        default.assert_called_once_with()
         creds.with_scopes.assert_called_once_with(expected_scopes)
 
     def test_constructor_credentials_wo_create_scoped(self):
diff --git a/core/google/cloud/client.py b/core/google/cloud/client.py
index 5906ab5ed1086..468cf9e40a526 100644
--- a/core/google/cloud/client.py
+++ b/core/google/cloud/client.py
@@ -21,9 +21,9 @@
 import google_auth_httplib2
 import six
 
+import google.auth
 import google.auth.credentials
 from google.cloud._helpers import _determine_default_project
-from google.cloud.credentials import get_credentials
 from google.oauth2 import service_account
 
 
@@ -135,7 +135,7 @@ def __init__(self, credentials=None, _http=None):
                     credentials, google.auth.credentials.Credentials)):
             raise ValueError(_GOOGLE_AUTH_CREDENTIALS_HELP)
         if credentials is None and _http is None:
-            credentials = get_credentials()
+            credentials, _ = google.auth.default()
         self._credentials = google.auth.credentials.with_scopes_if_required(
             credentials, self.SCOPE)
         self._http_internal = _http
diff --git a/core/google/cloud/credentials.py b/core/google/cloud/credentials.py
deleted file mode 100644
index b434cac2f1e7a..0000000000000
--- a/core/google/cloud/credentials.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2014 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""A simple wrapper around the OAuth2 credentials library."""
-
-import google.auth
-
-
-def get_credentials():
-    """Gets credentials implicitly from the current environment.
-
-    Uses :func:`google.auth.default()`.
-
-    :rtype: :class:`google.auth.credentials.Credentials`,
-    :returns: A new credentials instance corresponding to the implicit
-              environment.
-    """
-    credentials, _ = google.auth.default()
-    return credentials
diff --git a/core/nox.py b/core/nox.py
index 48b55332283ea..1dca10eb9b694 100644
--- a/core/nox.py
+++ b/core/nox.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from __future__ import absolute_import
+import os
 
 import nox
 
@@ -29,16 +30,26 @@ def unit_tests(session, python_version):
     session.virtualenv_dirname = 'unit-' + python_version
 
     # Install all test dependencies, then install this package in-place.
-    session.install('mock', 'pytest', 'pytest-cov',
-                    'grpcio >= 1.0.2')
+    session.install(
+        'mock',
+        'pytest',
+        'pytest-cov',
+        'grpcio >= 1.0.2',
+    )
     session.install('-e', '.')
 
     # Run py.test against the unit tests.
     session.run(
-        'py.test', '--quiet',
-        '--cov=google.cloud', '--cov=tests.unit', '--cov-append',
-        '--cov-config=.coveragerc', '--cov-report=', '--cov-fail-under=97',
-        'tests/unit',
+        'py.test',
+        '--quiet',
+        '--cov=google.cloud',
+        '--cov=tests.unit',
+        '--cov-append',
+        '--cov-config=.coveragerc',
+        '--cov-report=',
+        '--cov-fail-under=97',
+        os.path.join('tests', 'unit'),
+        *session.posargs
     )
 
 
diff --git a/core/tests/unit/test_client.py b/core/tests/unit/test_client.py
index 14eac68abee32..25667712c69a9 100644
--- a/core/tests/unit/test_client.py
+++ b/core/tests/unit/test_client.py
@@ -59,37 +59,31 @@ def test_unpickleable(self):
         with self.assertRaises(pickle.PicklingError):
             pickle.dumps(client_obj)
 
-    def test_ctor_defaults(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud import client
-
-        CREDENTIALS = _make_credentials()
-        FUNC_CALLS = []
-
-        def mock_get_credentials():
-            FUNC_CALLS.append('get_credentials')
-            return CREDENTIALS
+    def test_constructor_defaults(self):
+        credentials = _make_credentials()
 
-        with _Monkey(client, get_credentials=mock_get_credentials):
+        patch = mock.patch(
+            'google.auth.default', return_value=(credentials, None))
+        with patch as default:
             client_obj = self._make_one()
 
-        self.assertIs(client_obj._credentials, CREDENTIALS)
+        self.assertIs(client_obj._credentials, credentials)
         self.assertIsNone(client_obj._http_internal)
-        self.assertEqual(FUNC_CALLS, ['get_credentials'])
+        default.assert_called_once_with()
 
-    def test_ctor_explicit(self):
-        CREDENTIALS = _make_credentials()
-        HTTP = object()
-        client_obj = self._make_one(credentials=CREDENTIALS, _http=HTTP)
+    def test_constructor_explicit(self):
+        credentials = _make_credentials()
+        http = mock.sentinel.http
+        client_obj = self._make_one(credentials=credentials, _http=http)
 
-        self.assertIs(client_obj._credentials, CREDENTIALS)
-        self.assertIs(client_obj._http_internal, HTTP)
+        self.assertIs(client_obj._credentials, credentials)
+        self.assertIs(client_obj._http_internal, http)
 
-    def test_ctor_bad_credentials(self):
-        CREDENTIALS = object()
+    def test_constructor_bad_credentials(self):
+        credentials = mock.sentinel.credentials
 
         with self.assertRaises(ValueError):
-            self._make_one(credentials=CREDENTIALS)
+            self._make_one(credentials=credentials)
 
     def test_from_service_account_json(self):
         from google.cloud import _helpers
@@ -162,34 +156,27 @@ def _get_target_class():
     def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
-    def test_ctor_defaults(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud import client
-
-        PROJECT = 'PROJECT'
-        CREDENTIALS = _make_credentials()
-        FUNC_CALLS = []
-
-        def mock_determine_proj(project):
-            FUNC_CALLS.append((project, '_determine_default_project'))
-            return PROJECT
+    def test_constructor_defaults(self):
+        credentials = _make_credentials()
+        patch1 = mock.patch(
+            'google.auth.default', return_value=(credentials, None))
 
-        def mock_get_credentials():
-            FUNC_CALLS.append('get_credentials')
-            return CREDENTIALS
+        project = 'prahj-ekt'
+        patch2 = mock.patch(
+            'google.cloud.client._determine_default_project',
+            return_value=project)
 
-        with _Monkey(client, get_credentials=mock_get_credentials,
-                     _determine_default_project=mock_determine_proj):
-            client_obj = self._make_one()
+        with patch1 as default:
+            with patch2 as _determine_default_project:
+                client_obj = self._make_one()
 
-        self.assertEqual(client_obj.project, PROJECT)
-        self.assertIs(client_obj._credentials, CREDENTIALS)
+        self.assertEqual(client_obj.project, project)
+        self.assertIs(client_obj._credentials, credentials)
         self.assertIsNone(client_obj._http_internal)
-        self.assertEqual(
-            FUNC_CALLS,
-            [(None, '_determine_default_project'), 'get_credentials'])
+        default.assert_called_once_with()
+        _determine_default_project.assert_called_once_with(None)
 
-    def test_ctor_missing_project(self):
+    def test_constructor_missing_project(self):
         from google.cloud._testing import _Monkey
         from google.cloud import client
 
@@ -204,7 +191,7 @@ def mock_determine_proj(project):
 
         self.assertEqual(FUNC_CALLS, [(None, '_determine_default_project')])
 
-    def test_ctor_w_invalid_project(self):
+    def test_constructor_w_invalid_project(self):
         CREDENTIALS = _make_credentials()
         HTTP = object()
         with self.assertRaises(ValueError):
@@ -227,11 +214,11 @@ def _explicit_ctor_helper(self, project):
         self.assertIs(client_obj._credentials, CREDENTIALS)
         self.assertIs(client_obj._http_internal, HTTP)
 
-    def test_ctor_explicit_bytes(self):
+    def test_constructor_explicit_bytes(self):
         PROJECT = b'PROJECT'
         self._explicit_ctor_helper(PROJECT)
 
-    def test_ctor_explicit_unicode(self):
+    def test_constructor_explicit_unicode(self):
         PROJECT = u'PROJECT'
         self._explicit_ctor_helper(PROJECT)
 
diff --git a/core/tests/unit/test_credentials.py b/core/tests/unit/test_credentials.py
deleted file mode 100644
index 3b313c1dc1d65..0000000000000
--- a/core/tests/unit/test_credentials.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2014 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import unittest
-
-import mock
-
-
-class Test_get_credentials(unittest.TestCase):
-
-    def _call_fut(self):
-        from google.cloud import credentials
-
-        return credentials.get_credentials()
-
-    def test_it(self):
-        with mock.patch('google.auth.default', autospec=True) as default:
-            default.return_value = (
-                mock.sentinel.credentials, mock.sentinel.project)
-            found = self._call_fut()
-
-        self.assertIs(found, mock.sentinel.credentials)
-        default.assert_called_once_with()
diff --git a/datastore/nox.py b/datastore/nox.py
index 2cf2186aa45a0..f93b02944631b 100644
--- a/datastore/nox.py
+++ b/datastore/nox.py
@@ -38,10 +38,17 @@ def unit_tests(session, python_version):
     session.install('-e', '.')
 
     # Run py.test against the unit tests.
-    session.run('py.test', '--quiet',
-        '--cov=google.cloud.datastore', '--cov=tests.unit', '--cov-append',
-        '--cov-config=.coveragerc', '--cov-report=', '--cov-fail-under=97',
-        'tests/unit',
+    session.run(
+        'py.test',
+        '--quiet',
+        '--cov=google.cloud.datastore',
+        '--cov=tests.unit',
+        '--cov-append',
+        '--cov-config=.coveragerc',
+        '--cov-report=',
+        '--cov-fail-under=97',
+        os.path.join('tests', 'unit'),
+        *session.posargs
     )
 
 
diff --git a/datastore/tests/unit/test_client.py b/datastore/tests/unit/test_client.py
index 9824e06b73ad0..a03bbe8b710fc 100644
--- a/datastore/tests/unit/test_client.py
+++ b/datastore/tests/unit/test_client.py
@@ -148,22 +148,16 @@ def test_constructor_w_implicit_inputs(self):
 
         other = 'other'
         creds = _make_credentials()
-        default_called = []
-
-        def fallback_mock(project):
-            default_called.append(project)
-            return project or other
 
         klass = self._get_target_class()
         patch1 = mock.patch(
             'google.cloud.datastore.client._determine_default_project',
-            new=fallback_mock)
+            return_value=other)
         patch2 = mock.patch(
-            'google.cloud.client.get_credentials',
-            return_value=creds)
+            'google.auth.default', return_value=(creds, None))
 
-        with patch1:
-            with patch2:
+        with patch1 as _determine_default_project:
+            with patch2 as default:
                 client = klass()
 
         self.assertEqual(client.project, other)
@@ -174,7 +168,9 @@ def fallback_mock(project):
 
         self.assertIsNone(client.current_batch)
         self.assertIsNone(client.current_transaction)
-        self.assertEqual(default_called, [None])
+
+        default.assert_called_once_with()
+        _determine_default_project.assert_called_once_with(None)
 
     def test_constructor_w_explicit_inputs(self):
         from google.cloud.datastore.client import _DATASTORE_BASE_URL
diff --git a/datastore/tests/unit/test_query.py b/datastore/tests/unit/test_query.py
index b361ec25a42fa..26c1b6cc0831d 100644
--- a/datastore/tests/unit/test_query.py
+++ b/datastore/tests/unit/test_query.py
@@ -550,21 +550,14 @@ def _call_fut(self, iterator, entity_pb):
         return _item_to_entity(iterator, entity_pb)
 
     def test_it(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.datastore import helpers
-
-        result = object()
-        entities = []
-
-        def mocked(entity_pb):
-            entities.append(entity_pb)
-            return result
-
-        entity_pb = object()
-        with _Monkey(helpers, entity_from_protobuf=mocked):
-            self.assertIs(result, self._call_fut(None, entity_pb))
-
-        self.assertEqual(entities, [entity_pb])
+        entity_pb = mock.sentinel.entity_pb
+        patch = mock.patch(
+            'google.cloud.datastore.helpers.entity_from_protobuf')
+        with patch as entity_from_protobuf:
+            result = self._call_fut(None, entity_pb)
+            self.assertIs(result, entity_from_protobuf.return_value)
+
+        entity_from_protobuf.assert_called_once_with(entity_pb)
 
 
 class Test__pb_from_query(unittest.TestCase):
diff --git a/docs/core/modules.rst b/docs/core/modules.rst
index 195a79c5abb28..a1cdbc456de54 100644
--- a/docs/core/modules.rst
+++ b/docs/core/modules.rst
@@ -9,13 +9,6 @@ Base Client
   :show-inheritance:
   :inherited-members:
 
-Credentials Helpers
-~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: google.cloud.credentials
-  :members:
-  :show-inheritance:
-
 Exceptions
 ~~~~~~~~~~
 
diff --git a/spanner/google/cloud/spanner/client.py b/spanner/google/cloud/spanner/client.py
index 875238aed2bc2..b701b017abb03 100644
--- a/spanner/google/cloud/spanner/client.py
+++ b/spanner/google/cloud/spanner/client.py
@@ -24,6 +24,7 @@
   :class:`~google.cloud.spanner.database.Database`
 """
 
+import google.auth
 import google.auth.credentials
 from google.gax import INITIAL_PAGE
 # pylint: disable=line-too-long
@@ -36,7 +37,6 @@
 from google.cloud._http import DEFAULT_USER_AGENT
 from google.cloud.client import _ClientFactoryMixin
 from google.cloud.client import _ClientProjectMixin
-from google.cloud.credentials import get_credentials
 from google.cloud.iterator import GAXIterator
 from google.cloud.spanner import __version__
 from google.cloud.spanner._helpers import _options_with_prefix
@@ -109,7 +109,7 @@ def __init__(self, project=None, credentials=None,
 
         _ClientProjectMixin.__init__(self, project=project)
         if credentials is None:
-            credentials = get_credentials()
+            credentials, _ = google.auth.default()
 
         scopes = [
             SPANNER_ADMIN_SCOPE,
diff --git a/spanner/tests/unit/test_client.py b/spanner/tests/unit/test_client.py
index c71429c225352..e5e90fd6b7ab1 100644
--- a/spanner/tests/unit/test_client.py
+++ b/spanner/tests/unit/test_client.py
@@ -88,19 +88,17 @@ def test_constructor_custom_user_agent_and_timeout(self):
                                       user_agent=CUSTOM_USER_AGENT)
 
     def test_constructor_implicit_credentials(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.spanner import client as MUT
-
         creds = _make_credentials()
 
-        def mock_get_credentials():
-            return creds
-
-        with _Monkey(MUT, get_credentials=mock_get_credentials):
+        patch = mock.patch(
+            'google.auth.default', return_value=(creds, None))
+        with patch as default:
             self._constructor_test_helper(
                 None, None,
                 expected_creds=creds.with_scopes.return_value)
 
+        default.assert_called_once_with()
+
     def test_constructor_credentials_wo_create_scoped(self):
         creds = _make_credentials()
         expected_scopes = None

From a813160b0e3de635cfba6e5f46099debcd77a08e Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Wed, 26 Jul 2017 11:16:59 -0700
Subject: [PATCH 121/211] NL GAPIC (#3679)

---
 docs/language/client.rst                      |    6 -
 docs/language/document.rst                    |    6 -
 docs/language/gapic/v1/api.rst                |    6 +
 docs/language/gapic/v1/types.rst              |    5 +
 docs/language/gapic/v1beta2/api.rst           |    6 +
 docs/language/gapic/v1beta2/types.rst         |    5 +
 docs/language/responses.rst                   |   37 -
 docs/language/usage.rst                       |  316 +-
 docs/vision/gapic/{ => v1}/api.rst            |    0
 docs/vision/gapic/{ => v1}/types.rst          |    0
 docs/vision/index.rst                         |   12 +-
 language/google/cloud/gapic/__init__.py       |    1 +
 .../google/cloud/gapic/language/__init__.py   |    1 +
 .../cloud/gapic/language/v1/__init__.py       |    0
 .../google/cloud/gapic/language/v1/enums.py   |  516 +++
 .../language/v1/language_service_client.py    |  290 ++
 .../v1/language_service_client_config.json    |   46 +
 .../cloud/gapic/language/v1beta2/__init__.py  |    0
 .../cloud/gapic/language/v1beta2/enums.py     |  516 +++
 .../v1beta2/language_service_client.py        |  326 ++
 .../language_service_client_config.json       |   51 +
 language/google/cloud/language/__init__.py    |   37 +-
 language/google/cloud/language/client.py      |   10 +
 language/google/cloud/language_v1/__init__.py |   30 +
 language/google/cloud/language_v1/types.py    |   30 +
 .../google/cloud/language_v1beta2/__init__.py |   30 +
 .../google/cloud/language_v1beta2/types.py    |   30 +
 language/google/cloud/proto/__init__.py       |    1 +
 .../google/cloud/proto/language/__init__.py   |    1 +
 .../cloud/proto/language/v1/__init__.py       |    1 +
 .../proto/language/v1/language_service_pb2.py | 2647 +++++++++++++++
 .../language/v1/language_service_pb2_grpc.py  |  104 +
 .../cloud/proto/language/v1beta2/__init__.py  |    1 +
 .../language/v1beta2/language_service_pb2.py  | 2843 +++++++++++++++++
 .../v1beta2/language_service_pb2_grpc.py      |  122 +
 language/setup.py                             |   10 +
 .../gapic/v1/language_service_smoke_test.py   |   30 +
 .../v1/test_language_service_client_v1.py     |  232 ++
 .../v1beta2/language_service_smoke_test.py    |   30 +
 .../test_language_service_client_v1beta2.py   |  283 ++
 vision/setup.py                               |    2 +-
 41 files changed, 8391 insertions(+), 229 deletions(-)
 delete mode 100644 docs/language/client.rst
 delete mode 100644 docs/language/document.rst
 create mode 100644 docs/language/gapic/v1/api.rst
 create mode 100644 docs/language/gapic/v1/types.rst
 create mode 100644 docs/language/gapic/v1beta2/api.rst
 create mode 100644 docs/language/gapic/v1beta2/types.rst
 delete mode 100644 docs/language/responses.rst
 rename docs/vision/gapic/{ => v1}/api.rst (100%)
 rename docs/vision/gapic/{ => v1}/types.rst (100%)
 create mode 100644 language/google/cloud/gapic/__init__.py
 create mode 100644 language/google/cloud/gapic/language/__init__.py
 create mode 100644 language/google/cloud/gapic/language/v1/__init__.py
 create mode 100644 language/google/cloud/gapic/language/v1/enums.py
 create mode 100644 language/google/cloud/gapic/language/v1/language_service_client.py
 create mode 100644 language/google/cloud/gapic/language/v1/language_service_client_config.json
 create mode 100644 language/google/cloud/gapic/language/v1beta2/__init__.py
 create mode 100644 language/google/cloud/gapic/language/v1beta2/enums.py
 create mode 100644 language/google/cloud/gapic/language/v1beta2/language_service_client.py
 create mode 100644 language/google/cloud/gapic/language/v1beta2/language_service_client_config.json
 create mode 100644 language/google/cloud/language_v1/__init__.py
 create mode 100644 language/google/cloud/language_v1/types.py
 create mode 100644 language/google/cloud/language_v1beta2/__init__.py
 create mode 100644 language/google/cloud/language_v1beta2/types.py
 create mode 100644 language/google/cloud/proto/__init__.py
 create mode 100644 language/google/cloud/proto/language/__init__.py
 create mode 100644 language/google/cloud/proto/language/v1/__init__.py
 create mode 100644 language/google/cloud/proto/language/v1/language_service_pb2.py
 create mode 100644 language/google/cloud/proto/language/v1/language_service_pb2_grpc.py
 create mode 100644 language/google/cloud/proto/language/v1beta2/__init__.py
 create mode 100644 language/google/cloud/proto/language/v1beta2/language_service_pb2.py
 create mode 100644 language/google/cloud/proto/language/v1beta2/language_service_pb2_grpc.py
 create mode 100644 language/tests/gapic/v1/language_service_smoke_test.py
 create mode 100644 language/tests/gapic/v1/test_language_service_client_v1.py
 create mode 100644 language/tests/gapic/v1beta2/language_service_smoke_test.py
 create mode 100644 language/tests/gapic/v1beta2/test_language_service_client_v1beta2.py

diff --git a/docs/language/client.rst b/docs/language/client.rst
deleted file mode 100644
index 310e7b5bf8289..0000000000000
--- a/docs/language/client.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Natural Language Client
-=======================
-
-.. automodule:: google.cloud.language.client
-  :members:
-  :show-inheritance:
diff --git a/docs/language/document.rst b/docs/language/document.rst
deleted file mode 100644
index e879b11e590a9..0000000000000
--- a/docs/language/document.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Document
-~~~~~~~~
-
-.. automodule:: google.cloud.language.document
-  :members:
-  :show-inheritance:
diff --git a/docs/language/gapic/v1/api.rst b/docs/language/gapic/v1/api.rst
new file mode 100644
index 0000000000000..2c5fd4fd76ea9
--- /dev/null
+++ b/docs/language/gapic/v1/api.rst
@@ -0,0 +1,6 @@
+Natural Language Client API
+===========================
+
+.. automodule:: google.cloud.language_v1
+  :members:
+  :inherited-members:
diff --git a/docs/language/gapic/v1/types.rst b/docs/language/gapic/v1/types.rst
new file mode 100644
index 0000000000000..90d27a4b96fb0
--- /dev/null
+++ b/docs/language/gapic/v1/types.rst
@@ -0,0 +1,5 @@
+Natural Language Client Types
+=============================
+
+.. automodule:: google.cloud.language_v1.types
+  :members:
diff --git a/docs/language/gapic/v1beta2/api.rst b/docs/language/gapic/v1beta2/api.rst
new file mode 100644
index 0000000000000..330d7e6e7a78a
--- /dev/null
+++ b/docs/language/gapic/v1beta2/api.rst
@@ -0,0 +1,6 @@
+Natural Language Beta Client API
+================================
+
+.. automodule:: google.cloud.language_v1beta2
+  :members:
+  :inherited-members:
diff --git a/docs/language/gapic/v1beta2/types.rst b/docs/language/gapic/v1beta2/types.rst
new file mode 100644
index 0000000000000..d9a7eb171f00e
--- /dev/null
+++ b/docs/language/gapic/v1beta2/types.rst
@@ -0,0 +1,5 @@
+Natural Language Beta Client Types
+==================================
+
+.. automodule:: google.cloud.language_v1beta2.types
+  :members:
diff --git a/docs/language/responses.rst b/docs/language/responses.rst
deleted file mode 100644
index 5584cbcdcfab5..0000000000000
--- a/docs/language/responses.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-Natural Language Response Classes
-=================================
-
-Responses
-~~~~~~~~~
-
-.. automodule:: google.cloud.language.api_responses
-  :members:
-  :show-inheritance:
-
-Sentences
-~~~~~~~~~
-
-.. automodule:: google.cloud.language.sentence
-  :members:
-  :show-inheritance:
-
-Entity
-~~~~~~
-
-.. automodule:: google.cloud.language.entity
-  :members:
-  :show-inheritance:
-
-Sentiment
-~~~~~~~~~
-
-.. automodule:: google.cloud.language.sentiment
-  :members:
-  :show-inheritance:
-
-Syntax
-~~~~~~
-
-.. automodule:: google.cloud.language.syntax
-  :members:
-  :show-inheritance:
diff --git a/docs/language/usage.rst b/docs/language/usage.rst
index 2a8c9ddba5894..31d4bb20b95ca 100644
--- a/docs/language/usage.rst
+++ b/docs/language/usage.rst
@@ -1,14 +1,6 @@
 Natural Language
 ================
 
-.. toctree::
-  :maxdepth: 2
-  :hidden:
-
-  client
-  document
-  responses
-
 The `Google Natural Language`_ API can be used to reveal the
 structure and meaning of text via powerful machine
 learning models. You can use it to extract information about
@@ -21,40 +13,43 @@ with your document storage on Google Cloud Storage.
 
 .. _Google Natural Language: https://cloud.google.com/natural-language/docs/getting-started
 
-Client
-------
 
-:class:`~google.cloud.language.client.Client` objects provide a
-means to configure your application. Each instance holds
-an authenticated connection to the Natural Language service.
+********************************
+Authentication and Configuration
+********************************
 
-For an overview of authentication in ``google-cloud-python``, see
-:doc:`/core/auth`.
+- For an overview of authentication in ``google-cloud-python``,
+  see :doc:`/core/auth`.
 
-Assuming your environment is set up as described in that document,
-create an instance of :class:`~google.cloud.language.client.Client`.
+- In addition to any authentication configuration, you should also set the
+  :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd
+  like to interact with. If the :envvar:`GOOGLE_CLOUD_PROJECT` environment
+  variable is not present, the project ID from JSON file credentials is used.
 
-  .. code-block:: python
+  If you are using Google App Engine or Google Compute Engine
+  this will be detected automatically.
 
-     >>> from google.cloud import language
-     >>> client = language.Client()
+- After configuring your environment, create a
+  :class:`~google.cloud.language_v1.LanguageServiceClient`.
 
-By default the ``language`` is ``'en-US'`` and the ``encoding`` is
-UTF-8. To over-ride these values:
+.. code-block:: python
 
-  .. code-block:: python
+     >>> from google.cloud import language
+     >>> client = language.LanguageServiceClient()
 
-     >>> document = client.document_from_text(
-     ...     text_content, language='es', encoding=language.Encoding.UTF16)
+or pass in ``credentials`` explicitly.
 
+.. code-block:: python
+
+     >>> from google.cloud import language
+     >>> client = language.LanguageServiceClient(
+     ...     credentials=creds,
+     ... )
 
-The encoding can be one of
-:attr:`Encoding.UTF8 <google.cloud.language.document.Encoding.UTF8>`,
-:attr:`Encoding.UTF16 <google.cloud.language.document.Encoding.UTF16>`, or
-:attr:`Encoding.UTF32 <google.cloud.language.document.Encoding.UTF32>`.
 
-Methods
--------
+*********
+Documents
+*********
 
 The Google Natural Language API has three supported methods
 
@@ -62,109 +57,90 @@ The Google Natural Language API has three supported methods
 - `analyzeSentiment`_
 - `annotateText`_
 
-and each method uses a `Document`_ for representing text. To
-create a :class:`~google.cloud.language.document.Document`,
+and each method uses a :class:`~.language_v1.types.Document` for representing
+text.
 
   .. code-block:: python
 
-     >>> text_content = (
-     ...     'Google, headquartered in Mountain View, unveiled the '
-     ...     'new Android phone at the Consumer Electronic Show.  '
-     ...     'Sundar Pichai said in his keynote that users love '
-     ...     'their new Android phones.')
-     >>> document = client.document_from_text(text_content)
+      >>> document = language.types.Document(
+      ...     content='Google, headquartered in Mountain View, unveiled the '
+      ...             'new Android phone at the Consumer Electronic Show.  '
+      ...             'Sundar Pichai said in his keynote that users love '
+      ...             'their new Android phones.',
+      ...     language='en',
+      ...     type='PLAIN_TEXT',
+      ... )
 
-By using :meth:`~google.cloud.language.client.Client.document_from_text`,
-the document's type is plain text:
-
-  .. code-block:: python
-
-     >>> document.doc_type == language.Document.PLAIN_TEXT
-     True
 
 The document's language defaults to ``None``, which will cause the API to
 auto-detect the language.
 
-In addition, the
-:meth:`~google.cloud.language.client.Client.document_from_html`,
-factory can be used to created an HTML document. In this
-method and the from text method, the language can be
-over-ridden:
+In addition, you can construct an HTML document:
 
   .. code-block:: python
 
-     >>> html_content = """\
-     ... <html>
-     ...   <head>
-     ...     <title>El Tiempo de las Historias</time>
-     ...           <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-     ...   <body>
-     ...     <p>La vaca salt&oacute; sobre la luna.</p>
-     ...   </body>
-     ... </html>
-     ... """
-     >>> document = client.document_from_html(html_content,
-     ...                                      language='es')
+      >>> html_content = """\
+      ... <html>
+      ...   <head>
+      ...     <title>El Tiempo de las Historias</time>
+      ...           <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
+      ...   <body>
+      ...     <p>La vaca salt&oacute; sobre la luna.</p>
+      ...   </body>
+      ... </html>
+      ... """
+      >>> document = language.types.Document(
+      ...     content=html_content,
+      ...     language='es',
+      ...     type='HTML',
+      ... )
 
 The ``language`` argument can be either ISO-639-1 or BCP-47 language
-codes; at the time, only English, Spanish, and Japanese `are supported`_.
-However, the ``analyzeSentiment`` method `only supports`_ English text.
+codes. The API reference page contains the full list of `supported languages`_.
 
-.. _are supported: https://cloud.google.com/natural-language/docs/
-.. _only supports: https://cloud.google.com/natural-language/docs/reference/rest/v1beta1/documents/analyzeSentiment#body.request_body.FIELDS.document
+.. _supported languages: https://cloud.google.com/natural-language/docs/languages
 
-The document type (``doc_type``) value can be one of
-:attr:`Document.PLAIN_TEXT <google.cloud.language.document.Document.PLAIN_TEXT>` or
-:attr:`Document.HTML <google.cloud.language.document.Document.HTML>`.
 
 In addition to supplying the text / HTML content, a document can refer
-to content stored in `Google Cloud Storage`_. We can use the
-:meth:`~google.cloud.language.client.Client.document_from_url` method:
-
-  .. code-block:: python
-
-     >>> gcs_url = 'gs://my-text-bucket/sentiment-me.txt'
-     >>> document = client.document_from_url(
-     ...     gcs_url, doc_type=language.Document.HTML)
-     >>> document.gcs_url == gcs_url
-     True
-     >>> document.doc_type == language.Document.PLAIN_TEXT
-     True
-
-The document type can be specified with the ``doc_type`` argument:
+to content stored in `Google Cloud Storage`_.
 
   .. code-block:: python
 
-     >>> document = client.document_from_url(
-     ...     gcs_url, doc_type=language.Document.HTML)
+     >>> document = language.types.Document(
+     ...     gcs_content_uri='gs://my-text-bucket/sentiment-me.txt',
+     ...     type=language.enums.HTML,
+     ... )
 
 .. _analyzeEntities: https://cloud.google.com/natural-language/docs/reference/rest/v1beta1/documents/analyzeEntities
 .. _analyzeSentiment: https://cloud.google.com/natural-language/docs/reference/rest/v1beta1/documents/analyzeSentiment
 .. _annotateText: https://cloud.google.com/natural-language/docs/reference/rest/v1beta1/documents/annotateText
-.. _Document: https://cloud.google.com/natural-language/reference/rest/v1beta1/Document
 .. _Google Cloud Storage: https://cloud.google.com/storage/
 
+****************
 Analyze Entities
-----------------
+****************
 
-The :meth:`~google.cloud.language.document.Document.analyze_entities` method
-finds named entities (i.e. proper names) in the text and returns them
-as a :class:`list` of :class:`~google.cloud.language.entity.Entity` objects.
-Each entity has a corresponding type, salience (prominence), associated
-metadata and other properties.
+The :meth:`~.language_v1.LanguageServiceClient.analyze_entities`
+method finds named entities (i.e. proper names) in the text. This method
+returns a :class:`~.language_v1.types.AnalyzeEntitiesResponse`.
 
   .. code-block:: python
 
-     >>> text_content = ("Michelangelo Caravaggio, Italian painter, is "
-     ...                 "known for 'The Calling of Saint Matthew'.")
-     >>> document = client.document_from_text(text_content)
-     >>> entity_response = document.analyze_entities()
-     >>> for entity in entity_response.entities:
+     >>> document = language.types.Document(
+     ...     content='Michelangelo Caravaggio, Italian painter, is '
+     ...             'known for "The Calling of Saint Matthew".',
+     ...     type=language.enums.Type.PLAIN_TEXT,
+     ... )
+     >>> response = client.analyze_entities(
+     ...     document=document,
+     ...     encoding_type='UTF32',
+     ... )
+     >>> for entity in response.entities:
      ...     print('=' * 20)
-     ...     print('         name: %s' % (entity.name,))
-     ...     print('         type: %s' % (entity.entity_type,))
-     ...     print('     metadata: %s' % (entity.metadata,))
-     ...     print('     salience: %s' % (entity.salience,))
+     ...     print('         name: {0}'.format(entity.name))
+     ...     print('         type: {0}'.format(entity.entity_type))
+     ...     print('     metadata: {0}'.format(entity.metadata))
+     ...     print('     salience: {0}'.format(entity.salience))
      ====================
               name: Michelangelo Caravaggio
               type: PERSON
@@ -181,90 +157,84 @@ metadata and other properties.
           metadata: {'wikipedia_url': 'http://en.wikipedia.org/wiki/Caravaggio'}
           salience: 0.038798928
 
+.. note::
+
+  It is recommended to send an ``encoding_type`` argument to Natural
+  Language methods, so they provide useful offsets for the data they return.
+  While the correct value varies by environment, in Python you *usually*
+  want ``UTF32``.
+
+
+*****************
 Analyze Sentiment
------------------
+*****************
 
-The :meth:`~google.cloud.language.document.Document.analyze_sentiment` method
-analyzes the sentiment of the provided text and returns a
-:class:`~google.cloud.language.sentiment.Sentiment`. Currently, this method
-only supports English text.
+The :meth:`~.language_v1.LanguageServiceClient.analyze_sentiment` method
+analyzes the sentiment of the provided text. This method returns a
+:class:`~.language_v1.types.AnalyzeSentimentResponse`.
 
   .. code-block:: python
 
-     >>> text_content = "Jogging isn't very fun."
-     >>> document = client.document_from_text(text_content)
-     >>> sentiment_response = document.analyze_sentiment()
-     >>> sentiment = sentiment_response.sentiment
+     >>> document = language.types.Document(
+     ...     content='Jogging is not very fun.',
+     ...     type='PLAIN_TEXT',
+     ... )
+     >>> response = client.analyze_sentiment(
+     ...     document=document,
+     ...     encoding_type='UTF32',
+     ... )
+     >>> sentiment = response.document_sentiment
      >>> print(sentiment.score)
      -1
      >>> print(sentiment.magnitude)
      0.8
 
+.. note::
+
+  It is recommended to send an ``encoding_type`` argument to Natural
+  Language methods, so they provide useful offsets for the data they return.
+  While the correct value varies by environment, in Python you *usually*
+  want ``UTF32``.
+
+
+*************
 Annotate Text
--------------
+*************
 
-The :meth:`~google.cloud.language.document.Document.annotate_text` method
+The :meth:`~.language_v1.LanguageServiceClient.annotate_text` method
 analyzes a document and is intended for users who are familiar with
-machine learning and need in-depth text features to build upon.
-
-The method returns a named tuple with four entries:
-
-* ``sentences``: A :class:`list` of sentences in the text
-* ``tokens``: A :class:`list` of :class:`~google.cloud.language.syntax.Token`
-  object (e.g. words, punctuation)
-* ``sentiment``: The :class:`~google.cloud.language.sentiment.Sentiment` of
-  the text (as returned by
-  :meth:`~google.cloud.language.document.Document.analyze_sentiment`)
-* ``entities``: :class:`list` of :class:`~google.cloud.language.entity.Entity`
-  objects extracted from the text (as returned by
-  :meth:`~google.cloud.language.document.Document.analyze_entities`)
-
-By default :meth:`~google.cloud.language.document.Document.annotate_text` has
-three arguments ``include_syntax``, ``include_entities`` and
-``include_sentiment`` which are all :data:`True`. However, each of these
-`Features`_ can be selectively turned off by setting the corresponding
-arguments to :data:`False`.
-
-When ``include_syntax=False``, ``sentences`` and ``tokens`` in the
-response is :data:`None`. When ``include_sentiment=False``, ``sentiment`` in
-the response is :data:`None`. When ``include_entities=False``, ``entities`` in
-the response is :data:`None`.
+machine learning and need in-depth text features to build upon. This method
+returns a :class:`~.language_v1.types.AnnotateTextResponse`.
 
-  .. code-block:: python
 
-     >>> text_content = 'The cow jumped over the Moon.'
-     >>> document = client.document_from_text(text_content)
-     >>> annotations = document.annotate_text()
-     >>> # Sentences present if include_syntax=True
-     >>> print(annotations.sentences)
-     ['The cow jumped over the Moon.']
-     >>> # Tokens present if include_syntax=True
-     >>> for token in annotations.tokens:
-     ...     msg = '%11s: %s' % (token.part_of_speech, token.text_content)
-     ...     print(msg)
-      DETERMINER: The
-            NOUN: cow
-            VERB: jumped
-      ADPOSITION: over
-      DETERMINER: the
-            NOUN: Moon
-     PUNCTUATION: .
-     >>> # Sentiment present if include_sentiment=True
-     >>> print(annotations.sentiment.score)
-     1
-     >>> print(annotations.sentiment.magnitude)
-     0.1
-     >>> # Entities present if include_entities=True
-     >>> for entity in annotations.entities:
-     ...     print('=' * 20)
-     ...     print('         name: %s' % (entity.name,))
-     ...     print('         type: %s' % (entity.entity_type,))
-     ...     print('     metadata: %s' % (entity.metadata,))
-     ...     print('     salience: %s' % (entity.salience,))
-     ====================
-              name: Moon
-              type: LOCATION
-          metadata: {'wikipedia_url': 'http://en.wikipedia.org/wiki/Natural_satellite'}
-          salience: 0.11793101
+*************
+API Reference
+*************
+
+This package includes clients for multiple versions of the Natural Language
+API. By default, you will get ``v1``, the latest GA version.
+
+.. toctree::
+  :maxdepth: 2
+
+  gapic/v1/api
+  gapic/v1/types
+
+If you are interested in beta features ahead of the latest GA, you may
+opt-in to the v1.1 beta, which is spelled ``v1beta2``. In order to do this,
+you will want to import from ``google.cloud.language_v1beta2`` in lieu of
+``google.cloud.language``.
+
+An API and type reference is provided for the v1.1 beta also:
+
+.. toctree::
+  :maxdepth: 2
+
+  gapic/v1beta2/api
+  gapic/v1beta2/types
+
+.. note::
 
-.. _Features: https://cloud.google.com/natural-language/docs/reference/rest/v1beta1/documents/annotateText#Features
+  The client for the beta API is provided on a provisional basis. The API
+  surface is subject to change, and it is possible that this client will be
+  deprecated or removed after its features become GA.
diff --git a/docs/vision/gapic/api.rst b/docs/vision/gapic/v1/api.rst
similarity index 100%
rename from docs/vision/gapic/api.rst
rename to docs/vision/gapic/v1/api.rst
diff --git a/docs/vision/gapic/types.rst b/docs/vision/gapic/v1/types.rst
similarity index 100%
rename from docs/vision/gapic/types.rst
rename to docs/vision/gapic/v1/types.rst
diff --git a/docs/vision/index.rst b/docs/vision/index.rst
index b6d6f17aa2d6e..c69240f792bde 100644
--- a/docs/vision/index.rst
+++ b/docs/vision/index.rst
@@ -33,19 +33,21 @@ Authentication and Configuration
   this will be detected automatically.
 
 - After configuring your environment, create a
-  :class:`~google.cloud.vision.client.Client`.
+  :class:`~google.cloud.vision_v1.ImageAnnotatorClient`.
 
 .. code-block:: python
 
      >>> from google.cloud import vision
      >>> client = vision.ImageAnnotatorClient()
 
-or pass in ``credentials`` and ``project`` explicitly.
+or pass in ``credentials`` explicitly.
 
 .. code-block:: python
 
      >>> from google.cloud import vision
-     >>> client = vision.Client(project='my-project', credentials=creds)
+     >>> client = vision.ImageAnnotatorClient(
+     ...     credentials=creds,
+     ... )
 
 
 *****************
@@ -127,5 +129,5 @@ API Reference
 .. toctree::
   :maxdepth: 2
 
-  gapic/api
-  gapic/types
+  gapic/v1/api
+  gapic/v1/types
diff --git a/language/google/cloud/gapic/__init__.py b/language/google/cloud/gapic/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/language/google/cloud/gapic/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/language/google/cloud/gapic/language/__init__.py b/language/google/cloud/gapic/language/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/language/google/cloud/gapic/language/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/language/google/cloud/gapic/language/v1/__init__.py b/language/google/cloud/gapic/language/v1/__init__.py
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/language/google/cloud/gapic/language/v1/enums.py b/language/google/cloud/gapic/language/v1/enums.py
new file mode 100644
index 0000000000000..2b53e4d913bbc
--- /dev/null
+++ b/language/google/cloud/gapic/language/v1/enums.py
@@ -0,0 +1,516 @@
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Wrappers for protocol buffer enum types."""
+
+
+class EncodingType(object):
+    """
+    Represents the text encoding that the caller uses to process the output.
+    Providing an ``EncodingType`` is recommended because the API provides the
+    beginning offsets for various outputs, such as tokens and mentions, and
+    languages that natively use different text encodings may access offsets
+    differently.
+
+    Attributes:
+      NONE (int): If ``EncodingType`` is not specified, encoding-dependent information (such as
+        ``begin_offset``) will be set at ``-1``.
+      UTF8 (int): Encoding-dependent information (such as ``begin_offset``) is calculated based
+        on the UTF-8 encoding of the input. C++ and Go are examples of languages
+        that use this encoding natively.
+      UTF16 (int): Encoding-dependent information (such as ``begin_offset``) is calculated based
+        on the UTF-16 encoding of the input. Java and Javascript are examples of
+        languages that use this encoding natively.
+      UTF32 (int): Encoding-dependent information (such as ``begin_offset``) is calculated based
+        on the UTF-32 encoding of the input. Python is an example of a language
+        that uses this encoding natively.
+    """
+    NONE = 0
+    UTF8 = 1
+    UTF16 = 2
+    UTF32 = 3
+
+
+class Document(object):
+    class Type(object):
+        """
+        The document types enum.
+
+        Attributes:
+          TYPE_UNSPECIFIED (int): The content type is not specified.
+          PLAIN_TEXT (int): Plain text
+          HTML (int): HTML
+        """
+        TYPE_UNSPECIFIED = 0
+        PLAIN_TEXT = 1
+        HTML = 2
+
+
+class Entity(object):
+    class Type(object):
+        """
+        The type of the entity.
+
+        Attributes:
+          UNKNOWN (int): Unknown
+          PERSON (int): Person
+          LOCATION (int): Location
+          ORGANIZATION (int): Organization
+          EVENT (int): Event
+          WORK_OF_ART (int): Work of art
+          CONSUMER_GOOD (int): Consumer goods
+          OTHER (int): Other types
+        """
+        UNKNOWN = 0
+        PERSON = 1
+        LOCATION = 2
+        ORGANIZATION = 3
+        EVENT = 4
+        WORK_OF_ART = 5
+        CONSUMER_GOOD = 6
+        OTHER = 7
+
+
+class PartOfSpeech(object):
+    class Tag(object):
+        """
+        The part of speech tags enum.
+
+        Attributes:
+          UNKNOWN (int): Unknown
+          ADJ (int): Adjective
+          ADP (int): Adposition (preposition and postposition)
+          ADV (int): Adverb
+          CONJ (int): Conjunction
+          DET (int): Determiner
+          NOUN (int): Noun (common and proper)
+          NUM (int): Cardinal number
+          PRON (int): Pronoun
+          PRT (int): Particle or other function word
+          PUNCT (int): Punctuation
+          VERB (int): Verb (all tenses and modes)
+          X (int): Other: foreign words, typos, abbreviations
+          AFFIX (int): Affix
+        """
+        UNKNOWN = 0
+        ADJ = 1
+        ADP = 2
+        ADV = 3
+        CONJ = 4
+        DET = 5
+        NOUN = 6
+        NUM = 7
+        PRON = 8
+        PRT = 9
+        PUNCT = 10
+        VERB = 11
+        X = 12
+        AFFIX = 13
+
+    class Aspect(object):
+        """
+        The characteristic of a verb that expresses time flow during an event.
+
+        Attributes:
+          ASPECT_UNKNOWN (int): Aspect is not applicable in the analyzed language or is not predicted.
+          PERFECTIVE (int): Perfective
+          IMPERFECTIVE (int): Imperfective
+          PROGRESSIVE (int): Progressive
+        """
+        ASPECT_UNKNOWN = 0
+        PERFECTIVE = 1
+        IMPERFECTIVE = 2
+        PROGRESSIVE = 3
+
+    class Case(object):
+        """
+        The grammatical function performed by a noun or pronoun in a phrase,
+        clause, or sentence. In some languages, other parts of speech, such as
+        adjective and determiner, take case inflection in agreement with the noun.
+
+        Attributes:
+          CASE_UNKNOWN (int): Case is not applicable in the analyzed language or is not predicted.
+          ACCUSATIVE (int): Accusative
+          ADVERBIAL (int): Adverbial
+          COMPLEMENTIVE (int): Complementive
+          DATIVE (int): Dative
+          GENITIVE (int): Genitive
+          INSTRUMENTAL (int): Instrumental
+          LOCATIVE (int): Locative
+          NOMINATIVE (int): Nominative
+          OBLIQUE (int): Oblique
+          PARTITIVE (int): Partitive
+          PREPOSITIONAL (int): Prepositional
+          REFLEXIVE_CASE (int): Reflexive
+          RELATIVE_CASE (int): Relative
+          VOCATIVE (int): Vocative
+        """
+        CASE_UNKNOWN = 0
+        ACCUSATIVE = 1
+        ADVERBIAL = 2
+        COMPLEMENTIVE = 3
+        DATIVE = 4
+        GENITIVE = 5
+        INSTRUMENTAL = 6
+        LOCATIVE = 7
+        NOMINATIVE = 8
+        OBLIQUE = 9
+        PARTITIVE = 10
+        PREPOSITIONAL = 11
+        REFLEXIVE_CASE = 12
+        RELATIVE_CASE = 13
+        VOCATIVE = 14
+
+    class Form(object):
+        """
+        Depending on the language, Form can be categorizing different forms of
+        verbs, adjectives, adverbs, etc. For example, categorizing inflected
+        endings of verbs and adjectives or distinguishing between short and long
+        forms of adjectives and participles
+
+        Attributes:
+          FORM_UNKNOWN (int): Form is not applicable in the analyzed language or is not predicted.
+          ADNOMIAL (int): Adnomial
+          AUXILIARY (int): Auxiliary
+          COMPLEMENTIZER (int): Complementizer
+          FINAL_ENDING (int): Final ending
+          GERUND (int): Gerund
+          REALIS (int): Realis
+          IRREALIS (int): Irrealis
+          SHORT (int): Short form
+          LONG (int): Long form
+          ORDER (int): Order form
+          SPECIFIC (int): Specific form
+        """
+        FORM_UNKNOWN = 0
+        ADNOMIAL = 1
+        AUXILIARY = 2
+        COMPLEMENTIZER = 3
+        FINAL_ENDING = 4
+        GERUND = 5
+        REALIS = 6
+        IRREALIS = 7
+        SHORT = 8
+        LONG = 9
+        ORDER = 10
+        SPECIFIC = 11
+
+    class Gender(object):
+        """
+        Gender classes of nouns reflected in the behaviour of associated words.
+
+        Attributes:
+          GENDER_UNKNOWN (int): Gender is not applicable in the analyzed language or is not predicted.
+          FEMININE (int): Feminine
+          MASCULINE (int): Masculine
+          NEUTER (int): Neuter
+        """
+        GENDER_UNKNOWN = 0
+        FEMININE = 1
+        MASCULINE = 2
+        NEUTER = 3
+
+    class Mood(object):
+        """
+        The grammatical feature of verbs, used for showing modality and attitude.
+
+        Attributes:
+          MOOD_UNKNOWN (int): Mood is not applicable in the analyzed language or is not predicted.
+          CONDITIONAL_MOOD (int): Conditional
+          IMPERATIVE (int): Imperative
+          INDICATIVE (int): Indicative
+          INTERROGATIVE (int): Interrogative
+          JUSSIVE (int): Jussive
+          SUBJUNCTIVE (int): Subjunctive
+        """
+        MOOD_UNKNOWN = 0
+        CONDITIONAL_MOOD = 1
+        IMPERATIVE = 2
+        INDICATIVE = 3
+        INTERROGATIVE = 4
+        JUSSIVE = 5
+        SUBJUNCTIVE = 6
+
+    class Number(object):
+        """
+        Count distinctions.
+
+        Attributes:
+          NUMBER_UNKNOWN (int): Number is not applicable in the analyzed language or is not predicted.
+          SINGULAR (int): Singular
+          PLURAL (int): Plural
+          DUAL (int): Dual
+        """
+        NUMBER_UNKNOWN = 0
+        SINGULAR = 1
+        PLURAL = 2
+        DUAL = 3
+
+    class Person(object):
+        """
+        The distinction between the speaker, second person, third person, etc.
+
+        Attributes:
+          PERSON_UNKNOWN (int): Person is not applicable in the analyzed language or is not predicted.
+          FIRST (int): First
+          SECOND (int): Second
+          THIRD (int): Third
+          REFLEXIVE_PERSON (int): Reflexive
+        """
+        PERSON_UNKNOWN = 0
+        FIRST = 1
+        SECOND = 2
+        THIRD = 3
+        REFLEXIVE_PERSON = 4
+
+    class Proper(object):
+        """
+        This category shows if the token is part of a proper name.
+
+        Attributes:
+          PROPER_UNKNOWN (int): Proper is not applicable in the analyzed language or is not predicted.
+          PROPER (int): Proper
+          NOT_PROPER (int): Not proper
+        """
+        PROPER_UNKNOWN = 0
+        PROPER = 1
+        NOT_PROPER = 2
+
+    class Reciprocity(object):
+        """
+        Reciprocal features of a pronoun.
+
+        Attributes:
+          RECIPROCITY_UNKNOWN (int): Reciprocity is not applicable in the analyzed language or is not
+            predicted.
+          RECIPROCAL (int): Reciprocal
+          NON_RECIPROCAL (int): Non-reciprocal
+        """
+        RECIPROCITY_UNKNOWN = 0
+        RECIPROCAL = 1
+        NON_RECIPROCAL = 2
+
+    class Tense(object):
+        """
+        Time reference.
+
+        Attributes:
+          TENSE_UNKNOWN (int): Tense is not applicable in the analyzed language or is not predicted.
+          CONDITIONAL_TENSE (int): Conditional
+          FUTURE (int): Future
+          PAST (int): Past
+          PRESENT (int): Present
+          IMPERFECT (int): Imperfect
+          PLUPERFECT (int): Pluperfect
+        """
+        TENSE_UNKNOWN = 0
+        CONDITIONAL_TENSE = 1
+        FUTURE = 2
+        PAST = 3
+        PRESENT = 4
+        IMPERFECT = 5
+        PLUPERFECT = 6
+
+    class Voice(object):
+        """
+        The relationship between the action that a verb expresses and the
+        participants identified by its arguments.
+
+        Attributes:
+          VOICE_UNKNOWN (int): Voice is not applicable in the analyzed language or is not predicted.
+          ACTIVE (int): Active
+          CAUSATIVE (int): Causative
+          PASSIVE (int): Passive
+        """
+        VOICE_UNKNOWN = 0
+        ACTIVE = 1
+        CAUSATIVE = 2
+        PASSIVE = 3
+
+
+class DependencyEdge(object):
+    class Label(object):
+        """
+        The parse label enum for the token.
+
+        Attributes:
+          UNKNOWN (int): Unknown
+          ABBREV (int): Abbreviation modifier
+          ACOMP (int): Adjectival complement
+          ADVCL (int): Adverbial clause modifier
+          ADVMOD (int): Adverbial modifier
+          AMOD (int): Adjectival modifier of an NP
+          APPOS (int): Appositional modifier of an NP
+          ATTR (int): Attribute dependent of a copular verb
+          AUX (int): Auxiliary (non-main) verb
+          AUXPASS (int): Passive auxiliary
+          CC (int): Coordinating conjunction
+          CCOMP (int): Clausal complement of a verb or adjective
+          CONJ (int): Conjunct
+          CSUBJ (int): Clausal subject
+          CSUBJPASS (int): Clausal passive subject
+          DEP (int): Dependency (unable to determine)
+          DET (int): Determiner
+          DISCOURSE (int): Discourse
+          DOBJ (int): Direct object
+          EXPL (int): Expletive
+          GOESWITH (int): Goes with (part of a word in a text not well edited)
+          IOBJ (int): Indirect object
+          MARK (int): Marker (word introducing a subordinate clause)
+          MWE (int): Multi-word expression
+          MWV (int): Multi-word verbal expression
+          NEG (int): Negation modifier
+          NN (int): Noun compound modifier
+          NPADVMOD (int): Noun phrase used as an adverbial modifier
+          NSUBJ (int): Nominal subject
+          NSUBJPASS (int): Passive nominal subject
+          NUM (int): Numeric modifier of a noun
+          NUMBER (int): Element of compound number
+          P (int): Punctuation mark
+          PARATAXIS (int): Parataxis relation
+          PARTMOD (int): Participial modifier
+          PCOMP (int): The complement of a preposition is a clause
+          POBJ (int): Object of a preposition
+          POSS (int): Possession modifier
+          POSTNEG (int): Postverbal negative particle
+          PRECOMP (int): Predicate complement
+          PRECONJ (int): Preconjunt
+          PREDET (int): Predeterminer
+          PREF (int): Prefix
+          PREP (int): Prepositional modifier
+          PRONL (int): The relationship between a verb and verbal morpheme
+          PRT (int): Particle
+          PS (int): Associative or possessive marker
+          QUANTMOD (int): Quantifier phrase modifier
+          RCMOD (int): Relative clause modifier
+          RCMODREL (int): Complementizer in relative clause
+          RDROP (int): Ellipsis without a preceding predicate
+          REF (int): Referent
+          REMNANT (int): Remnant
+          REPARANDUM (int): Reparandum
+          ROOT (int): Root
+          SNUM (int): Suffix specifying a unit of number
+          SUFF (int): Suffix
+          TMOD (int): Temporal modifier
+          TOPIC (int): Topic marker
+          VMOD (int): Clause headed by an infinite form of the verb that modifies a noun
+          VOCATIVE (int): Vocative
+          XCOMP (int): Open clausal complement
+          SUFFIX (int): Name suffix
+          TITLE (int): Name title
+          ADVPHMOD (int): Adverbial phrase modifier
+          AUXCAUS (int): Causative auxiliary
+          AUXVV (int): Helper auxiliary
+          DTMOD (int): Rentaishi (Prenominal modifier)
+          FOREIGN (int): Foreign words
+          KW (int): Keyword
+          LIST (int): List for chains of comparable items
+          NOMC (int): Nominalized clause
+          NOMCSUBJ (int): Nominalized clausal subject
+          NOMCSUBJPASS (int): Nominalized clausal passive
+          NUMC (int): Compound of numeric modifier
+          COP (int): Copula
+          DISLOCATED (int): Dislocated relation (for fronted/topicalized elements)
+        """
+        UNKNOWN = 0
+        ABBREV = 1
+        ACOMP = 2
+        ADVCL = 3
+        ADVMOD = 4
+        AMOD = 5
+        APPOS = 6
+        ATTR = 7
+        AUX = 8
+        AUXPASS = 9
+        CC = 10
+        CCOMP = 11
+        CONJ = 12
+        CSUBJ = 13
+        CSUBJPASS = 14
+        DEP = 15
+        DET = 16
+        DISCOURSE = 17
+        DOBJ = 18
+        EXPL = 19
+        GOESWITH = 20
+        IOBJ = 21
+        MARK = 22
+        MWE = 23
+        MWV = 24
+        NEG = 25
+        NN = 26
+        NPADVMOD = 27
+        NSUBJ = 28
+        NSUBJPASS = 29
+        NUM = 30
+        NUMBER = 31
+        P = 32
+        PARATAXIS = 33
+        PARTMOD = 34
+        PCOMP = 35
+        POBJ = 36
+        POSS = 37
+        POSTNEG = 38
+        PRECOMP = 39
+        PRECONJ = 40
+        PREDET = 41
+        PREF = 42
+        PREP = 43
+        PRONL = 44
+        PRT = 45
+        PS = 46
+        QUANTMOD = 47
+        RCMOD = 48
+        RCMODREL = 49
+        RDROP = 50
+        REF = 51
+        REMNANT = 52
+        REPARANDUM = 53
+        ROOT = 54
+        SNUM = 55
+        SUFF = 56
+        TMOD = 57
+        TOPIC = 58
+        VMOD = 59
+        VOCATIVE = 60
+        XCOMP = 61
+        SUFFIX = 62
+        TITLE = 63
+        ADVPHMOD = 64
+        AUXCAUS = 65
+        AUXVV = 66
+        DTMOD = 67
+        FOREIGN = 68
+        KW = 69
+        LIST = 70
+        NOMC = 71
+        NOMCSUBJ = 72
+        NOMCSUBJPASS = 73
+        NUMC = 74
+        COP = 75
+        DISLOCATED = 76
+
+
+class EntityMention(object):
+    class Type(object):
+        """
+        The supported types of mentions.
+
+        Attributes:
+          TYPE_UNKNOWN (int): Unknown
+          PROPER (int): Proper name
+          COMMON (int): Common noun (or noun compound)
+        """
+        TYPE_UNKNOWN = 0
+        PROPER = 1
+        COMMON = 2
diff --git a/language/google/cloud/gapic/language/v1/language_service_client.py b/language/google/cloud/gapic/language/v1/language_service_client.py
new file mode 100644
index 0000000000000..fb55b9568b67b
--- /dev/null
+++ b/language/google/cloud/gapic/language/v1/language_service_client.py
@@ -0,0 +1,290 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# EDITING INSTRUCTIONS
+# This file was generated from the file
+# https://github.com/google/googleapis/blob/master/google/cloud/language/v1/language_service.proto,
+# and updates to that file get reflected here through a refresh process.
+# For the short term, the refresh process will only be runnable by Google engineers.
+#
+# The only allowed edits are to method and file documentation. A 3-way
+# merge preserves those additions if the generated source changes.
+"""Accesses the google.cloud.language.v1 LanguageService API."""
+
+import collections
+import json
+import os
+import pkg_resources
+import platform
+
+from google.gax import api_callable
+from google.gax import config
+from google.gax import path_template
+import google.gax
+
+from google.cloud.gapic.language.v1 import enums
+from google.cloud.proto.language.v1 import language_service_pb2
+
+
+class LanguageServiceClient(object):
+    """
+    Provides text analysis operations such as sentiment analysis and entity
+    recognition.
+    """
+
+    SERVICE_ADDRESS = 'language.googleapis.com'
+    """The default address of the service."""
+
+    DEFAULT_SERVICE_PORT = 443
+    """The default port of the service."""
+
+    # The scopes needed to make gRPC calls to all of the methods defined in
+    # this service
+    _ALL_SCOPES = ('https://www.googleapis.com/auth/cloud-platform', )
+
+    def __init__(self,
+                 service_path=SERVICE_ADDRESS,
+                 port=DEFAULT_SERVICE_PORT,
+                 channel=None,
+                 credentials=None,
+                 ssl_credentials=None,
+                 scopes=None,
+                 client_config=None,
+                 app_name=None,
+                 app_version='',
+                 lib_name=None,
+                 lib_version='',
+                 metrics_headers=()):
+        """Constructor.
+
+        Args:
+          service_path (string): The domain name of the API remote host.
+          port (int): The port on which to connect to the remote host.
+          channel (:class:`grpc.Channel`): A ``Channel`` instance through
+            which to make calls.
+          credentials (object): The authorization credentials to attach to
+            requests. These credentials identify this application to the
+            service.
+          ssl_credentials (:class:`grpc.ChannelCredentials`): A
+            ``ChannelCredentials`` instance for use with an SSL-enabled
+            channel.
+          scopes (list[string]): A list of OAuth2 scopes to attach to requests.
+          client_config (dict):
+            A dictionary for call options for each method. See
+            :func:`google.gax.construct_settings` for the structure of
+            this data. Falls back to the default config if not specified
+            or the specified config is missing data points.
+          app_name (string): The name of the application calling
+            the service. Recommended for analytics purposes.
+          app_version (string): The version of the application calling
+            the service. Recommended for analytics purposes.
+          lib_name (string): The API library software used for calling
+            the service. (Unless you are writing an API client itself,
+            leave this as default.)
+          lib_version (string): The API library software version used
+            for calling the service. (Unless you are writing an API client
+            itself, leave this as default.)
+          metrics_headers (dict): A dictionary of values for tracking
+            client library metrics. Ultimately serializes to a string
+            (e.g. 'foo/1.2.3 bar/3.14.1'). This argument should be
+            considered private.
+
+        Returns:
+          A LanguageServiceClient object.
+        """
+        # Unless the calling application specifically requested
+        # OAuth scopes, request everything.
+        if scopes is None:
+            scopes = self._ALL_SCOPES
+
+        # Initialize an empty client config, if none is set.
+        if client_config is None:
+            client_config = {}
+
+        # Initialize metrics_headers as an ordered dictionary
+        # (cuts down on cardinality of the resulting string slightly).
+        metrics_headers = collections.OrderedDict(metrics_headers)
+        metrics_headers['gl-python'] = platform.python_version()
+
+        # The library may or may not be set, depending on what is
+        # calling this client. Newer client libraries set the library name
+        # and version.
+        if lib_name:
+            metrics_headers[lib_name] = lib_version
+
+        # Finally, track the GAPIC package version.
+        metrics_headers['gapic'] = pkg_resources.get_distribution(
+            'google-cloud-language', ).version
+
+        # Load the configuration defaults.
+        default_client_config = json.loads(
+            pkg_resources.resource_string(
+                __name__, 'language_service_client_config.json').decode())
+        defaults = api_callable.construct_settings(
+            'google.cloud.language.v1.LanguageService',
+            default_client_config,
+            client_config,
+            config.STATUS_CODE_NAMES,
+            metrics_headers=metrics_headers, )
+        self.language_service_stub = config.create_stub(
+            language_service_pb2.LanguageServiceStub,
+            channel=channel,
+            service_path=service_path,
+            service_port=port,
+            credentials=credentials,
+            scopes=scopes,
+            ssl_credentials=ssl_credentials)
+
+        self._analyze_sentiment = api_callable.create_api_call(
+            self.language_service_stub.AnalyzeSentiment,
+            settings=defaults['analyze_sentiment'])
+        self._analyze_entities = api_callable.create_api_call(
+            self.language_service_stub.AnalyzeEntities,
+            settings=defaults['analyze_entities'])
+        self._analyze_syntax = api_callable.create_api_call(
+            self.language_service_stub.AnalyzeSyntax,
+            settings=defaults['analyze_syntax'])
+        self._annotate_text = api_callable.create_api_call(
+            self.language_service_stub.AnnotateText,
+            settings=defaults['annotate_text'])
+
+    # Service calls
+    def analyze_sentiment(self, document, encoding_type=None, options=None):
+        """
+        Analyzes the sentiment of the provided text.
+
+        Example:
+          >>> from google.cloud.gapic.language.v1 import language_service_client
+          >>> from google.cloud.proto.language.v1 import language_service_pb2
+          >>> client = language_service_client.LanguageServiceClient()
+          >>> document = language_service_pb2.Document()
+          >>> response = client.analyze_sentiment(document)
+
+        Args:
+          document (:class:`google.cloud.proto.language.v1.language_service_pb2.Document`): Input document.
+          encoding_type (enum :class:`google.cloud.gapic.language.v1.enums.EncodingType`): The encoding type used by the API to calculate sentence offsets.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          A :class:`google.cloud.proto.language.v1.language_service_pb2.AnalyzeSentimentResponse` instance.
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        # Create the request object.
+        request = language_service_pb2.AnalyzeSentimentRequest(
+            document=document, encoding_type=encoding_type)
+        return self._analyze_sentiment(request, options)
+
+    def analyze_entities(self, document, encoding_type, options=None):
+        """
+        Finds named entities (currently proper names and common nouns) in the text
+        along with entity types, salience, mentions for each entity, and
+        other properties.
+
+        Example:
+          >>> from google.cloud.gapic.language.v1 import language_service_client
+          >>> from google.cloud.gapic.language.v1 import enums
+          >>> from google.cloud.proto.language.v1 import language_service_pb2
+          >>> client = language_service_client.LanguageServiceClient()
+          >>> document = language_service_pb2.Document()
+          >>> encoding_type = enums.EncodingType.NONE
+          >>> response = client.analyze_entities(document, encoding_type)
+
+        Args:
+          document (:class:`google.cloud.proto.language.v1.language_service_pb2.Document`): Input document.
+          encoding_type (enum :class:`google.cloud.gapic.language.v1.enums.EncodingType`): The encoding type used by the API to calculate offsets.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          A :class:`google.cloud.proto.language.v1.language_service_pb2.AnalyzeEntitiesResponse` instance.
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        # Create the request object.
+        request = language_service_pb2.AnalyzeEntitiesRequest(
+            document=document, encoding_type=encoding_type)
+        return self._analyze_entities(request, options)
+
+    def analyze_syntax(self, document, encoding_type, options=None):
+        """
+        Analyzes the syntax of the text and provides sentence boundaries and
+        tokenization along with part of speech tags, dependency trees, and other
+        properties.
+
+        Example:
+          >>> from google.cloud.gapic.language.v1 import language_service_client
+          >>> from google.cloud.gapic.language.v1 import enums
+          >>> from google.cloud.proto.language.v1 import language_service_pb2
+          >>> client = language_service_client.LanguageServiceClient()
+          >>> document = language_service_pb2.Document()
+          >>> encoding_type = enums.EncodingType.NONE
+          >>> response = client.analyze_syntax(document, encoding_type)
+
+        Args:
+          document (:class:`google.cloud.proto.language.v1.language_service_pb2.Document`): Input document.
+          encoding_type (enum :class:`google.cloud.gapic.language.v1.enums.EncodingType`): The encoding type used by the API to calculate offsets.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          A :class:`google.cloud.proto.language.v1.language_service_pb2.AnalyzeSyntaxResponse` instance.
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        # Create the request object.
+        request = language_service_pb2.AnalyzeSyntaxRequest(
+            document=document, encoding_type=encoding_type)
+        return self._analyze_syntax(request, options)
+
+    def annotate_text(self, document, features, encoding_type, options=None):
+        """
+        A convenience method that provides all the features that analyzeSentiment,
+        analyzeEntities, and analyzeSyntax provide in one call.
+
+        Example:
+          >>> from google.cloud.gapic.language.v1 import language_service_client
+          >>> from google.cloud.gapic.language.v1 import enums
+          >>> from google.cloud.proto.language.v1 import language_service_pb2
+          >>> client = language_service_client.LanguageServiceClient()
+          >>> document = language_service_pb2.Document()
+          >>> features = language_service_pb2.AnnotateTextRequest.Features()
+          >>> encoding_type = enums.EncodingType.NONE
+          >>> response = client.annotate_text(document, features, encoding_type)
+
+        Args:
+          document (:class:`google.cloud.proto.language.v1.language_service_pb2.Document`): Input document.
+          features (:class:`google.cloud.proto.language.v1.language_service_pb2.AnnotateTextRequest.Features`): The enabled features.
+          encoding_type (enum :class:`google.cloud.gapic.language.v1.enums.EncodingType`): The encoding type used by the API to calculate offsets.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          A :class:`google.cloud.proto.language.v1.language_service_pb2.AnnotateTextResponse` instance.
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        # Create the request object.
+        request = language_service_pb2.AnnotateTextRequest(
+            document=document, features=features, encoding_type=encoding_type)
+        return self._annotate_text(request, options)
diff --git a/language/google/cloud/gapic/language/v1/language_service_client_config.json b/language/google/cloud/gapic/language/v1/language_service_client_config.json
new file mode 100644
index 0000000000000..202d5b0d427b2
--- /dev/null
+++ b/language/google/cloud/gapic/language/v1/language_service_client_config.json
@@ -0,0 +1,46 @@
+{
+  "interfaces": {
+    "google.cloud.language.v1.LanguageService": {
+      "retry_codes": {
+        "idempotent": [
+          "DEADLINE_EXCEEDED",
+          "UNAVAILABLE"
+        ],
+        "non_idempotent": []
+      },
+      "retry_params": {
+        "default": {
+          "initial_retry_delay_millis": 100,
+          "retry_delay_multiplier": 1.3,
+          "max_retry_delay_millis": 60000,
+          "initial_rpc_timeout_millis": 60000,
+          "rpc_timeout_multiplier": 1.0,
+          "max_rpc_timeout_millis": 60000,
+          "total_timeout_millis": 600000
+        }
+      },
+      "methods": {
+        "AnalyzeSentiment": {
+          "timeout_millis": 30000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        },
+        "AnalyzeEntities": {
+          "timeout_millis": 30000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        },
+        "AnalyzeSyntax": {
+          "timeout_millis": 30000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        },
+        "AnnotateText": {
+          "timeout_millis": 30000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        }
+      }
+    }
+  }
+}
diff --git a/language/google/cloud/gapic/language/v1beta2/__init__.py b/language/google/cloud/gapic/language/v1beta2/__init__.py
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/language/google/cloud/gapic/language/v1beta2/enums.py b/language/google/cloud/gapic/language/v1beta2/enums.py
new file mode 100644
index 0000000000000..2b53e4d913bbc
--- /dev/null
+++ b/language/google/cloud/gapic/language/v1beta2/enums.py
@@ -0,0 +1,516 @@
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Wrappers for protocol buffer enum types."""
+
+
+class EncodingType(object):
+    """
+    Represents the text encoding that the caller uses to process the output.
+    Providing an ``EncodingType`` is recommended because the API provides the
+    beginning offsets for various outputs, such as tokens and mentions, and
+    languages that natively use different text encodings may access offsets
+    differently.
+
+    Attributes:
+      NONE (int): If ``EncodingType`` is not specified, encoding-dependent information (such as
+        ``begin_offset``) will be set at ``-1``.
+      UTF8 (int): Encoding-dependent information (such as ``begin_offset``) is calculated based
+        on the UTF-8 encoding of the input. C++ and Go are examples of languages
+        that use this encoding natively.
+      UTF16 (int): Encoding-dependent information (such as ``begin_offset``) is calculated based
+        on the UTF-16 encoding of the input. Java and Javascript are examples of
+        languages that use this encoding natively.
+      UTF32 (int): Encoding-dependent information (such as ``begin_offset``) is calculated based
+        on the UTF-32 encoding of the input. Python is an example of a language
+        that uses this encoding natively.
+    """
+    NONE = 0
+    UTF8 = 1
+    UTF16 = 2
+    UTF32 = 3
+
+
+class Document(object):
+    class Type(object):
+        """
+        The document types enum.
+
+        Attributes:
+          TYPE_UNSPECIFIED (int): The content type is not specified.
+          PLAIN_TEXT (int): Plain text
+          HTML (int): HTML
+        """
+        TYPE_UNSPECIFIED = 0
+        PLAIN_TEXT = 1
+        HTML = 2
+
+
+class Entity(object):
+    class Type(object):
+        """
+        The type of the entity.
+
+        Attributes:
+          UNKNOWN (int): Unknown
+          PERSON (int): Person
+          LOCATION (int): Location
+          ORGANIZATION (int): Organization
+          EVENT (int): Event
+          WORK_OF_ART (int): Work of art
+          CONSUMER_GOOD (int): Consumer goods
+          OTHER (int): Other types
+        """
+        UNKNOWN = 0
+        PERSON = 1
+        LOCATION = 2
+        ORGANIZATION = 3
+        EVENT = 4
+        WORK_OF_ART = 5
+        CONSUMER_GOOD = 6
+        OTHER = 7
+
+
+class PartOfSpeech(object):
+    class Tag(object):
+        """
+        The part of speech tags enum.
+
+        Attributes:
+          UNKNOWN (int): Unknown
+          ADJ (int): Adjective
+          ADP (int): Adposition (preposition and postposition)
+          ADV (int): Adverb
+          CONJ (int): Conjunction
+          DET (int): Determiner
+          NOUN (int): Noun (common and proper)
+          NUM (int): Cardinal number
+          PRON (int): Pronoun
+          PRT (int): Particle or other function word
+          PUNCT (int): Punctuation
+          VERB (int): Verb (all tenses and modes)
+          X (int): Other: foreign words, typos, abbreviations
+          AFFIX (int): Affix
+        """
+        UNKNOWN = 0
+        ADJ = 1
+        ADP = 2
+        ADV = 3
+        CONJ = 4
+        DET = 5
+        NOUN = 6
+        NUM = 7
+        PRON = 8
+        PRT = 9
+        PUNCT = 10
+        VERB = 11
+        X = 12
+        AFFIX = 13
+
+    class Aspect(object):
+        """
+        The characteristic of a verb that expresses time flow during an event.
+
+        Attributes:
+          ASPECT_UNKNOWN (int): Aspect is not applicable in the analyzed language or is not predicted.
+          PERFECTIVE (int): Perfective
+          IMPERFECTIVE (int): Imperfective
+          PROGRESSIVE (int): Progressive
+        """
+        ASPECT_UNKNOWN = 0
+        PERFECTIVE = 1
+        IMPERFECTIVE = 2
+        PROGRESSIVE = 3
+
+    class Case(object):
+        """
+        The grammatical function performed by a noun or pronoun in a phrase,
+        clause, or sentence. In some languages, other parts of speech, such as
+        adjective and determiner, take case inflection in agreement with the noun.
+
+        Attributes:
+          CASE_UNKNOWN (int): Case is not applicable in the analyzed language or is not predicted.
+          ACCUSATIVE (int): Accusative
+          ADVERBIAL (int): Adverbial
+          COMPLEMENTIVE (int): Complementive
+          DATIVE (int): Dative
+          GENITIVE (int): Genitive
+          INSTRUMENTAL (int): Instrumental
+          LOCATIVE (int): Locative
+          NOMINATIVE (int): Nominative
+          OBLIQUE (int): Oblique
+          PARTITIVE (int): Partitive
+          PREPOSITIONAL (int): Prepositional
+          REFLEXIVE_CASE (int): Reflexive
+          RELATIVE_CASE (int): Relative
+          VOCATIVE (int): Vocative
+        """
+        CASE_UNKNOWN = 0
+        ACCUSATIVE = 1
+        ADVERBIAL = 2
+        COMPLEMENTIVE = 3
+        DATIVE = 4
+        GENITIVE = 5
+        INSTRUMENTAL = 6
+        LOCATIVE = 7
+        NOMINATIVE = 8
+        OBLIQUE = 9
+        PARTITIVE = 10
+        PREPOSITIONAL = 11
+        REFLEXIVE_CASE = 12
+        RELATIVE_CASE = 13
+        VOCATIVE = 14
+
+    class Form(object):
+        """
+        Depending on the language, Form can be categorizing different forms of
+        verbs, adjectives, adverbs, etc. For example, categorizing inflected
+        endings of verbs and adjectives or distinguishing between short and long
+        forms of adjectives and participles
+
+        Attributes:
+          FORM_UNKNOWN (int): Form is not applicable in the analyzed language or is not predicted.
+          ADNOMIAL (int): Adnomial
+          AUXILIARY (int): Auxiliary
+          COMPLEMENTIZER (int): Complementizer
+          FINAL_ENDING (int): Final ending
+          GERUND (int): Gerund
+          REALIS (int): Realis
+          IRREALIS (int): Irrealis
+          SHORT (int): Short form
+          LONG (int): Long form
+          ORDER (int): Order form
+          SPECIFIC (int): Specific form
+        """
+        FORM_UNKNOWN = 0
+        ADNOMIAL = 1
+        AUXILIARY = 2
+        COMPLEMENTIZER = 3
+        FINAL_ENDING = 4
+        GERUND = 5
+        REALIS = 6
+        IRREALIS = 7
+        SHORT = 8
+        LONG = 9
+        ORDER = 10
+        SPECIFIC = 11
+
+    class Gender(object):
+        """
+        Gender classes of nouns reflected in the behaviour of associated words.
+
+        Attributes:
+          GENDER_UNKNOWN (int): Gender is not applicable in the analyzed language or is not predicted.
+          FEMININE (int): Feminine
+          MASCULINE (int): Masculine
+          NEUTER (int): Neuter
+        """
+        GENDER_UNKNOWN = 0
+        FEMININE = 1
+        MASCULINE = 2
+        NEUTER = 3
+
+    class Mood(object):
+        """
+        The grammatical feature of verbs, used for showing modality and attitude.
+
+        Attributes:
+          MOOD_UNKNOWN (int): Mood is not applicable in the analyzed language or is not predicted.
+          CONDITIONAL_MOOD (int): Conditional
+          IMPERATIVE (int): Imperative
+          INDICATIVE (int): Indicative
+          INTERROGATIVE (int): Interrogative
+          JUSSIVE (int): Jussive
+          SUBJUNCTIVE (int): Subjunctive
+        """
+        MOOD_UNKNOWN = 0
+        CONDITIONAL_MOOD = 1
+        IMPERATIVE = 2
+        INDICATIVE = 3
+        INTERROGATIVE = 4
+        JUSSIVE = 5
+        SUBJUNCTIVE = 6
+
+    class Number(object):
+        """
+        Count distinctions.
+
+        Attributes:
+          NUMBER_UNKNOWN (int): Number is not applicable in the analyzed language or is not predicted.
+          SINGULAR (int): Singular
+          PLURAL (int): Plural
+          DUAL (int): Dual
+        """
+        NUMBER_UNKNOWN = 0
+        SINGULAR = 1
+        PLURAL = 2
+        DUAL = 3
+
+    class Person(object):
+        """
+        The distinction between the speaker, second person, third person, etc.
+
+        Attributes:
+          PERSON_UNKNOWN (int): Person is not applicable in the analyzed language or is not predicted.
+          FIRST (int): First
+          SECOND (int): Second
+          THIRD (int): Third
+          REFLEXIVE_PERSON (int): Reflexive
+        """
+        PERSON_UNKNOWN = 0
+        FIRST = 1
+        SECOND = 2
+        THIRD = 3
+        REFLEXIVE_PERSON = 4
+
+    class Proper(object):
+        """
+        This category shows if the token is part of a proper name.
+
+        Attributes:
+          PROPER_UNKNOWN (int): Proper is not applicable in the analyzed language or is not predicted.
+          PROPER (int): Proper
+          NOT_PROPER (int): Not proper
+        """
+        PROPER_UNKNOWN = 0
+        PROPER = 1
+        NOT_PROPER = 2
+
+    class Reciprocity(object):
+        """
+        Reciprocal features of a pronoun.
+
+        Attributes:
+          RECIPROCITY_UNKNOWN (int): Reciprocity is not applicable in the analyzed language or is not
+            predicted.
+          RECIPROCAL (int): Reciprocal
+          NON_RECIPROCAL (int): Non-reciprocal
+        """
+        RECIPROCITY_UNKNOWN = 0
+        RECIPROCAL = 1
+        NON_RECIPROCAL = 2
+
+    class Tense(object):
+        """
+        Time reference.
+
+        Attributes:
+          TENSE_UNKNOWN (int): Tense is not applicable in the analyzed language or is not predicted.
+          CONDITIONAL_TENSE (int): Conditional
+          FUTURE (int): Future
+          PAST (int): Past
+          PRESENT (int): Present
+          IMPERFECT (int): Imperfect
+          PLUPERFECT (int): Pluperfect
+        """
+        TENSE_UNKNOWN = 0
+        CONDITIONAL_TENSE = 1
+        FUTURE = 2
+        PAST = 3
+        PRESENT = 4
+        IMPERFECT = 5
+        PLUPERFECT = 6
+
+    class Voice(object):
+        """
+        The relationship between the action that a verb expresses and the
+        participants identified by its arguments.
+
+        Attributes:
+          VOICE_UNKNOWN (int): Voice is not applicable in the analyzed language or is not predicted.
+          ACTIVE (int): Active
+          CAUSATIVE (int): Causative
+          PASSIVE (int): Passive
+        """
+        VOICE_UNKNOWN = 0
+        ACTIVE = 1
+        CAUSATIVE = 2
+        PASSIVE = 3
+
+
+class DependencyEdge(object):
+    class Label(object):
+        """
+        The parse label enum for the token.
+
+        Attributes:
+          UNKNOWN (int): Unknown
+          ABBREV (int): Abbreviation modifier
+          ACOMP (int): Adjectival complement
+          ADVCL (int): Adverbial clause modifier
+          ADVMOD (int): Adverbial modifier
+          AMOD (int): Adjectival modifier of an NP
+          APPOS (int): Appositional modifier of an NP
+          ATTR (int): Attribute dependent of a copular verb
+          AUX (int): Auxiliary (non-main) verb
+          AUXPASS (int): Passive auxiliary
+          CC (int): Coordinating conjunction
+          CCOMP (int): Clausal complement of a verb or adjective
+          CONJ (int): Conjunct
+          CSUBJ (int): Clausal subject
+          CSUBJPASS (int): Clausal passive subject
+          DEP (int): Dependency (unable to determine)
+          DET (int): Determiner
+          DISCOURSE (int): Discourse
+          DOBJ (int): Direct object
+          EXPL (int): Expletive
+          GOESWITH (int): Goes with (part of a word in a text not well edited)
+          IOBJ (int): Indirect object
+          MARK (int): Marker (word introducing a subordinate clause)
+          MWE (int): Multi-word expression
+          MWV (int): Multi-word verbal expression
+          NEG (int): Negation modifier
+          NN (int): Noun compound modifier
+          NPADVMOD (int): Noun phrase used as an adverbial modifier
+          NSUBJ (int): Nominal subject
+          NSUBJPASS (int): Passive nominal subject
+          NUM (int): Numeric modifier of a noun
+          NUMBER (int): Element of compound number
+          P (int): Punctuation mark
+          PARATAXIS (int): Parataxis relation
+          PARTMOD (int): Participial modifier
+          PCOMP (int): The complement of a preposition is a clause
+          POBJ (int): Object of a preposition
+          POSS (int): Possession modifier
+          POSTNEG (int): Postverbal negative particle
+          PRECOMP (int): Predicate complement
+          PRECONJ (int): Preconjunt
+          PREDET (int): Predeterminer
+          PREF (int): Prefix
+          PREP (int): Prepositional modifier
+          PRONL (int): The relationship between a verb and verbal morpheme
+          PRT (int): Particle
+          PS (int): Associative or possessive marker
+          QUANTMOD (int): Quantifier phrase modifier
+          RCMOD (int): Relative clause modifier
+          RCMODREL (int): Complementizer in relative clause
+          RDROP (int): Ellipsis without a preceding predicate
+          REF (int): Referent
+          REMNANT (int): Remnant
+          REPARANDUM (int): Reparandum
+          ROOT (int): Root
+          SNUM (int): Suffix specifying a unit of number
+          SUFF (int): Suffix
+          TMOD (int): Temporal modifier
+          TOPIC (int): Topic marker
+          VMOD (int): Clause headed by an infinite form of the verb that modifies a noun
+          VOCATIVE (int): Vocative
+          XCOMP (int): Open clausal complement
+          SUFFIX (int): Name suffix
+          TITLE (int): Name title
+          ADVPHMOD (int): Adverbial phrase modifier
+          AUXCAUS (int): Causative auxiliary
+          AUXVV (int): Helper auxiliary
+          DTMOD (int): Rentaishi (Prenominal modifier)
+          FOREIGN (int): Foreign words
+          KW (int): Keyword
+          LIST (int): List for chains of comparable items
+          NOMC (int): Nominalized clause
+          NOMCSUBJ (int): Nominalized clausal subject
+          NOMCSUBJPASS (int): Nominalized clausal passive
+          NUMC (int): Compound of numeric modifier
+          COP (int): Copula
+          DISLOCATED (int): Dislocated relation (for fronted/topicalized elements)
+        """
+        UNKNOWN = 0
+        ABBREV = 1
+        ACOMP = 2
+        ADVCL = 3
+        ADVMOD = 4
+        AMOD = 5
+        APPOS = 6
+        ATTR = 7
+        AUX = 8
+        AUXPASS = 9
+        CC = 10
+        CCOMP = 11
+        CONJ = 12
+        CSUBJ = 13
+        CSUBJPASS = 14
+        DEP = 15
+        DET = 16
+        DISCOURSE = 17
+        DOBJ = 18
+        EXPL = 19
+        GOESWITH = 20
+        IOBJ = 21
+        MARK = 22
+        MWE = 23
+        MWV = 24
+        NEG = 25
+        NN = 26
+        NPADVMOD = 27
+        NSUBJ = 28
+        NSUBJPASS = 29
+        NUM = 30
+        NUMBER = 31
+        P = 32
+        PARATAXIS = 33
+        PARTMOD = 34
+        PCOMP = 35
+        POBJ = 36
+        POSS = 37
+        POSTNEG = 38
+        PRECOMP = 39
+        PRECONJ = 40
+        PREDET = 41
+        PREF = 42
+        PREP = 43
+        PRONL = 44
+        PRT = 45
+        PS = 46
+        QUANTMOD = 47
+        RCMOD = 48
+        RCMODREL = 49
+        RDROP = 50
+        REF = 51
+        REMNANT = 52
+        REPARANDUM = 53
+        ROOT = 54
+        SNUM = 55
+        SUFF = 56
+        TMOD = 57
+        TOPIC = 58
+        VMOD = 59
+        VOCATIVE = 60
+        XCOMP = 61
+        SUFFIX = 62
+        TITLE = 63
+        ADVPHMOD = 64
+        AUXCAUS = 65
+        AUXVV = 66
+        DTMOD = 67
+        FOREIGN = 68
+        KW = 69
+        LIST = 70
+        NOMC = 71
+        NOMCSUBJ = 72
+        NOMCSUBJPASS = 73
+        NUMC = 74
+        COP = 75
+        DISLOCATED = 76
+
+
+class EntityMention(object):
+    class Type(object):
+        """
+        The supported types of mentions.
+
+        Attributes:
+          TYPE_UNKNOWN (int): Unknown
+          PROPER (int): Proper name
+          COMMON (int): Common noun (or noun compound)
+        """
+        TYPE_UNKNOWN = 0
+        PROPER = 1
+        COMMON = 2
diff --git a/language/google/cloud/gapic/language/v1beta2/language_service_client.py b/language/google/cloud/gapic/language/v1beta2/language_service_client.py
new file mode 100644
index 0000000000000..a990d2a9758ae
--- /dev/null
+++ b/language/google/cloud/gapic/language/v1beta2/language_service_client.py
@@ -0,0 +1,326 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# EDITING INSTRUCTIONS
+# This file was generated from the file
+# https://github.com/google/googleapis/blob/master/google/cloud/language/v1beta2/language_service.proto,
+# and updates to that file get reflected here through a refresh process.
+# For the short term, the refresh process will only be runnable by Google engineers.
+#
+# The only allowed edits are to method and file documentation. A 3-way
+# merge preserves those additions if the generated source changes.
+"""Accesses the google.cloud.language.v1beta2 LanguageService API."""
+
+import collections
+import json
+import os
+import pkg_resources
+import platform
+
+from google.gax import api_callable
+from google.gax import config
+from google.gax import path_template
+import google.gax
+
+from google.cloud.gapic.language.v1beta2 import enums
+from google.cloud.proto.language.v1beta2 import language_service_pb2
+
+
+class LanguageServiceClient(object):
+    """
+    Provides text analysis operations such as sentiment analysis and entity
+    recognition.
+    """
+
+    SERVICE_ADDRESS = 'language.googleapis.com'
+    """The default address of the service."""
+
+    DEFAULT_SERVICE_PORT = 443
+    """The default port of the service."""
+
+    # The scopes needed to make gRPC calls to all of the methods defined in
+    # this service
+    _ALL_SCOPES = ('https://www.googleapis.com/auth/cloud-platform', )
+
+    def __init__(self,
+                 service_path=SERVICE_ADDRESS,
+                 port=DEFAULT_SERVICE_PORT,
+                 channel=None,
+                 credentials=None,
+                 ssl_credentials=None,
+                 scopes=None,
+                 client_config=None,
+                 app_name=None,
+                 app_version='',
+                 lib_name=None,
+                 lib_version='',
+                 metrics_headers=()):
+        """Constructor.
+
+        Args:
+          service_path (string): The domain name of the API remote host.
+          port (int): The port on which to connect to the remote host.
+          channel (:class:`grpc.Channel`): A ``Channel`` instance through
+            which to make calls.
+          credentials (object): The authorization credentials to attach to
+            requests. These credentials identify this application to the
+            service.
+          ssl_credentials (:class:`grpc.ChannelCredentials`): A
+            ``ChannelCredentials`` instance for use with an SSL-enabled
+            channel.
+          scopes (list[string]): A list of OAuth2 scopes to attach to requests.
+          client_config (dict):
+            A dictionary for call options for each method. See
+            :func:`google.gax.construct_settings` for the structure of
+            this data. Falls back to the default config if not specified
+            or the specified config is missing data points.
+          app_name (string): The name of the application calling
+            the service. Recommended for analytics purposes.
+          app_version (string): The version of the application calling
+            the service. Recommended for analytics purposes.
+          lib_name (string): The API library software used for calling
+            the service. (Unless you are writing an API client itself,
+            leave this as default.)
+          lib_version (string): The API library software version used
+            for calling the service. (Unless you are writing an API client
+            itself, leave this as default.)
+          metrics_headers (dict): A dictionary of values for tracking
+            client library metrics. Ultimately serializes to a string
+            (e.g. 'foo/1.2.3 bar/3.14.1'). This argument should be
+            considered private.
+
+        Returns:
+          A LanguageServiceClient object.
+        """
+        # Unless the calling application specifically requested
+        # OAuth scopes, request everything.
+        if scopes is None:
+            scopes = self._ALL_SCOPES
+
+        # Initialize an empty client config, if none is set.
+        if client_config is None:
+            client_config = {}
+
+        # Initialize metrics_headers as an ordered dictionary
+        # (cuts down on cardinality of the resulting string slightly).
+        metrics_headers = collections.OrderedDict(metrics_headers)
+        metrics_headers['gl-python'] = platform.python_version()
+
+        # The library may or may not be set, depending on what is
+        # calling this client. Newer client libraries set the library name
+        # and version.
+        if lib_name:
+            metrics_headers[lib_name] = lib_version
+
+        # Finally, track the GAPIC package version.
+        metrics_headers['gapic'] = pkg_resources.get_distribution(
+            'google-cloud-language', ).version
+
+        # Load the configuration defaults.
+        default_client_config = json.loads(
+            pkg_resources.resource_string(
+                __name__, 'language_service_client_config.json').decode())
+        defaults = api_callable.construct_settings(
+            'google.cloud.language.v1beta2.LanguageService',
+            default_client_config,
+            client_config,
+            config.STATUS_CODE_NAMES,
+            metrics_headers=metrics_headers, )
+        self.language_service_stub = config.create_stub(
+            language_service_pb2.LanguageServiceStub,
+            channel=channel,
+            service_path=service_path,
+            service_port=port,
+            credentials=credentials,
+            scopes=scopes,
+            ssl_credentials=ssl_credentials)
+
+        self._analyze_sentiment = api_callable.create_api_call(
+            self.language_service_stub.AnalyzeSentiment,
+            settings=defaults['analyze_sentiment'])
+        self._analyze_entities = api_callable.create_api_call(
+            self.language_service_stub.AnalyzeEntities,
+            settings=defaults['analyze_entities'])
+        self._analyze_entity_sentiment = api_callable.create_api_call(
+            self.language_service_stub.AnalyzeEntitySentiment,
+            settings=defaults['analyze_entity_sentiment'])
+        self._analyze_syntax = api_callable.create_api_call(
+            self.language_service_stub.AnalyzeSyntax,
+            settings=defaults['analyze_syntax'])
+        self._annotate_text = api_callable.create_api_call(
+            self.language_service_stub.AnnotateText,
+            settings=defaults['annotate_text'])
+
+    # Service calls
+    def analyze_sentiment(self, document, encoding_type=None, options=None):
+        """
+        Analyzes the sentiment of the provided text.
+
+        Example:
+          >>> from google.cloud.gapic.language.v1beta2 import language_service_client
+          >>> from google.cloud.proto.language.v1beta2 import language_service_pb2
+          >>> client = language_service_client.LanguageServiceClient()
+          >>> document = language_service_pb2.Document()
+          >>> response = client.analyze_sentiment(document)
+
+        Args:
+          document (:class:`google.cloud.proto.language.v1beta2.language_service_pb2.Document`): Input document.
+          encoding_type (enum :class:`google.cloud.gapic.language.v1beta2.enums.EncodingType`): The encoding type used by the API to calculate sentence offsets for the
+            sentence sentiment.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          A :class:`google.cloud.proto.language.v1beta2.language_service_pb2.AnalyzeSentimentResponse` instance.
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        # Create the request object.
+        request = language_service_pb2.AnalyzeSentimentRequest(
+            document=document, encoding_type=encoding_type)
+        return self._analyze_sentiment(request, options)
+
+    def analyze_entities(self, document, encoding_type, options=None):
+        """
+        Finds named entities (currently proper names and common nouns) in the text
+        along with entity types, salience, mentions for each entity, and
+        other properties.
+
+        Example:
+          >>> from google.cloud.gapic.language.v1beta2 import language_service_client
+          >>> from google.cloud.gapic.language.v1beta2 import enums
+          >>> from google.cloud.proto.language.v1beta2 import language_service_pb2
+          >>> client = language_service_client.LanguageServiceClient()
+          >>> document = language_service_pb2.Document()
+          >>> encoding_type = enums.EncodingType.NONE
+          >>> response = client.analyze_entities(document, encoding_type)
+
+        Args:
+          document (:class:`google.cloud.proto.language.v1beta2.language_service_pb2.Document`): Input document.
+          encoding_type (enum :class:`google.cloud.gapic.language.v1beta2.enums.EncodingType`): The encoding type used by the API to calculate offsets.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          A :class:`google.cloud.proto.language.v1beta2.language_service_pb2.AnalyzeEntitiesResponse` instance.
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        # Create the request object.
+        request = language_service_pb2.AnalyzeEntitiesRequest(
+            document=document, encoding_type=encoding_type)
+        return self._analyze_entities(request, options)
+
+    def analyze_entity_sentiment(self, document, encoding_type, options=None):
+        """
+        Finds entities, similar to ``AnalyzeEntities`` in the text and analyzes
+        sentiment associated with each entity and its mentions.
+
+        Example:
+          >>> from google.cloud.gapic.language.v1beta2 import language_service_client
+          >>> from google.cloud.gapic.language.v1beta2 import enums
+          >>> from google.cloud.proto.language.v1beta2 import language_service_pb2
+          >>> client = language_service_client.LanguageServiceClient()
+          >>> document = language_service_pb2.Document()
+          >>> encoding_type = enums.EncodingType.NONE
+          >>> response = client.analyze_entity_sentiment(document, encoding_type)
+
+        Args:
+          document (:class:`google.cloud.proto.language.v1beta2.language_service_pb2.Document`): Input document.
+          encoding_type (enum :class:`google.cloud.gapic.language.v1beta2.enums.EncodingType`): The encoding type used by the API to calculate offsets.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          A :class:`google.cloud.proto.language.v1beta2.language_service_pb2.AnalyzeEntitySentimentResponse` instance.
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        # Create the request object.
+        request = language_service_pb2.AnalyzeEntitySentimentRequest(
+            document=document, encoding_type=encoding_type)
+        return self._analyze_entity_sentiment(request, options)
+
+    def analyze_syntax(self, document, encoding_type, options=None):
+        """
+        Analyzes the syntax of the text and provides sentence boundaries and
+        tokenization along with part of speech tags, dependency trees, and other
+        properties.
+
+        Example:
+          >>> from google.cloud.gapic.language.v1beta2 import language_service_client
+          >>> from google.cloud.gapic.language.v1beta2 import enums
+          >>> from google.cloud.proto.language.v1beta2 import language_service_pb2
+          >>> client = language_service_client.LanguageServiceClient()
+          >>> document = language_service_pb2.Document()
+          >>> encoding_type = enums.EncodingType.NONE
+          >>> response = client.analyze_syntax(document, encoding_type)
+
+        Args:
+          document (:class:`google.cloud.proto.language.v1beta2.language_service_pb2.Document`): Input document.
+          encoding_type (enum :class:`google.cloud.gapic.language.v1beta2.enums.EncodingType`): The encoding type used by the API to calculate offsets.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          A :class:`google.cloud.proto.language.v1beta2.language_service_pb2.AnalyzeSyntaxResponse` instance.
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        # Create the request object.
+        request = language_service_pb2.AnalyzeSyntaxRequest(
+            document=document, encoding_type=encoding_type)
+        return self._analyze_syntax(request, options)
+
+    def annotate_text(self, document, features, encoding_type, options=None):
+        """
+        A convenience method that provides all syntax, sentiment, and entity
+        features in one call.
+
+        Example:
+          >>> from google.cloud.gapic.language.v1beta2 import language_service_client
+          >>> from google.cloud.gapic.language.v1beta2 import enums
+          >>> from google.cloud.proto.language.v1beta2 import language_service_pb2
+          >>> client = language_service_client.LanguageServiceClient()
+          >>> document = language_service_pb2.Document()
+          >>> features = language_service_pb2.AnnotateTextRequest.Features()
+          >>> encoding_type = enums.EncodingType.NONE
+          >>> response = client.annotate_text(document, features, encoding_type)
+
+        Args:
+          document (:class:`google.cloud.proto.language.v1beta2.language_service_pb2.Document`): Input document.
+          features (:class:`google.cloud.proto.language.v1beta2.language_service_pb2.AnnotateTextRequest.Features`): The enabled features.
+          encoding_type (enum :class:`google.cloud.gapic.language.v1beta2.enums.EncodingType`): The encoding type used by the API to calculate offsets.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          A :class:`google.cloud.proto.language.v1beta2.language_service_pb2.AnnotateTextResponse` instance.
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        # Create the request object.
+        request = language_service_pb2.AnnotateTextRequest(
+            document=document, features=features, encoding_type=encoding_type)
+        return self._annotate_text(request, options)
diff --git a/language/google/cloud/gapic/language/v1beta2/language_service_client_config.json b/language/google/cloud/gapic/language/v1beta2/language_service_client_config.json
new file mode 100644
index 0000000000000..8018f8a7bbf5b
--- /dev/null
+++ b/language/google/cloud/gapic/language/v1beta2/language_service_client_config.json
@@ -0,0 +1,51 @@
+{
+  "interfaces": {
+    "google.cloud.language.v1beta2.LanguageService": {
+      "retry_codes": {
+        "idempotent": [
+          "DEADLINE_EXCEEDED",
+          "UNAVAILABLE"
+        ],
+        "non_idempotent": []
+      },
+      "retry_params": {
+        "default": {
+          "initial_retry_delay_millis": 100,
+          "retry_delay_multiplier": 1.3,
+          "max_retry_delay_millis": 60000,
+          "initial_rpc_timeout_millis": 60000,
+          "rpc_timeout_multiplier": 1.0,
+          "max_rpc_timeout_millis": 60000,
+          "total_timeout_millis": 600000
+        }
+      },
+      "methods": {
+        "AnalyzeSentiment": {
+          "timeout_millis": 30000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        },
+        "AnalyzeEntities": {
+          "timeout_millis": 30000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        },
+        "AnalyzeEntitySentiment": {
+          "timeout_millis": 30000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        },
+        "AnalyzeSyntax": {
+          "timeout_millis": 30000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        },
+        "AnnotateText": {
+          "timeout_millis": 30000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        }
+      }
+    }
+  }
+}
diff --git a/language/google/cloud/language/__init__.py b/language/google/cloud/language/__init__.py
index 8cc584b17cb81..8bba28ead7392 100644
--- a/language/google/cloud/language/__init__.py
+++ b/language/google/cloud/language/__init__.py
@@ -12,14 +12,49 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# -----------------------------------------------------------------------------
+# TRANSITION CODE
+# -----------------------------------------------------------------------------
+# The old Language manual layer is now deprecated, but to allow
+# users the time to move from the manual layer to the mostly auto-generated
+# layer, they are both living side by side for a few months.
+#
+# Instantiating the old manual layer (`google.cloud.language.Client`) will
+# issue a DeprecationWarning.
+#
+# When it comes time to remove the old layer, everything in this directory
+# should go away EXCEPT __init__.py (which can be renamed to language.py and
+# put one directory above).
+#
+# Additionally, the import and export of `Client`, `Document`, and `Encoding`
+# should be removed from this file (along with this note), and the rest should
+# be left intact.
+# -----------------------------------------------------------------------------
+
 """Client library for Google Cloud Natural Language API."""
 
+from __future__ import absolute_import
 
 from pkg_resources import get_distribution
 __version__ = get_distribution('google-cloud-language').version
 
+from google.cloud.language_v1 import *  # noqa
+
 from google.cloud.language.client import Client
 from google.cloud.language.document import Document
 from google.cloud.language.document import Encoding
 
-__all__ = ['Client', 'Document', 'Encoding', '__version__']
+__all__ = (
+    # Common
+    '__version__',
+
+    # Manual Layer
+    'Client',
+    'Document',
+    'Encoding',
+
+    # Auto-gen
+    'enums',
+    'LanguageServiceClient',
+    'types',
+)
diff --git a/language/google/cloud/language/client.py b/language/google/cloud/language/client.py
index da6ea90c156b8..58066443c8446 100644
--- a/language/google/cloud/language/client.py
+++ b/language/google/cloud/language/client.py
@@ -52,6 +52,16 @@ class Client(client_module.Client):
     }
 
     def __init__(self, credentials=None, api_version='v1', _http=None):
+
+        # Add a deprecation warning for this class.
+        warnings.warn(
+            'This client class and objects that derive from it have been '
+            'deprecated. Use `google.cloud.language.LanguageServiceClient` '
+            '(provided by this package) instead. This client will be removed '
+            'in a future release.',
+            DeprecationWarning,
+        )
+
         super(Client, self).__init__(
             credentials=credentials, _http=_http)
         ConnectionClass = self._CONNECTION_CLASSES[api_version]
diff --git a/language/google/cloud/language_v1/__init__.py b/language/google/cloud/language_v1/__init__.py
new file mode 100644
index 0000000000000..a5666eadb5c70
--- /dev/null
+++ b/language/google/cloud/language_v1/__init__.py
@@ -0,0 +1,30 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+
+from google.cloud.gapic.language.v1 import language_service_client as lsc
+from google.cloud.gapic.language.v1 import enums
+
+from google.cloud.language_v1 import types
+
+
+LanguageServiceClient = lsc.LanguageServiceClient
+
+
+__all__ = (
+    'enums',
+    'LanguageServiceClient',
+    'types',
+)
diff --git a/language/google/cloud/language_v1/types.py b/language/google/cloud/language_v1/types.py
new file mode 100644
index 0000000000000..6223f6846e099
--- /dev/null
+++ b/language/google/cloud/language_v1/types.py
@@ -0,0 +1,30 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+import sys
+
+from google.cloud.proto.language.v1 import language_service_pb2
+
+from google.gax.utils.messages import get_messages
+
+
+names = []
+for name, message in get_messages(language_service_pb2).items():
+    message.__module__ = 'google.cloud.language_v1.types'
+    setattr(sys.modules[__name__], name, message)
+    names.append(name)
+
+
+__all__ = tuple(sorted(names))
diff --git a/language/google/cloud/language_v1beta2/__init__.py b/language/google/cloud/language_v1beta2/__init__.py
new file mode 100644
index 0000000000000..e0a3e4cc287a1
--- /dev/null
+++ b/language/google/cloud/language_v1beta2/__init__.py
@@ -0,0 +1,30 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+
+from google.cloud.gapic.language.v1beta2 import language_service_client as lsc
+from google.cloud.gapic.language.v1beta2 import enums
+
+from google.cloud.language_v1beta2 import types
+
+
+LanguageServiceClient = lsc.LanguageServiceClient
+
+
+__all__ = (
+    'enums',
+    'LanguageServiceClient',
+    'types',
+)
diff --git a/language/google/cloud/language_v1beta2/types.py b/language/google/cloud/language_v1beta2/types.py
new file mode 100644
index 0000000000000..557d05aeb0019
--- /dev/null
+++ b/language/google/cloud/language_v1beta2/types.py
@@ -0,0 +1,30 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+import sys
+
+from google.cloud.proto.language.v1beta2 import language_service_pb2
+
+from google.gax.utils.messages import get_messages
+
+
+names = []
+for name, message in get_messages(language_service_pb2).items():
+    message.__module__ = 'google.cloud.language_v1beta2.types'
+    setattr(sys.modules[__name__], name, message)
+    names.append(name)
+
+
+__all__ = tuple(sorted(names))
diff --git a/language/google/cloud/proto/__init__.py b/language/google/cloud/proto/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/language/google/cloud/proto/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/language/google/cloud/proto/language/__init__.py b/language/google/cloud/proto/language/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/language/google/cloud/proto/language/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/language/google/cloud/proto/language/v1/__init__.py b/language/google/cloud/proto/language/v1/__init__.py
new file mode 100644
index 0000000000000..8b137891791fe
--- /dev/null
+++ b/language/google/cloud/proto/language/v1/__init__.py
@@ -0,0 +1 @@
+
diff --git a/language/google/cloud/proto/language/v1/language_service_pb2.py b/language/google/cloud/proto/language/v1/language_service_pb2.py
new file mode 100644
index 0000000000000..98d59f56272c0
--- /dev/null
+++ b/language/google/cloud/proto/language/v1/language_service_pb2.py
@@ -0,0 +1,2647 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: google/cloud/proto/language/v1/language_service.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf.internal import enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf import descriptor_pb2
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='google/cloud/proto/language/v1/language_service.proto',
+  package='google.cloud.language.v1',
+  syntax='proto3',
+  serialized_pb=_b('\n5google/cloud/proto/language/v1/language_service.proto\x12\x18google.cloud.language.v1\x1a\x1cgoogle/api/annotations.proto\"\xc3\x01\n\x08\x44ocument\x12\x35\n\x04type\x18\x01 \x01(\x0e\x32\'.google.cloud.language.v1.Document.Type\x12\x11\n\x07\x63ontent\x18\x02 \x01(\tH\x00\x12\x19\n\x0fgcs_content_uri\x18\x03 \x01(\tH\x00\x12\x10\n\x08language\x18\x04 \x01(\t\"6\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x0e\n\nPLAIN_TEXT\x10\x01\x12\x08\n\x04HTML\x10\x02\x42\x08\n\x06source\"t\n\x08Sentence\x12\x30\n\x04text\x18\x01 \x01(\x0b\x32\".google.cloud.language.v1.TextSpan\x12\x36\n\tsentiment\x18\x02 \x01(\x0b\x32#.google.cloud.language.v1.Sentiment\"\x86\x03\n\x06\x45ntity\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x33\n\x04type\x18\x02 \x01(\x0e\x32%.google.cloud.language.v1.Entity.Type\x12@\n\x08metadata\x18\x03 \x03(\x0b\x32..google.cloud.language.v1.Entity.MetadataEntry\x12\x10\n\x08salience\x18\x04 \x01(\x02\x12\x39\n\x08mentions\x18\x05 \x03(\x0b\x32\'.google.cloud.language.v1.EntityMention\x1a/\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"y\n\x04Type\x12\x0b\n\x07UNKNOWN\x10\x00\x12\n\n\x06PERSON\x10\x01\x12\x0c\n\x08LOCATION\x10\x02\x12\x10\n\x0cORGANIZATION\x10\x03\x12\t\n\x05\x45VENT\x10\x04\x12\x0f\n\x0bWORK_OF_ART\x10\x05\x12\x11\n\rCONSUMER_GOOD\x10\x06\x12\t\n\x05OTHER\x10\x07\"\xcb\x01\n\x05Token\x12\x30\n\x04text\x18\x01 \x01(\x0b\x32\".google.cloud.language.v1.TextSpan\x12>\n\x0epart_of_speech\x18\x02 \x01(\x0b\x32&.google.cloud.language.v1.PartOfSpeech\x12\x41\n\x0f\x64\x65pendency_edge\x18\x03 \x01(\x0b\x32(.google.cloud.language.v1.DependencyEdge\x12\r\n\x05lemma\x18\x04 \x01(\t\"-\n\tSentiment\x12\x11\n\tmagnitude\x18\x02 \x01(\x02\x12\r\n\x05score\x18\x03 \x01(\x02\"\xa3\x10\n\x0cPartOfSpeech\x12\x37\n\x03tag\x18\x01 \x01(\x0e\x32*.google.cloud.language.v1.PartOfSpeech.Tag\x12=\n\x06\x61spect\x18\x02 \x01(\x0e\x32-.google.cloud.language.v1.PartOfSpeech.Aspect\x12\x39\n\x04\x63\x61se\x18\x03 \x01(\x0e\x32+.google.cloud.language.v1.PartOfSpeech.Case\x12\x39\n\x04\x66orm\x18\x04 \x01(\x0e\x32+.google.cloud.language.v1.PartOfSpeech.Form\x12=\n\x06gender\x18\x05 \x01(\x0e\x32-.google.cloud.language.v1.PartOfSpeech.Gender\x12\x39\n\x04mood\x18\x06 \x01(\x0e\x32+.google.cloud.language.v1.PartOfSpeech.Mood\x12=\n\x06number\x18\x07 \x01(\x0e\x32-.google.cloud.language.v1.PartOfSpeech.Number\x12=\n\x06person\x18\x08 \x01(\x0e\x32-.google.cloud.language.v1.PartOfSpeech.Person\x12=\n\x06proper\x18\t \x01(\x0e\x32-.google.cloud.language.v1.PartOfSpeech.Proper\x12G\n\x0breciprocity\x18\n \x01(\x0e\x32\x32.google.cloud.language.v1.PartOfSpeech.Reciprocity\x12;\n\x05tense\x18\x0b \x01(\x0e\x32,.google.cloud.language.v1.PartOfSpeech.Tense\x12;\n\x05voice\x18\x0c \x01(\x0e\x32,.google.cloud.language.v1.PartOfSpeech.Voice\"\x8d\x01\n\x03Tag\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x07\n\x03\x41\x44J\x10\x01\x12\x07\n\x03\x41\x44P\x10\x02\x12\x07\n\x03\x41\x44V\x10\x03\x12\x08\n\x04\x43ONJ\x10\x04\x12\x07\n\x03\x44\x45T\x10\x05\x12\x08\n\x04NOUN\x10\x06\x12\x07\n\x03NUM\x10\x07\x12\x08\n\x04PRON\x10\x08\x12\x07\n\x03PRT\x10\t\x12\t\n\x05PUNCT\x10\n\x12\x08\n\x04VERB\x10\x0b\x12\x05\n\x01X\x10\x0c\x12\t\n\x05\x41\x46\x46IX\x10\r\"O\n\x06\x41spect\x12\x12\n\x0e\x41SPECT_UNKNOWN\x10\x00\x12\x0e\n\nPERFECTIVE\x10\x01\x12\x10\n\x0cIMPERFECTIVE\x10\x02\x12\x0f\n\x0bPROGRESSIVE\x10\x03\"\xf8\x01\n\x04\x43\x61se\x12\x10\n\x0c\x43\x41SE_UNKNOWN\x10\x00\x12\x0e\n\nACCUSATIVE\x10\x01\x12\r\n\tADVERBIAL\x10\x02\x12\x11\n\rCOMPLEMENTIVE\x10\x03\x12\n\n\x06\x44\x41TIVE\x10\x04\x12\x0c\n\x08GENITIVE\x10\x05\x12\x10\n\x0cINSTRUMENTAL\x10\x06\x12\x0c\n\x08LOCATIVE\x10\x07\x12\x0e\n\nNOMINATIVE\x10\x08\x12\x0b\n\x07OBLIQUE\x10\t\x12\r\n\tPARTITIVE\x10\n\x12\x11\n\rPREPOSITIONAL\x10\x0b\x12\x12\n\x0eREFLEXIVE_CASE\x10\x0c\x12\x11\n\rRELATIVE_CASE\x10\r\x12\x0c\n\x08VOCATIVE\x10\x0e\"\xaf\x01\n\x04\x46orm\x12\x10\n\x0c\x46ORM_UNKNOWN\x10\x00\x12\x0c\n\x08\x41\x44NOMIAL\x10\x01\x12\r\n\tAUXILIARY\x10\x02\x12\x12\n\x0e\x43OMPLEMENTIZER\x10\x03\x12\x10\n\x0c\x46INAL_ENDING\x10\x04\x12\n\n\x06GERUND\x10\x05\x12\n\n\x06REALIS\x10\x06\x12\x0c\n\x08IRREALIS\x10\x07\x12\t\n\x05SHORT\x10\x08\x12\x08\n\x04LONG\x10\t\x12\t\n\x05ORDER\x10\n\x12\x0c\n\x08SPECIFIC\x10\x0b\"E\n\x06Gender\x12\x12\n\x0eGENDER_UNKNOWN\x10\x00\x12\x0c\n\x08\x46\x45MININE\x10\x01\x12\r\n\tMASCULINE\x10\x02\x12\n\n\x06NEUTER\x10\x03\"\x7f\n\x04Mood\x12\x10\n\x0cMOOD_UNKNOWN\x10\x00\x12\x14\n\x10\x43ONDITIONAL_MOOD\x10\x01\x12\x0e\n\nIMPERATIVE\x10\x02\x12\x0e\n\nINDICATIVE\x10\x03\x12\x11\n\rINTERROGATIVE\x10\x04\x12\x0b\n\x07JUSSIVE\x10\x05\x12\x0f\n\x0bSUBJUNCTIVE\x10\x06\"@\n\x06Number\x12\x12\n\x0eNUMBER_UNKNOWN\x10\x00\x12\x0c\n\x08SINGULAR\x10\x01\x12\n\n\x06PLURAL\x10\x02\x12\x08\n\x04\x44UAL\x10\x03\"T\n\x06Person\x12\x12\n\x0ePERSON_UNKNOWN\x10\x00\x12\t\n\x05\x46IRST\x10\x01\x12\n\n\x06SECOND\x10\x02\x12\t\n\x05THIRD\x10\x03\x12\x14\n\x10REFLEXIVE_PERSON\x10\x04\"8\n\x06Proper\x12\x12\n\x0ePROPER_UNKNOWN\x10\x00\x12\n\n\x06PROPER\x10\x01\x12\x0e\n\nNOT_PROPER\x10\x02\"J\n\x0bReciprocity\x12\x17\n\x13RECIPROCITY_UNKNOWN\x10\x00\x12\x0e\n\nRECIPROCAL\x10\x01\x12\x12\n\x0eNON_RECIPROCAL\x10\x02\"s\n\x05Tense\x12\x11\n\rTENSE_UNKNOWN\x10\x00\x12\x15\n\x11\x43ONDITIONAL_TENSE\x10\x01\x12\n\n\x06\x46UTURE\x10\x02\x12\x08\n\x04PAST\x10\x03\x12\x0b\n\x07PRESENT\x10\x04\x12\r\n\tIMPERFECT\x10\x05\x12\x0e\n\nPLUPERFECT\x10\x06\"B\n\x05Voice\x12\x11\n\rVOICE_UNKNOWN\x10\x00\x12\n\n\x06\x41\x43TIVE\x10\x01\x12\r\n\tCAUSATIVE\x10\x02\x12\x0b\n\x07PASSIVE\x10\x03\"\xd8\x07\n\x0e\x44\x65pendencyEdge\x12\x18\n\x10head_token_index\x18\x01 \x01(\x05\x12=\n\x05label\x18\x02 \x01(\x0e\x32..google.cloud.language.v1.DependencyEdge.Label\"\xec\x06\n\x05Label\x12\x0b\n\x07UNKNOWN\x10\x00\x12\n\n\x06\x41\x42\x42REV\x10\x01\x12\t\n\x05\x41\x43OMP\x10\x02\x12\t\n\x05\x41\x44VCL\x10\x03\x12\n\n\x06\x41\x44VMOD\x10\x04\x12\x08\n\x04\x41MOD\x10\x05\x12\t\n\x05\x41PPOS\x10\x06\x12\x08\n\x04\x41TTR\x10\x07\x12\x07\n\x03\x41UX\x10\x08\x12\x0b\n\x07\x41UXPASS\x10\t\x12\x06\n\x02\x43\x43\x10\n\x12\t\n\x05\x43\x43OMP\x10\x0b\x12\x08\n\x04\x43ONJ\x10\x0c\x12\t\n\x05\x43SUBJ\x10\r\x12\r\n\tCSUBJPASS\x10\x0e\x12\x07\n\x03\x44\x45P\x10\x0f\x12\x07\n\x03\x44\x45T\x10\x10\x12\r\n\tDISCOURSE\x10\x11\x12\x08\n\x04\x44OBJ\x10\x12\x12\x08\n\x04\x45XPL\x10\x13\x12\x0c\n\x08GOESWITH\x10\x14\x12\x08\n\x04IOBJ\x10\x15\x12\x08\n\x04MARK\x10\x16\x12\x07\n\x03MWE\x10\x17\x12\x07\n\x03MWV\x10\x18\x12\x07\n\x03NEG\x10\x19\x12\x06\n\x02NN\x10\x1a\x12\x0c\n\x08NPADVMOD\x10\x1b\x12\t\n\x05NSUBJ\x10\x1c\x12\r\n\tNSUBJPASS\x10\x1d\x12\x07\n\x03NUM\x10\x1e\x12\n\n\x06NUMBER\x10\x1f\x12\x05\n\x01P\x10 \x12\r\n\tPARATAXIS\x10!\x12\x0b\n\x07PARTMOD\x10\"\x12\t\n\x05PCOMP\x10#\x12\x08\n\x04POBJ\x10$\x12\x08\n\x04POSS\x10%\x12\x0b\n\x07POSTNEG\x10&\x12\x0b\n\x07PRECOMP\x10\'\x12\x0b\n\x07PRECONJ\x10(\x12\n\n\x06PREDET\x10)\x12\x08\n\x04PREF\x10*\x12\x08\n\x04PREP\x10+\x12\t\n\x05PRONL\x10,\x12\x07\n\x03PRT\x10-\x12\x06\n\x02PS\x10.\x12\x0c\n\x08QUANTMOD\x10/\x12\t\n\x05RCMOD\x10\x30\x12\x0c\n\x08RCMODREL\x10\x31\x12\t\n\x05RDROP\x10\x32\x12\x07\n\x03REF\x10\x33\x12\x0b\n\x07REMNANT\x10\x34\x12\x0e\n\nREPARANDUM\x10\x35\x12\x08\n\x04ROOT\x10\x36\x12\x08\n\x04SNUM\x10\x37\x12\x08\n\x04SUFF\x10\x38\x12\x08\n\x04TMOD\x10\x39\x12\t\n\x05TOPIC\x10:\x12\x08\n\x04VMOD\x10;\x12\x0c\n\x08VOCATIVE\x10<\x12\t\n\x05XCOMP\x10=\x12\n\n\x06SUFFIX\x10>\x12\t\n\x05TITLE\x10?\x12\x0c\n\x08\x41\x44VPHMOD\x10@\x12\x0b\n\x07\x41UXCAUS\x10\x41\x12\t\n\x05\x41UXVV\x10\x42\x12\t\n\x05\x44TMOD\x10\x43\x12\x0b\n\x07\x46OREIGN\x10\x44\x12\x06\n\x02KW\x10\x45\x12\x08\n\x04LIST\x10\x46\x12\x08\n\x04NOMC\x10G\x12\x0c\n\x08NOMCSUBJ\x10H\x12\x10\n\x0cNOMCSUBJPASS\x10I\x12\x08\n\x04NUMC\x10J\x12\x07\n\x03\x43OP\x10K\x12\x0e\n\nDISLOCATED\x10L\"\xaf\x01\n\rEntityMention\x12\x30\n\x04text\x18\x01 \x01(\x0b\x32\".google.cloud.language.v1.TextSpan\x12:\n\x04type\x18\x02 \x01(\x0e\x32,.google.cloud.language.v1.EntityMention.Type\"0\n\x04Type\x12\x10\n\x0cTYPE_UNKNOWN\x10\x00\x12\n\n\x06PROPER\x10\x01\x12\n\n\x06\x43OMMON\x10\x02\"1\n\x08TextSpan\x12\x0f\n\x07\x63ontent\x18\x01 \x01(\t\x12\x14\n\x0c\x62\x65gin_offset\x18\x02 \x01(\x05\"\x8e\x01\n\x17\x41nalyzeSentimentRequest\x12\x34\n\x08\x64ocument\x18\x01 \x01(\x0b\x32\".google.cloud.language.v1.Document\x12=\n\rencoding_type\x18\x02 \x01(\x0e\x32&.google.cloud.language.v1.EncodingType\"\xa4\x01\n\x18\x41nalyzeSentimentResponse\x12?\n\x12\x64ocument_sentiment\x18\x01 \x01(\x0b\x32#.google.cloud.language.v1.Sentiment\x12\x10\n\x08language\x18\x02 \x01(\t\x12\x35\n\tsentences\x18\x03 \x03(\x0b\x32\".google.cloud.language.v1.Sentence\"\x8d\x01\n\x16\x41nalyzeEntitiesRequest\x12\x34\n\x08\x64ocument\x18\x01 \x01(\x0b\x32\".google.cloud.language.v1.Document\x12=\n\rencoding_type\x18\x02 \x01(\x0e\x32&.google.cloud.language.v1.EncodingType\"_\n\x17\x41nalyzeEntitiesResponse\x12\x32\n\x08\x65ntities\x18\x01 \x03(\x0b\x32 .google.cloud.language.v1.Entity\x12\x10\n\x08language\x18\x02 \x01(\t\"\x8b\x01\n\x14\x41nalyzeSyntaxRequest\x12\x34\n\x08\x64ocument\x18\x01 \x01(\x0b\x32\".google.cloud.language.v1.Document\x12=\n\rencoding_type\x18\x02 \x01(\x0e\x32&.google.cloud.language.v1.EncodingType\"\x91\x01\n\x15\x41nalyzeSyntaxResponse\x12\x35\n\tsentences\x18\x01 \x03(\x0b\x32\".google.cloud.language.v1.Sentence\x12/\n\x06tokens\x18\x02 \x03(\x0b\x32\x1f.google.cloud.language.v1.Token\x12\x10\n\x08language\x18\x03 \x01(\t\"\xb6\x02\n\x13\x41nnotateTextRequest\x12\x34\n\x08\x64ocument\x18\x01 \x01(\x0b\x32\".google.cloud.language.v1.Document\x12H\n\x08\x66\x65\x61tures\x18\x02 \x01(\x0b\x32\x36.google.cloud.language.v1.AnnotateTextRequest.Features\x12=\n\rencoding_type\x18\x03 \x01(\x0e\x32&.google.cloud.language.v1.EncodingType\x1a`\n\x08\x46\x65\x61tures\x12\x16\n\x0e\x65xtract_syntax\x18\x01 \x01(\x08\x12\x18\n\x10\x65xtract_entities\x18\x02 \x01(\x08\x12\"\n\x1a\x65xtract_document_sentiment\x18\x03 \x01(\x08\"\x85\x02\n\x14\x41nnotateTextResponse\x12\x35\n\tsentences\x18\x01 \x03(\x0b\x32\".google.cloud.language.v1.Sentence\x12/\n\x06tokens\x18\x02 \x03(\x0b\x32\x1f.google.cloud.language.v1.Token\x12\x32\n\x08\x65ntities\x18\x03 \x03(\x0b\x32 .google.cloud.language.v1.Entity\x12?\n\x12\x64ocument_sentiment\x18\x04 \x01(\x0b\x32#.google.cloud.language.v1.Sentiment\x12\x10\n\x08language\x18\x05 \x01(\t*8\n\x0c\x45ncodingType\x12\x08\n\x04NONE\x10\x00\x12\x08\n\x04UTF8\x10\x01\x12\t\n\x05UTF16\x10\x02\x12\t\n\x05UTF32\x10\x03\x32\x8d\x05\n\x0fLanguageService\x12\xa4\x01\n\x10\x41nalyzeSentiment\x12\x31.google.cloud.language.v1.AnalyzeSentimentRequest\x1a\x32.google.cloud.language.v1.AnalyzeSentimentResponse\")\x82\xd3\xe4\x93\x02#\"\x1e/v1/documents:analyzeSentiment:\x01*\x12\xa0\x01\n\x0f\x41nalyzeEntities\x12\x30.google.cloud.language.v1.AnalyzeEntitiesRequest\x1a\x31.google.cloud.language.v1.AnalyzeEntitiesResponse\"(\x82\xd3\xe4\x93\x02\"\"\x1d/v1/documents:analyzeEntities:\x01*\x12\x98\x01\n\rAnalyzeSyntax\x12..google.cloud.language.v1.AnalyzeSyntaxRequest\x1a/.google.cloud.language.v1.AnalyzeSyntaxResponse\"&\x82\xd3\xe4\x93\x02 \"\x1b/v1/documents:analyzeSyntax:\x01*\x12\x94\x01\n\x0c\x41nnotateText\x12-.google.cloud.language.v1.AnnotateTextRequest\x1a..google.cloud.language.v1.AnnotateTextResponse\"%\x82\xd3\xe4\x93\x02\x1f\"\x1a/v1/documents:annotateText:\x01*Bx\n\x1c\x63om.google.cloud.language.v1B\x14LanguageServiceProtoP\x01Z@google.golang.org/genproto/googleapis/cloud/language/v1;languageb\x06proto3')
+  ,
+  dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,])
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+_ENCODINGTYPE = _descriptor.EnumDescriptor(
+  name='EncodingType',
+  full_name='google.cloud.language.v1.EncodingType',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='NONE', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='UTF8', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='UTF16', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='UTF32', index=3, number=3,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=5797,
+  serialized_end=5853,
+)
+_sym_db.RegisterEnumDescriptor(_ENCODINGTYPE)
+
+EncodingType = enum_type_wrapper.EnumTypeWrapper(_ENCODINGTYPE)
+NONE = 0
+UTF8 = 1
+UTF16 = 2
+UTF32 = 3
+
+
+_DOCUMENT_TYPE = _descriptor.EnumDescriptor(
+  name='Type',
+  full_name='google.cloud.language.v1.Document.Type',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='TYPE_UNSPECIFIED', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PLAIN_TEXT', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='HTML', index=2, number=2,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=245,
+  serialized_end=299,
+)
+_sym_db.RegisterEnumDescriptor(_DOCUMENT_TYPE)
+
+_ENTITY_TYPE = _descriptor.EnumDescriptor(
+  name='Type',
+  full_name='google.cloud.language.v1.Entity.Type',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PERSON', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LOCATION', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ORGANIZATION', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='EVENT', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='WORK_OF_ART', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CONSUMER_GOOD', index=6, number=6,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='OTHER', index=7, number=7,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=699,
+  serialized_end=820,
+)
+_sym_db.RegisterEnumDescriptor(_ENTITY_TYPE)
+
+_PARTOFSPEECH_TAG = _descriptor.EnumDescriptor(
+  name='Tag',
+  full_name='google.cloud.language.v1.PartOfSpeech.Tag',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADJ', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADP', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADV', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CONJ', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DET', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOUN', index=6, number=6,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NUM', index=7, number=7,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRON', index=8, number=8,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRT', index=9, number=9,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PUNCT', index=10, number=10,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='VERB', index=11, number=11,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='X', index=12, number=12,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AFFIX', index=13, number=13,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=1837,
+  serialized_end=1978,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_TAG)
+
+_PARTOFSPEECH_ASPECT = _descriptor.EnumDescriptor(
+  name='Aspect',
+  full_name='google.cloud.language.v1.PartOfSpeech.Aspect',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='ASPECT_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PERFECTIVE', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='IMPERFECTIVE', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PROGRESSIVE', index=3, number=3,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=1980,
+  serialized_end=2059,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_ASPECT)
+
+_PARTOFSPEECH_CASE = _descriptor.EnumDescriptor(
+  name='Case',
+  full_name='google.cloud.language.v1.PartOfSpeech.Case',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='CASE_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ACCUSATIVE', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADVERBIAL', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='COMPLEMENTIVE', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DATIVE', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='GENITIVE', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='INSTRUMENTAL', index=6, number=6,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LOCATIVE', index=7, number=7,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOMINATIVE', index=8, number=8,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='OBLIQUE', index=9, number=9,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PARTITIVE', index=10, number=10,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PREPOSITIONAL', index=11, number=11,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='REFLEXIVE_CASE', index=12, number=12,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RELATIVE_CASE', index=13, number=13,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='VOCATIVE', index=14, number=14,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2062,
+  serialized_end=2310,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_CASE)
+
+_PARTOFSPEECH_FORM = _descriptor.EnumDescriptor(
+  name='Form',
+  full_name='google.cloud.language.v1.PartOfSpeech.Form',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='FORM_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADNOMIAL', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AUXILIARY', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='COMPLEMENTIZER', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='FINAL_ENDING', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='GERUND', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='REALIS', index=6, number=6,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='IRREALIS', index=7, number=7,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SHORT', index=8, number=8,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LONG', index=9, number=9,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ORDER', index=10, number=10,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SPECIFIC', index=11, number=11,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2313,
+  serialized_end=2488,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_FORM)
+
+_PARTOFSPEECH_GENDER = _descriptor.EnumDescriptor(
+  name='Gender',
+  full_name='google.cloud.language.v1.PartOfSpeech.Gender',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='GENDER_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='FEMININE', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MASCULINE', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NEUTER', index=3, number=3,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2490,
+  serialized_end=2559,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_GENDER)
+
+_PARTOFSPEECH_MOOD = _descriptor.EnumDescriptor(
+  name='Mood',
+  full_name='google.cloud.language.v1.PartOfSpeech.Mood',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='MOOD_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CONDITIONAL_MOOD', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='IMPERATIVE', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='INDICATIVE', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='INTERROGATIVE', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='JUSSIVE', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SUBJUNCTIVE', index=6, number=6,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2561,
+  serialized_end=2688,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_MOOD)
+
+_PARTOFSPEECH_NUMBER = _descriptor.EnumDescriptor(
+  name='Number',
+  full_name='google.cloud.language.v1.PartOfSpeech.Number',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='NUMBER_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SINGULAR', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PLURAL', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DUAL', index=3, number=3,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2690,
+  serialized_end=2754,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_NUMBER)
+
+_PARTOFSPEECH_PERSON = _descriptor.EnumDescriptor(
+  name='Person',
+  full_name='google.cloud.language.v1.PartOfSpeech.Person',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='PERSON_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='FIRST', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SECOND', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='THIRD', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='REFLEXIVE_PERSON', index=4, number=4,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2756,
+  serialized_end=2840,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_PERSON)
+
+_PARTOFSPEECH_PROPER = _descriptor.EnumDescriptor(
+  name='Proper',
+  full_name='google.cloud.language.v1.PartOfSpeech.Proper',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='PROPER_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PROPER', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOT_PROPER', index=2, number=2,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2842,
+  serialized_end=2898,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_PROPER)
+
+_PARTOFSPEECH_RECIPROCITY = _descriptor.EnumDescriptor(
+  name='Reciprocity',
+  full_name='google.cloud.language.v1.PartOfSpeech.Reciprocity',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='RECIPROCITY_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RECIPROCAL', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NON_RECIPROCAL', index=2, number=2,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2900,
+  serialized_end=2974,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_RECIPROCITY)
+
+_PARTOFSPEECH_TENSE = _descriptor.EnumDescriptor(
+  name='Tense',
+  full_name='google.cloud.language.v1.PartOfSpeech.Tense',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='TENSE_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CONDITIONAL_TENSE', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='FUTURE', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PAST', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRESENT', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='IMPERFECT', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PLUPERFECT', index=6, number=6,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2976,
+  serialized_end=3091,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_TENSE)
+
+_PARTOFSPEECH_VOICE = _descriptor.EnumDescriptor(
+  name='Voice',
+  full_name='google.cloud.language.v1.PartOfSpeech.Voice',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='VOICE_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ACTIVE', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CAUSATIVE', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PASSIVE', index=3, number=3,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=3093,
+  serialized_end=3159,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_VOICE)
+
+_DEPENDENCYEDGE_LABEL = _descriptor.EnumDescriptor(
+  name='Label',
+  full_name='google.cloud.language.v1.DependencyEdge.Label',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ABBREV', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ACOMP', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADVCL', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADVMOD', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AMOD', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='APPOS', index=6, number=6,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ATTR', index=7, number=7,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AUX', index=8, number=8,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AUXPASS', index=9, number=9,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CC', index=10, number=10,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CCOMP', index=11, number=11,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CONJ', index=12, number=12,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CSUBJ', index=13, number=13,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CSUBJPASS', index=14, number=14,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DEP', index=15, number=15,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DET', index=16, number=16,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DISCOURSE', index=17, number=17,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DOBJ', index=18, number=18,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='EXPL', index=19, number=19,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='GOESWITH', index=20, number=20,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='IOBJ', index=21, number=21,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MARK', index=22, number=22,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MWE', index=23, number=23,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MWV', index=24, number=24,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NEG', index=25, number=25,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NN', index=26, number=26,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NPADVMOD', index=27, number=27,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NSUBJ', index=28, number=28,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NSUBJPASS', index=29, number=29,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NUM', index=30, number=30,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NUMBER', index=31, number=31,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='P', index=32, number=32,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PARATAXIS', index=33, number=33,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PARTMOD', index=34, number=34,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PCOMP', index=35, number=35,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POBJ', index=36, number=36,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POSS', index=37, number=37,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POSTNEG', index=38, number=38,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRECOMP', index=39, number=39,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRECONJ', index=40, number=40,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PREDET', index=41, number=41,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PREF', index=42, number=42,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PREP', index=43, number=43,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRONL', index=44, number=44,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRT', index=45, number=45,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PS', index=46, number=46,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='QUANTMOD', index=47, number=47,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RCMOD', index=48, number=48,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RCMODREL', index=49, number=49,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RDROP', index=50, number=50,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='REF', index=51, number=51,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='REMNANT', index=52, number=52,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='REPARANDUM', index=53, number=53,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ROOT', index=54, number=54,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SNUM', index=55, number=55,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SUFF', index=56, number=56,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='TMOD', index=57, number=57,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='TOPIC', index=58, number=58,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='VMOD', index=59, number=59,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='VOCATIVE', index=60, number=60,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='XCOMP', index=61, number=61,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SUFFIX', index=62, number=62,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='TITLE', index=63, number=63,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADVPHMOD', index=64, number=64,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AUXCAUS', index=65, number=65,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AUXVV', index=66, number=66,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DTMOD', index=67, number=67,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='FOREIGN', index=68, number=68,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='KW', index=69, number=69,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LIST', index=70, number=70,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOMC', index=71, number=71,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOMCSUBJ', index=72, number=72,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOMCSUBJPASS', index=73, number=73,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NUMC', index=74, number=74,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='COP', index=75, number=75,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DISLOCATED', index=76, number=76,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=3270,
+  serialized_end=4146,
+)
+_sym_db.RegisterEnumDescriptor(_DEPENDENCYEDGE_LABEL)
+
+_ENTITYMENTION_TYPE = _descriptor.EnumDescriptor(
+  name='Type',
+  full_name='google.cloud.language.v1.EntityMention.Type',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='TYPE_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PROPER', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='COMMON', index=2, number=2,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=4276,
+  serialized_end=4324,
+)
+_sym_db.RegisterEnumDescriptor(_ENTITYMENTION_TYPE)
+
+
+_DOCUMENT = _descriptor.Descriptor(
+  name='Document',
+  full_name='google.cloud.language.v1.Document',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='type', full_name='google.cloud.language.v1.Document.type', index=0,
+      number=1, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='content', full_name='google.cloud.language.v1.Document.content', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='gcs_content_uri', full_name='google.cloud.language.v1.Document.gcs_content_uri', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='language', full_name='google.cloud.language.v1.Document.language', index=3,
+      number=4, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _DOCUMENT_TYPE,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+    _descriptor.OneofDescriptor(
+      name='source', full_name='google.cloud.language.v1.Document.source',
+      index=0, containing_type=None, fields=[]),
+  ],
+  serialized_start=114,
+  serialized_end=309,
+)
+
+
+_SENTENCE = _descriptor.Descriptor(
+  name='Sentence',
+  full_name='google.cloud.language.v1.Sentence',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='text', full_name='google.cloud.language.v1.Sentence.text', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='sentiment', full_name='google.cloud.language.v1.Sentence.sentiment', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=311,
+  serialized_end=427,
+)
+
+
+_ENTITY_METADATAENTRY = _descriptor.Descriptor(
+  name='MetadataEntry',
+  full_name='google.cloud.language.v1.Entity.MetadataEntry',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='key', full_name='google.cloud.language.v1.Entity.MetadataEntry.key', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='value', full_name='google.cloud.language.v1.Entity.MetadataEntry.value', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=650,
+  serialized_end=697,
+)
+
+_ENTITY = _descriptor.Descriptor(
+  name='Entity',
+  full_name='google.cloud.language.v1.Entity',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='name', full_name='google.cloud.language.v1.Entity.name', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='type', full_name='google.cloud.language.v1.Entity.type', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='metadata', full_name='google.cloud.language.v1.Entity.metadata', index=2,
+      number=3, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='salience', full_name='google.cloud.language.v1.Entity.salience', index=3,
+      number=4, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='mentions', full_name='google.cloud.language.v1.Entity.mentions', index=4,
+      number=5, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[_ENTITY_METADATAENTRY, ],
+  enum_types=[
+    _ENTITY_TYPE,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=430,
+  serialized_end=820,
+)
+
+
+_TOKEN = _descriptor.Descriptor(
+  name='Token',
+  full_name='google.cloud.language.v1.Token',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='text', full_name='google.cloud.language.v1.Token.text', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='part_of_speech', full_name='google.cloud.language.v1.Token.part_of_speech', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='dependency_edge', full_name='google.cloud.language.v1.Token.dependency_edge', index=2,
+      number=3, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='lemma', full_name='google.cloud.language.v1.Token.lemma', index=3,
+      number=4, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=823,
+  serialized_end=1026,
+)
+
+
+_SENTIMENT = _descriptor.Descriptor(
+  name='Sentiment',
+  full_name='google.cloud.language.v1.Sentiment',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='magnitude', full_name='google.cloud.language.v1.Sentiment.magnitude', index=0,
+      number=2, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='score', full_name='google.cloud.language.v1.Sentiment.score', index=1,
+      number=3, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1028,
+  serialized_end=1073,
+)
+
+
+_PARTOFSPEECH = _descriptor.Descriptor(
+  name='PartOfSpeech',
+  full_name='google.cloud.language.v1.PartOfSpeech',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='tag', full_name='google.cloud.language.v1.PartOfSpeech.tag', index=0,
+      number=1, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='aspect', full_name='google.cloud.language.v1.PartOfSpeech.aspect', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='case', full_name='google.cloud.language.v1.PartOfSpeech.case', index=2,
+      number=3, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='form', full_name='google.cloud.language.v1.PartOfSpeech.form', index=3,
+      number=4, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='gender', full_name='google.cloud.language.v1.PartOfSpeech.gender', index=4,
+      number=5, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='mood', full_name='google.cloud.language.v1.PartOfSpeech.mood', index=5,
+      number=6, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='number', full_name='google.cloud.language.v1.PartOfSpeech.number', index=6,
+      number=7, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='person', full_name='google.cloud.language.v1.PartOfSpeech.person', index=7,
+      number=8, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='proper', full_name='google.cloud.language.v1.PartOfSpeech.proper', index=8,
+      number=9, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='reciprocity', full_name='google.cloud.language.v1.PartOfSpeech.reciprocity', index=9,
+      number=10, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='tense', full_name='google.cloud.language.v1.PartOfSpeech.tense', index=10,
+      number=11, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='voice', full_name='google.cloud.language.v1.PartOfSpeech.voice', index=11,
+      number=12, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _PARTOFSPEECH_TAG,
+    _PARTOFSPEECH_ASPECT,
+    _PARTOFSPEECH_CASE,
+    _PARTOFSPEECH_FORM,
+    _PARTOFSPEECH_GENDER,
+    _PARTOFSPEECH_MOOD,
+    _PARTOFSPEECH_NUMBER,
+    _PARTOFSPEECH_PERSON,
+    _PARTOFSPEECH_PROPER,
+    _PARTOFSPEECH_RECIPROCITY,
+    _PARTOFSPEECH_TENSE,
+    _PARTOFSPEECH_VOICE,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1076,
+  serialized_end=3159,
+)
+
+
+_DEPENDENCYEDGE = _descriptor.Descriptor(
+  name='DependencyEdge',
+  full_name='google.cloud.language.v1.DependencyEdge',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='head_token_index', full_name='google.cloud.language.v1.DependencyEdge.head_token_index', index=0,
+      number=1, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='label', full_name='google.cloud.language.v1.DependencyEdge.label', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _DEPENDENCYEDGE_LABEL,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=3162,
+  serialized_end=4146,
+)
+
+
+_ENTITYMENTION = _descriptor.Descriptor(
+  name='EntityMention',
+  full_name='google.cloud.language.v1.EntityMention',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='text', full_name='google.cloud.language.v1.EntityMention.text', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='type', full_name='google.cloud.language.v1.EntityMention.type', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _ENTITYMENTION_TYPE,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=4149,
+  serialized_end=4324,
+)
+
+
+_TEXTSPAN = _descriptor.Descriptor(
+  name='TextSpan',
+  full_name='google.cloud.language.v1.TextSpan',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='content', full_name='google.cloud.language.v1.TextSpan.content', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='begin_offset', full_name='google.cloud.language.v1.TextSpan.begin_offset', index=1,
+      number=2, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=4326,
+  serialized_end=4375,
+)
+
+
+_ANALYZESENTIMENTREQUEST = _descriptor.Descriptor(
+  name='AnalyzeSentimentRequest',
+  full_name='google.cloud.language.v1.AnalyzeSentimentRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='document', full_name='google.cloud.language.v1.AnalyzeSentimentRequest.document', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='encoding_type', full_name='google.cloud.language.v1.AnalyzeSentimentRequest.encoding_type', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=4378,
+  serialized_end=4520,
+)
+
+
+_ANALYZESENTIMENTRESPONSE = _descriptor.Descriptor(
+  name='AnalyzeSentimentResponse',
+  full_name='google.cloud.language.v1.AnalyzeSentimentResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='document_sentiment', full_name='google.cloud.language.v1.AnalyzeSentimentResponse.document_sentiment', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='language', full_name='google.cloud.language.v1.AnalyzeSentimentResponse.language', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='sentences', full_name='google.cloud.language.v1.AnalyzeSentimentResponse.sentences', index=2,
+      number=3, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=4523,
+  serialized_end=4687,
+)
+
+
+_ANALYZEENTITIESREQUEST = _descriptor.Descriptor(
+  name='AnalyzeEntitiesRequest',
+  full_name='google.cloud.language.v1.AnalyzeEntitiesRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='document', full_name='google.cloud.language.v1.AnalyzeEntitiesRequest.document', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='encoding_type', full_name='google.cloud.language.v1.AnalyzeEntitiesRequest.encoding_type', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=4690,
+  serialized_end=4831,
+)
+
+
+_ANALYZEENTITIESRESPONSE = _descriptor.Descriptor(
+  name='AnalyzeEntitiesResponse',
+  full_name='google.cloud.language.v1.AnalyzeEntitiesResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='entities', full_name='google.cloud.language.v1.AnalyzeEntitiesResponse.entities', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='language', full_name='google.cloud.language.v1.AnalyzeEntitiesResponse.language', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=4833,
+  serialized_end=4928,
+)
+
+
+_ANALYZESYNTAXREQUEST = _descriptor.Descriptor(
+  name='AnalyzeSyntaxRequest',
+  full_name='google.cloud.language.v1.AnalyzeSyntaxRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='document', full_name='google.cloud.language.v1.AnalyzeSyntaxRequest.document', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='encoding_type', full_name='google.cloud.language.v1.AnalyzeSyntaxRequest.encoding_type', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=4931,
+  serialized_end=5070,
+)
+
+
+_ANALYZESYNTAXRESPONSE = _descriptor.Descriptor(
+  name='AnalyzeSyntaxResponse',
+  full_name='google.cloud.language.v1.AnalyzeSyntaxResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='sentences', full_name='google.cloud.language.v1.AnalyzeSyntaxResponse.sentences', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='tokens', full_name='google.cloud.language.v1.AnalyzeSyntaxResponse.tokens', index=1,
+      number=2, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='language', full_name='google.cloud.language.v1.AnalyzeSyntaxResponse.language', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=5073,
+  serialized_end=5218,
+)
+
+
+_ANNOTATETEXTREQUEST_FEATURES = _descriptor.Descriptor(
+  name='Features',
+  full_name='google.cloud.language.v1.AnnotateTextRequest.Features',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='extract_syntax', full_name='google.cloud.language.v1.AnnotateTextRequest.Features.extract_syntax', index=0,
+      number=1, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='extract_entities', full_name='google.cloud.language.v1.AnnotateTextRequest.Features.extract_entities', index=1,
+      number=2, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='extract_document_sentiment', full_name='google.cloud.language.v1.AnnotateTextRequest.Features.extract_document_sentiment', index=2,
+      number=3, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=5435,
+  serialized_end=5531,
+)
+
+_ANNOTATETEXTREQUEST = _descriptor.Descriptor(
+  name='AnnotateTextRequest',
+  full_name='google.cloud.language.v1.AnnotateTextRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='document', full_name='google.cloud.language.v1.AnnotateTextRequest.document', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='features', full_name='google.cloud.language.v1.AnnotateTextRequest.features', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='encoding_type', full_name='google.cloud.language.v1.AnnotateTextRequest.encoding_type', index=2,
+      number=3, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[_ANNOTATETEXTREQUEST_FEATURES, ],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=5221,
+  serialized_end=5531,
+)
+
+
+_ANNOTATETEXTRESPONSE = _descriptor.Descriptor(
+  name='AnnotateTextResponse',
+  full_name='google.cloud.language.v1.AnnotateTextResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='sentences', full_name='google.cloud.language.v1.AnnotateTextResponse.sentences', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='tokens', full_name='google.cloud.language.v1.AnnotateTextResponse.tokens', index=1,
+      number=2, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='entities', full_name='google.cloud.language.v1.AnnotateTextResponse.entities', index=2,
+      number=3, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='document_sentiment', full_name='google.cloud.language.v1.AnnotateTextResponse.document_sentiment', index=3,
+      number=4, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='language', full_name='google.cloud.language.v1.AnnotateTextResponse.language', index=4,
+      number=5, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=5534,
+  serialized_end=5795,
+)
+
+_DOCUMENT.fields_by_name['type'].enum_type = _DOCUMENT_TYPE
+_DOCUMENT_TYPE.containing_type = _DOCUMENT
+_DOCUMENT.oneofs_by_name['source'].fields.append(
+  _DOCUMENT.fields_by_name['content'])
+_DOCUMENT.fields_by_name['content'].containing_oneof = _DOCUMENT.oneofs_by_name['source']
+_DOCUMENT.oneofs_by_name['source'].fields.append(
+  _DOCUMENT.fields_by_name['gcs_content_uri'])
+_DOCUMENT.fields_by_name['gcs_content_uri'].containing_oneof = _DOCUMENT.oneofs_by_name['source']
+_SENTENCE.fields_by_name['text'].message_type = _TEXTSPAN
+_SENTENCE.fields_by_name['sentiment'].message_type = _SENTIMENT
+_ENTITY_METADATAENTRY.containing_type = _ENTITY
+_ENTITY.fields_by_name['type'].enum_type = _ENTITY_TYPE
+_ENTITY.fields_by_name['metadata'].message_type = _ENTITY_METADATAENTRY
+_ENTITY.fields_by_name['mentions'].message_type = _ENTITYMENTION
+_ENTITY_TYPE.containing_type = _ENTITY
+_TOKEN.fields_by_name['text'].message_type = _TEXTSPAN
+_TOKEN.fields_by_name['part_of_speech'].message_type = _PARTOFSPEECH
+_TOKEN.fields_by_name['dependency_edge'].message_type = _DEPENDENCYEDGE
+_PARTOFSPEECH.fields_by_name['tag'].enum_type = _PARTOFSPEECH_TAG
+_PARTOFSPEECH.fields_by_name['aspect'].enum_type = _PARTOFSPEECH_ASPECT
+_PARTOFSPEECH.fields_by_name['case'].enum_type = _PARTOFSPEECH_CASE
+_PARTOFSPEECH.fields_by_name['form'].enum_type = _PARTOFSPEECH_FORM
+_PARTOFSPEECH.fields_by_name['gender'].enum_type = _PARTOFSPEECH_GENDER
+_PARTOFSPEECH.fields_by_name['mood'].enum_type = _PARTOFSPEECH_MOOD
+_PARTOFSPEECH.fields_by_name['number'].enum_type = _PARTOFSPEECH_NUMBER
+_PARTOFSPEECH.fields_by_name['person'].enum_type = _PARTOFSPEECH_PERSON
+_PARTOFSPEECH.fields_by_name['proper'].enum_type = _PARTOFSPEECH_PROPER
+_PARTOFSPEECH.fields_by_name['reciprocity'].enum_type = _PARTOFSPEECH_RECIPROCITY
+_PARTOFSPEECH.fields_by_name['tense'].enum_type = _PARTOFSPEECH_TENSE
+_PARTOFSPEECH.fields_by_name['voice'].enum_type = _PARTOFSPEECH_VOICE
+_PARTOFSPEECH_TAG.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_ASPECT.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_CASE.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_FORM.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_GENDER.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_MOOD.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_NUMBER.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_PERSON.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_PROPER.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_RECIPROCITY.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_TENSE.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_VOICE.containing_type = _PARTOFSPEECH
+_DEPENDENCYEDGE.fields_by_name['label'].enum_type = _DEPENDENCYEDGE_LABEL
+_DEPENDENCYEDGE_LABEL.containing_type = _DEPENDENCYEDGE
+_ENTITYMENTION.fields_by_name['text'].message_type = _TEXTSPAN
+_ENTITYMENTION.fields_by_name['type'].enum_type = _ENTITYMENTION_TYPE
+_ENTITYMENTION_TYPE.containing_type = _ENTITYMENTION
+_ANALYZESENTIMENTREQUEST.fields_by_name['document'].message_type = _DOCUMENT
+_ANALYZESENTIMENTREQUEST.fields_by_name['encoding_type'].enum_type = _ENCODINGTYPE
+_ANALYZESENTIMENTRESPONSE.fields_by_name['document_sentiment'].message_type = _SENTIMENT
+_ANALYZESENTIMENTRESPONSE.fields_by_name['sentences'].message_type = _SENTENCE
+_ANALYZEENTITIESREQUEST.fields_by_name['document'].message_type = _DOCUMENT
+_ANALYZEENTITIESREQUEST.fields_by_name['encoding_type'].enum_type = _ENCODINGTYPE
+_ANALYZEENTITIESRESPONSE.fields_by_name['entities'].message_type = _ENTITY
+_ANALYZESYNTAXREQUEST.fields_by_name['document'].message_type = _DOCUMENT
+_ANALYZESYNTAXREQUEST.fields_by_name['encoding_type'].enum_type = _ENCODINGTYPE
+_ANALYZESYNTAXRESPONSE.fields_by_name['sentences'].message_type = _SENTENCE
+_ANALYZESYNTAXRESPONSE.fields_by_name['tokens'].message_type = _TOKEN
+_ANNOTATETEXTREQUEST_FEATURES.containing_type = _ANNOTATETEXTREQUEST
+_ANNOTATETEXTREQUEST.fields_by_name['document'].message_type = _DOCUMENT
+_ANNOTATETEXTREQUEST.fields_by_name['features'].message_type = _ANNOTATETEXTREQUEST_FEATURES
+_ANNOTATETEXTREQUEST.fields_by_name['encoding_type'].enum_type = _ENCODINGTYPE
+_ANNOTATETEXTRESPONSE.fields_by_name['sentences'].message_type = _SENTENCE
+_ANNOTATETEXTRESPONSE.fields_by_name['tokens'].message_type = _TOKEN
+_ANNOTATETEXTRESPONSE.fields_by_name['entities'].message_type = _ENTITY
+_ANNOTATETEXTRESPONSE.fields_by_name['document_sentiment'].message_type = _SENTIMENT
+DESCRIPTOR.message_types_by_name['Document'] = _DOCUMENT
+DESCRIPTOR.message_types_by_name['Sentence'] = _SENTENCE
+DESCRIPTOR.message_types_by_name['Entity'] = _ENTITY
+DESCRIPTOR.message_types_by_name['Token'] = _TOKEN
+DESCRIPTOR.message_types_by_name['Sentiment'] = _SENTIMENT
+DESCRIPTOR.message_types_by_name['PartOfSpeech'] = _PARTOFSPEECH
+DESCRIPTOR.message_types_by_name['DependencyEdge'] = _DEPENDENCYEDGE
+DESCRIPTOR.message_types_by_name['EntityMention'] = _ENTITYMENTION
+DESCRIPTOR.message_types_by_name['TextSpan'] = _TEXTSPAN
+DESCRIPTOR.message_types_by_name['AnalyzeSentimentRequest'] = _ANALYZESENTIMENTREQUEST
+DESCRIPTOR.message_types_by_name['AnalyzeSentimentResponse'] = _ANALYZESENTIMENTRESPONSE
+DESCRIPTOR.message_types_by_name['AnalyzeEntitiesRequest'] = _ANALYZEENTITIESREQUEST
+DESCRIPTOR.message_types_by_name['AnalyzeEntitiesResponse'] = _ANALYZEENTITIESRESPONSE
+DESCRIPTOR.message_types_by_name['AnalyzeSyntaxRequest'] = _ANALYZESYNTAXREQUEST
+DESCRIPTOR.message_types_by_name['AnalyzeSyntaxResponse'] = _ANALYZESYNTAXRESPONSE
+DESCRIPTOR.message_types_by_name['AnnotateTextRequest'] = _ANNOTATETEXTREQUEST
+DESCRIPTOR.message_types_by_name['AnnotateTextResponse'] = _ANNOTATETEXTRESPONSE
+DESCRIPTOR.enum_types_by_name['EncodingType'] = _ENCODINGTYPE
+
+Document = _reflection.GeneratedProtocolMessageType('Document', (_message.Message,), dict(
+  DESCRIPTOR = _DOCUMENT,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """Represents the input to API methods.
+  
+  
+  Attributes:
+      type:
+          Required. If the type is not set or is ``TYPE_UNSPECIFIED``,
+          returns an ``INVALID_ARGUMENT`` error.
+      source:
+          The source of the document: a string containing the content or
+          a Google Cloud Storage URI.
+      content:
+          The content of the input in string format.
+      gcs_content_uri:
+          The Google Cloud Storage URI where the file content is
+          located. This URI must be of the form:
+          gs://bucket\_name/object\_name. For more details, see
+          https://cloud.google.com/storage/docs/reference-uris. NOTE:
+          Cloud Storage object versioning is not supported.
+      language:
+          The language of the document (if not specified, the language
+          is automatically detected). Both ISO and BCP-47 language codes
+          are accepted. `Language Support
+          <https://cloud.google.com/natural-language/docs/languages>`__
+          lists currently supported languages for each API method. If
+          the language (either specified by the caller or automatically
+          detected) is not supported by the called API method, an
+          ``INVALID_ARGUMENT`` error is returned.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.Document)
+  ))
+_sym_db.RegisterMessage(Document)
+
+Sentence = _reflection.GeneratedProtocolMessageType('Sentence', (_message.Message,), dict(
+  DESCRIPTOR = _SENTENCE,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """Represents a sentence in the input document.
+  
+  
+  Attributes:
+      text:
+          The sentence text.
+      sentiment:
+          For calls to [AnalyzeSentiment][] or if [AnnotateTextRequest.F
+          eatures.extract\_document\_sentiment][google.cloud.language.v1
+          .AnnotateTextRequest.Features.extract\_document\_sentiment] is
+          set to true, this field will contain the sentiment for the
+          sentence.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.Sentence)
+  ))
+_sym_db.RegisterMessage(Sentence)
+
+Entity = _reflection.GeneratedProtocolMessageType('Entity', (_message.Message,), dict(
+
+  MetadataEntry = _reflection.GeneratedProtocolMessageType('MetadataEntry', (_message.Message,), dict(
+    DESCRIPTOR = _ENTITY_METADATAENTRY,
+    __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+    # @@protoc_insertion_point(class_scope:google.cloud.language.v1.Entity.MetadataEntry)
+    ))
+  ,
+  DESCRIPTOR = _ENTITY,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """Represents a phrase in the text that is a known entity, such as a
+  person, an organization, or location. The API associates information,
+  such as salience and mentions, with entities.
+  
+  
+  Attributes:
+      name:
+          The representative name for the entity.
+      type:
+          The entity type.
+      metadata:
+          Metadata associated with the entity.  Currently, Wikipedia
+          URLs and Knowledge Graph MIDs are provided, if available. The
+          associated keys are "wikipedia\_url" and "mid", respectively.
+      salience:
+          The salience score associated with the entity in the [0, 1.0]
+          range.  The salience score for an entity provides information
+          about the importance or centrality of that entity to the
+          entire document text. Scores closer to 0 are less salient,
+          while scores closer to 1.0 are highly salient.
+      mentions:
+          The mentions of this entity in the input document. The API
+          currently supports proper noun mentions.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.Entity)
+  ))
+_sym_db.RegisterMessage(Entity)
+_sym_db.RegisterMessage(Entity.MetadataEntry)
+
+Token = _reflection.GeneratedProtocolMessageType('Token', (_message.Message,), dict(
+  DESCRIPTOR = _TOKEN,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """Represents the smallest syntactic building block of the text.
+  
+  
+  Attributes:
+      text:
+          The token text.
+      part_of_speech:
+          Parts of speech tag for this token.
+      dependency_edge:
+          Dependency tree parse for this token.
+      lemma:
+          `Lemma
+          <https://en.wikipedia.org/wiki/Lemma_%28morphology%29>`__ of
+          the token.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.Token)
+  ))
+_sym_db.RegisterMessage(Token)
+
+Sentiment = _reflection.GeneratedProtocolMessageType('Sentiment', (_message.Message,), dict(
+  DESCRIPTOR = _SENTIMENT,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """Represents the feeling associated with the entire text or entities in
+  the text.
+  
+  
+  Attributes:
+      magnitude:
+          A non-negative number in the [0, +inf) range, which represents
+          the absolute magnitude of sentiment regardless of score
+          (positive or negative).
+      score:
+          Sentiment score between -1.0 (negative sentiment) and 1.0
+          (positive sentiment).
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.Sentiment)
+  ))
+_sym_db.RegisterMessage(Sentiment)
+
+PartOfSpeech = _reflection.GeneratedProtocolMessageType('PartOfSpeech', (_message.Message,), dict(
+  DESCRIPTOR = _PARTOFSPEECH,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """Represents part of speech information for a token. Parts of speech are
+  as defined in
+  http://www.lrec-conf.org/proceedings/lrec2012/pdf/274\_Paper.pdf
+  
+  
+  Attributes:
+      tag:
+          The part of speech tag.
+      aspect:
+          The grammatical aspect.
+      case:
+          The grammatical case.
+      form:
+          The grammatical form.
+      gender:
+          The grammatical gender.
+      mood:
+          The grammatical mood.
+      number:
+          The grammatical number.
+      person:
+          The grammatical person.
+      proper:
+          The grammatical properness.
+      reciprocity:
+          The grammatical reciprocity.
+      tense:
+          The grammatical tense.
+      voice:
+          The grammatical voice.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.PartOfSpeech)
+  ))
+_sym_db.RegisterMessage(PartOfSpeech)
+
+DependencyEdge = _reflection.GeneratedProtocolMessageType('DependencyEdge', (_message.Message,), dict(
+  DESCRIPTOR = _DEPENDENCYEDGE,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """Represents dependency parse tree information for a token. (For more
+  information on dependency labels, see
+  http://www.aclweb.org/anthology/P13-2017
+  
+  
+  Attributes:
+      head_token_index:
+          Represents the head of this token in the dependency tree. This
+          is the index of the token which has an arc going to this
+          token. The index is the position of the token in the array of
+          tokens returned by the API method. If this token is a root
+          token, then the ``head_token_index`` is its own index.
+      label:
+          The parse label for the token.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.DependencyEdge)
+  ))
+_sym_db.RegisterMessage(DependencyEdge)
+
+EntityMention = _reflection.GeneratedProtocolMessageType('EntityMention', (_message.Message,), dict(
+  DESCRIPTOR = _ENTITYMENTION,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """Represents a mention for an entity in the text. Currently, proper noun
+  mentions are supported.
+  
+  
+  Attributes:
+      text:
+          The mention text.
+      type:
+          The type of the entity mention.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.EntityMention)
+  ))
+_sym_db.RegisterMessage(EntityMention)
+
+TextSpan = _reflection.GeneratedProtocolMessageType('TextSpan', (_message.Message,), dict(
+  DESCRIPTOR = _TEXTSPAN,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """Represents an output piece of text.
+  
+  
+  Attributes:
+      content:
+          The content of the output text.
+      begin_offset:
+          The API calculates the beginning offset of the content in the
+          original document according to the
+          [EncodingType][google.cloud.language.v1.EncodingType]
+          specified in the API request.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.TextSpan)
+  ))
+_sym_db.RegisterMessage(TextSpan)
+
+AnalyzeSentimentRequest = _reflection.GeneratedProtocolMessageType('AnalyzeSentimentRequest', (_message.Message,), dict(
+  DESCRIPTOR = _ANALYZESENTIMENTREQUEST,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """The sentiment analysis request message.
+  
+  
+  Attributes:
+      document:
+          Input document.
+      encoding_type:
+          The encoding type used by the API to calculate sentence
+          offsets.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.AnalyzeSentimentRequest)
+  ))
+_sym_db.RegisterMessage(AnalyzeSentimentRequest)
+
+AnalyzeSentimentResponse = _reflection.GeneratedProtocolMessageType('AnalyzeSentimentResponse', (_message.Message,), dict(
+  DESCRIPTOR = _ANALYZESENTIMENTRESPONSE,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """The sentiment analysis response message.
+  
+  
+  Attributes:
+      document_sentiment:
+          The overall sentiment of the input document.
+      language:
+          The language of the text, which will be the same as the
+          language specified in the request or, if not specified, the
+          automatically-detected language. See [Document.language][googl
+          e.cloud.language.v1.Document.language] field for more details.
+      sentences:
+          The sentiment for all the sentences in the document.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.AnalyzeSentimentResponse)
+  ))
+_sym_db.RegisterMessage(AnalyzeSentimentResponse)
+
+AnalyzeEntitiesRequest = _reflection.GeneratedProtocolMessageType('AnalyzeEntitiesRequest', (_message.Message,), dict(
+  DESCRIPTOR = _ANALYZEENTITIESREQUEST,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """The entity analysis request message.
+  
+  
+  Attributes:
+      document:
+          Input document.
+      encoding_type:
+          The encoding type used by the API to calculate offsets.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.AnalyzeEntitiesRequest)
+  ))
+_sym_db.RegisterMessage(AnalyzeEntitiesRequest)
+
+AnalyzeEntitiesResponse = _reflection.GeneratedProtocolMessageType('AnalyzeEntitiesResponse', (_message.Message,), dict(
+  DESCRIPTOR = _ANALYZEENTITIESRESPONSE,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """The entity analysis response message.
+  
+  
+  Attributes:
+      entities:
+          The recognized entities in the input document.
+      language:
+          The language of the text, which will be the same as the
+          language specified in the request or, if not specified, the
+          automatically-detected language. See [Document.language][googl
+          e.cloud.language.v1.Document.language] field for more details.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.AnalyzeEntitiesResponse)
+  ))
+_sym_db.RegisterMessage(AnalyzeEntitiesResponse)
+
+AnalyzeSyntaxRequest = _reflection.GeneratedProtocolMessageType('AnalyzeSyntaxRequest', (_message.Message,), dict(
+  DESCRIPTOR = _ANALYZESYNTAXREQUEST,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """The syntax analysis request message.
+  
+  
+  Attributes:
+      document:
+          Input document.
+      encoding_type:
+          The encoding type used by the API to calculate offsets.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.AnalyzeSyntaxRequest)
+  ))
+_sym_db.RegisterMessage(AnalyzeSyntaxRequest)
+
+AnalyzeSyntaxResponse = _reflection.GeneratedProtocolMessageType('AnalyzeSyntaxResponse', (_message.Message,), dict(
+  DESCRIPTOR = _ANALYZESYNTAXRESPONSE,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """The syntax analysis response message.
+  
+  
+  Attributes:
+      sentences:
+          Sentences in the input document.
+      tokens:
+          Tokens, along with their syntactic information, in the input
+          document.
+      language:
+          The language of the text, which will be the same as the
+          language specified in the request or, if not specified, the
+          automatically-detected language. See [Document.language][googl
+          e.cloud.language.v1.Document.language] field for more details.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.AnalyzeSyntaxResponse)
+  ))
+_sym_db.RegisterMessage(AnalyzeSyntaxResponse)
+
+AnnotateTextRequest = _reflection.GeneratedProtocolMessageType('AnnotateTextRequest', (_message.Message,), dict(
+
+  Features = _reflection.GeneratedProtocolMessageType('Features', (_message.Message,), dict(
+    DESCRIPTOR = _ANNOTATETEXTREQUEST_FEATURES,
+    __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+    ,
+    __doc__ = """All available features for sentiment, syntax, and semantic analysis.
+    Setting each one to true will enable that specific analysis for the
+    input.
+    """,
+    # @@protoc_insertion_point(class_scope:google.cloud.language.v1.AnnotateTextRequest.Features)
+    ))
+  ,
+  DESCRIPTOR = _ANNOTATETEXTREQUEST,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """The request message for the text annotation API, which can perform
+  multiple analysis types (sentiment, entities, and syntax) in one call.
+  
+  
+  Attributes:
+      extract_syntax:
+          Extract syntax information.
+      extract_entities:
+          Extract entities.
+      extract_document_sentiment:
+          Extract document-level sentiment.
+      document:
+          Input document.
+      features:
+          The enabled features.
+      encoding_type:
+          The encoding type used by the API to calculate offsets.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.AnnotateTextRequest)
+  ))
+_sym_db.RegisterMessage(AnnotateTextRequest)
+_sym_db.RegisterMessage(AnnotateTextRequest.Features)
+
+AnnotateTextResponse = _reflection.GeneratedProtocolMessageType('AnnotateTextResponse', (_message.Message,), dict(
+  DESCRIPTOR = _ANNOTATETEXTRESPONSE,
+  __module__ = 'google.cloud.proto.language.v1.language_service_pb2'
+  ,
+  __doc__ = """The text annotations response message.
+  
+  
+  Attributes:
+      sentences:
+          Sentences in the input document. Populated if the user enables
+          [AnnotateTextRequest.Features.extract\_syntax][google.cloud.la
+          nguage.v1.AnnotateTextRequest.Features.extract\_syntax].
+      tokens:
+          Tokens, along with their syntactic information, in the input
+          document. Populated if the user enables [AnnotateTextRequest.F
+          eatures.extract\_syntax][google.cloud.language.v1.AnnotateText
+          Request.Features.extract\_syntax].
+      entities:
+          Entities, along with their semantic information, in the input
+          document. Populated if the user enables [AnnotateTextRequest.F
+          eatures.extract\_entities][google.cloud.language.v1.AnnotateTe
+          xtRequest.Features.extract\_entities].
+      document_sentiment:
+          The overall sentiment for the document. Populated if the user
+          enables [AnnotateTextRequest.Features.extract\_document\_senti
+          ment][google.cloud.language.v1.AnnotateTextRequest.Features.ex
+          tract\_document\_sentiment].
+      language:
+          The language of the text, which will be the same as the
+          language specified in the request or, if not specified, the
+          automatically-detected language. See [Document.language][googl
+          e.cloud.language.v1.Document.language] field for more details.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1.AnnotateTextResponse)
+  ))
+_sym_db.RegisterMessage(AnnotateTextResponse)
+
+
+DESCRIPTOR.has_options = True
+DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\034com.google.cloud.language.v1B\024LanguageServiceProtoP\001Z@google.golang.org/genproto/googleapis/cloud/language/v1;language'))
+_ENTITY_METADATAENTRY.has_options = True
+_ENTITY_METADATAENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
+try:
+  # THESE ELEMENTS WILL BE DEPRECATED.
+  # Please use the generated *_pb2_grpc.py files instead.
+  import grpc
+  from grpc.beta import implementations as beta_implementations
+  from grpc.beta import interfaces as beta_interfaces
+  from grpc.framework.common import cardinality
+  from grpc.framework.interfaces.face import utilities as face_utilities
+
+
+  class LanguageServiceStub(object):
+    """Provides text analysis operations such as sentiment analysis and entity
+    recognition.
+    """
+
+    def __init__(self, channel):
+      """Constructor.
+
+      Args:
+        channel: A grpc.Channel.
+      """
+      self.AnalyzeSentiment = channel.unary_unary(
+          '/google.cloud.language.v1.LanguageService/AnalyzeSentiment',
+          request_serializer=AnalyzeSentimentRequest.SerializeToString,
+          response_deserializer=AnalyzeSentimentResponse.FromString,
+          )
+      self.AnalyzeEntities = channel.unary_unary(
+          '/google.cloud.language.v1.LanguageService/AnalyzeEntities',
+          request_serializer=AnalyzeEntitiesRequest.SerializeToString,
+          response_deserializer=AnalyzeEntitiesResponse.FromString,
+          )
+      self.AnalyzeSyntax = channel.unary_unary(
+          '/google.cloud.language.v1.LanguageService/AnalyzeSyntax',
+          request_serializer=AnalyzeSyntaxRequest.SerializeToString,
+          response_deserializer=AnalyzeSyntaxResponse.FromString,
+          )
+      self.AnnotateText = channel.unary_unary(
+          '/google.cloud.language.v1.LanguageService/AnnotateText',
+          request_serializer=AnnotateTextRequest.SerializeToString,
+          response_deserializer=AnnotateTextResponse.FromString,
+          )
+
+
+  class LanguageServiceServicer(object):
+    """Provides text analysis operations such as sentiment analysis and entity
+    recognition.
+    """
+
+    def AnalyzeSentiment(self, request, context):
+      """Analyzes the sentiment of the provided text.
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+    def AnalyzeEntities(self, request, context):
+      """Finds named entities (currently proper names and common nouns) in the text
+      along with entity types, salience, mentions for each entity, and
+      other properties.
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+    def AnalyzeSyntax(self, request, context):
+      """Analyzes the syntax of the text and provides sentence boundaries and
+      tokenization along with part of speech tags, dependency trees, and other
+      properties.
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+    def AnnotateText(self, request, context):
+      """A convenience method that provides all the features that analyzeSentiment,
+      analyzeEntities, and analyzeSyntax provide in one call.
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+
+  def add_LanguageServiceServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+        'AnalyzeSentiment': grpc.unary_unary_rpc_method_handler(
+            servicer.AnalyzeSentiment,
+            request_deserializer=AnalyzeSentimentRequest.FromString,
+            response_serializer=AnalyzeSentimentResponse.SerializeToString,
+        ),
+        'AnalyzeEntities': grpc.unary_unary_rpc_method_handler(
+            servicer.AnalyzeEntities,
+            request_deserializer=AnalyzeEntitiesRequest.FromString,
+            response_serializer=AnalyzeEntitiesResponse.SerializeToString,
+        ),
+        'AnalyzeSyntax': grpc.unary_unary_rpc_method_handler(
+            servicer.AnalyzeSyntax,
+            request_deserializer=AnalyzeSyntaxRequest.FromString,
+            response_serializer=AnalyzeSyntaxResponse.SerializeToString,
+        ),
+        'AnnotateText': grpc.unary_unary_rpc_method_handler(
+            servicer.AnnotateText,
+            request_deserializer=AnnotateTextRequest.FromString,
+            response_serializer=AnnotateTextResponse.SerializeToString,
+        ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+        'google.cloud.language.v1.LanguageService', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+
+
+  class BetaLanguageServiceServicer(object):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This class was generated
+    only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
+    """Provides text analysis operations such as sentiment analysis and entity
+    recognition.
+    """
+    def AnalyzeSentiment(self, request, context):
+      """Analyzes the sentiment of the provided text.
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+    def AnalyzeEntities(self, request, context):
+      """Finds named entities (currently proper names and common nouns) in the text
+      along with entity types, salience, mentions for each entity, and
+      other properties.
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+    def AnalyzeSyntax(self, request, context):
+      """Analyzes the syntax of the text and provides sentence boundaries and
+      tokenization along with part of speech tags, dependency trees, and other
+      properties.
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+    def AnnotateText(self, request, context):
+      """A convenience method that provides all the features that analyzeSentiment,
+      analyzeEntities, and analyzeSyntax provide in one call.
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+
+
+  class BetaLanguageServiceStub(object):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This class was generated
+    only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
+    """Provides text analysis operations such as sentiment analysis and entity
+    recognition.
+    """
+    def AnalyzeSentiment(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+      """Analyzes the sentiment of the provided text.
+      """
+      raise NotImplementedError()
+    AnalyzeSentiment.future = None
+    def AnalyzeEntities(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+      """Finds named entities (currently proper names and common nouns) in the text
+      along with entity types, salience, mentions for each entity, and
+      other properties.
+      """
+      raise NotImplementedError()
+    AnalyzeEntities.future = None
+    def AnalyzeSyntax(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+      """Analyzes the syntax of the text and provides sentence boundaries and
+      tokenization along with part of speech tags, dependency trees, and other
+      properties.
+      """
+      raise NotImplementedError()
+    AnalyzeSyntax.future = None
+    def AnnotateText(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+      """A convenience method that provides all the features that analyzeSentiment,
+      analyzeEntities, and analyzeSyntax provide in one call.
+      """
+      raise NotImplementedError()
+    AnnotateText.future = None
+
+
+  def beta_create_LanguageService_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This function was
+    generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
+    request_deserializers = {
+      ('google.cloud.language.v1.LanguageService', 'AnalyzeEntities'): AnalyzeEntitiesRequest.FromString,
+      ('google.cloud.language.v1.LanguageService', 'AnalyzeSentiment'): AnalyzeSentimentRequest.FromString,
+      ('google.cloud.language.v1.LanguageService', 'AnalyzeSyntax'): AnalyzeSyntaxRequest.FromString,
+      ('google.cloud.language.v1.LanguageService', 'AnnotateText'): AnnotateTextRequest.FromString,
+    }
+    response_serializers = {
+      ('google.cloud.language.v1.LanguageService', 'AnalyzeEntities'): AnalyzeEntitiesResponse.SerializeToString,
+      ('google.cloud.language.v1.LanguageService', 'AnalyzeSentiment'): AnalyzeSentimentResponse.SerializeToString,
+      ('google.cloud.language.v1.LanguageService', 'AnalyzeSyntax'): AnalyzeSyntaxResponse.SerializeToString,
+      ('google.cloud.language.v1.LanguageService', 'AnnotateText'): AnnotateTextResponse.SerializeToString,
+    }
+    method_implementations = {
+      ('google.cloud.language.v1.LanguageService', 'AnalyzeEntities'): face_utilities.unary_unary_inline(servicer.AnalyzeEntities),
+      ('google.cloud.language.v1.LanguageService', 'AnalyzeSentiment'): face_utilities.unary_unary_inline(servicer.AnalyzeSentiment),
+      ('google.cloud.language.v1.LanguageService', 'AnalyzeSyntax'): face_utilities.unary_unary_inline(servicer.AnalyzeSyntax),
+      ('google.cloud.language.v1.LanguageService', 'AnnotateText'): face_utilities.unary_unary_inline(servicer.AnnotateText),
+    }
+    server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout)
+    return beta_implementations.server(method_implementations, options=server_options)
+
+
+  def beta_create_LanguageService_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This function was
+    generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
+    request_serializers = {
+      ('google.cloud.language.v1.LanguageService', 'AnalyzeEntities'): AnalyzeEntitiesRequest.SerializeToString,
+      ('google.cloud.language.v1.LanguageService', 'AnalyzeSentiment'): AnalyzeSentimentRequest.SerializeToString,
+      ('google.cloud.language.v1.LanguageService', 'AnalyzeSyntax'): AnalyzeSyntaxRequest.SerializeToString,
+      ('google.cloud.language.v1.LanguageService', 'AnnotateText'): AnnotateTextRequest.SerializeToString,
+    }
+    response_deserializers = {
+      ('google.cloud.language.v1.LanguageService', 'AnalyzeEntities'): AnalyzeEntitiesResponse.FromString,
+      ('google.cloud.language.v1.LanguageService', 'AnalyzeSentiment'): AnalyzeSentimentResponse.FromString,
+      ('google.cloud.language.v1.LanguageService', 'AnalyzeSyntax'): AnalyzeSyntaxResponse.FromString,
+      ('google.cloud.language.v1.LanguageService', 'AnnotateText'): AnnotateTextResponse.FromString,
+    }
+    cardinalities = {
+      'AnalyzeEntities': cardinality.Cardinality.UNARY_UNARY,
+      'AnalyzeSentiment': cardinality.Cardinality.UNARY_UNARY,
+      'AnalyzeSyntax': cardinality.Cardinality.UNARY_UNARY,
+      'AnnotateText': cardinality.Cardinality.UNARY_UNARY,
+    }
+    stub_options = beta_implementations.stub_options(host=host, metadata_transformer=metadata_transformer, request_serializers=request_serializers, response_deserializers=response_deserializers, thread_pool=pool, thread_pool_size=pool_size)
+    return beta_implementations.dynamic_stub(channel, 'google.cloud.language.v1.LanguageService', cardinalities, options=stub_options)
+except ImportError:
+  pass
+# @@protoc_insertion_point(module_scope)
diff --git a/language/google/cloud/proto/language/v1/language_service_pb2_grpc.py b/language/google/cloud/proto/language/v1/language_service_pb2_grpc.py
new file mode 100644
index 0000000000000..19ab43fae3f09
--- /dev/null
+++ b/language/google/cloud/proto/language/v1/language_service_pb2_grpc.py
@@ -0,0 +1,104 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+import grpc
+
+import google.cloud.proto.language.v1.language_service_pb2 as google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2
+
+
+class LanguageServiceStub(object):
+  """Provides text analysis operations such as sentiment analysis and entity
+  recognition.
+  """
+
+  def __init__(self, channel):
+    """Constructor.
+
+    Args:
+      channel: A grpc.Channel.
+    """
+    self.AnalyzeSentiment = channel.unary_unary(
+        '/google.cloud.language.v1.LanguageService/AnalyzeSentiment',
+        request_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnalyzeSentimentRequest.SerializeToString,
+        response_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnalyzeSentimentResponse.FromString,
+        )
+    self.AnalyzeEntities = channel.unary_unary(
+        '/google.cloud.language.v1.LanguageService/AnalyzeEntities',
+        request_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnalyzeEntitiesRequest.SerializeToString,
+        response_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnalyzeEntitiesResponse.FromString,
+        )
+    self.AnalyzeSyntax = channel.unary_unary(
+        '/google.cloud.language.v1.LanguageService/AnalyzeSyntax',
+        request_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnalyzeSyntaxRequest.SerializeToString,
+        response_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnalyzeSyntaxResponse.FromString,
+        )
+    self.AnnotateText = channel.unary_unary(
+        '/google.cloud.language.v1.LanguageService/AnnotateText',
+        request_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnnotateTextRequest.SerializeToString,
+        response_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnnotateTextResponse.FromString,
+        )
+
+
+class LanguageServiceServicer(object):
+  """Provides text analysis operations such as sentiment analysis and entity
+  recognition.
+  """
+
+  def AnalyzeSentiment(self, request, context):
+    """Analyzes the sentiment of the provided text.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+  def AnalyzeEntities(self, request, context):
+    """Finds named entities (currently proper names and common nouns) in the text
+    along with entity types, salience, mentions for each entity, and
+    other properties.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+  def AnalyzeSyntax(self, request, context):
+    """Analyzes the syntax of the text and provides sentence boundaries and
+    tokenization along with part of speech tags, dependency trees, and other
+    properties.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+  def AnnotateText(self, request, context):
+    """A convenience method that provides all the features that analyzeSentiment,
+    analyzeEntities, and analyzeSyntax provide in one call.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+
+def add_LanguageServiceServicer_to_server(servicer, server):
+  rpc_method_handlers = {
+      'AnalyzeSentiment': grpc.unary_unary_rpc_method_handler(
+          servicer.AnalyzeSentiment,
+          request_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnalyzeSentimentRequest.FromString,
+          response_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnalyzeSentimentResponse.SerializeToString,
+      ),
+      'AnalyzeEntities': grpc.unary_unary_rpc_method_handler(
+          servicer.AnalyzeEntities,
+          request_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnalyzeEntitiesRequest.FromString,
+          response_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnalyzeEntitiesResponse.SerializeToString,
+      ),
+      'AnalyzeSyntax': grpc.unary_unary_rpc_method_handler(
+          servicer.AnalyzeSyntax,
+          request_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnalyzeSyntaxRequest.FromString,
+          response_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnalyzeSyntaxResponse.SerializeToString,
+      ),
+      'AnnotateText': grpc.unary_unary_rpc_method_handler(
+          servicer.AnnotateText,
+          request_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnnotateTextRequest.FromString,
+          response_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1_dot_language__service__pb2.AnnotateTextResponse.SerializeToString,
+      ),
+  }
+  generic_handler = grpc.method_handlers_generic_handler(
+      'google.cloud.language.v1.LanguageService', rpc_method_handlers)
+  server.add_generic_rpc_handlers((generic_handler,))
diff --git a/language/google/cloud/proto/language/v1beta2/__init__.py b/language/google/cloud/proto/language/v1beta2/__init__.py
new file mode 100644
index 0000000000000..8b137891791fe
--- /dev/null
+++ b/language/google/cloud/proto/language/v1beta2/__init__.py
@@ -0,0 +1 @@
+
diff --git a/language/google/cloud/proto/language/v1beta2/language_service_pb2.py b/language/google/cloud/proto/language/v1beta2/language_service_pb2.py
new file mode 100644
index 0000000000000..d3e1d150af8df
--- /dev/null
+++ b/language/google/cloud/proto/language/v1beta2/language_service_pb2.py
@@ -0,0 +1,2843 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: google/cloud/proto/language/v1beta2/language_service.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf.internal import enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf import descriptor_pb2
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from google.longrunning import operations_pb2 as google_dot_longrunning_dot_operations__pb2
+from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
+from google.rpc import status_pb2 as google_dot_rpc_dot_status__pb2
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='google/cloud/proto/language/v1beta2/language_service.proto',
+  package='google.cloud.language.v1beta2',
+  syntax='proto3',
+  serialized_pb=_b('\n:google/cloud/proto/language/v1beta2/language_service.proto\x12\x1dgoogle.cloud.language.v1beta2\x1a\x1cgoogle/api/annotations.proto\x1a#google/longrunning/operations.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17google/rpc/status.proto\"\xc8\x01\n\x08\x44ocument\x12:\n\x04type\x18\x01 \x01(\x0e\x32,.google.cloud.language.v1beta2.Document.Type\x12\x11\n\x07\x63ontent\x18\x02 \x01(\tH\x00\x12\x19\n\x0fgcs_content_uri\x18\x03 \x01(\tH\x00\x12\x10\n\x08language\x18\x04 \x01(\t\"6\n\x04Type\x12\x14\n\x10TYPE_UNSPECIFIED\x10\x00\x12\x0e\n\nPLAIN_TEXT\x10\x01\x12\x08\n\x04HTML\x10\x02\x42\x08\n\x06source\"~\n\x08Sentence\x12\x35\n\x04text\x18\x01 \x01(\x0b\x32\'.google.cloud.language.v1beta2.TextSpan\x12;\n\tsentiment\x18\x02 \x01(\x0b\x32(.google.cloud.language.v1beta2.Sentiment\"\xd2\x03\n\x06\x45ntity\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x38\n\x04type\x18\x02 \x01(\x0e\x32*.google.cloud.language.v1beta2.Entity.Type\x12\x45\n\x08metadata\x18\x03 \x03(\x0b\x32\x33.google.cloud.language.v1beta2.Entity.MetadataEntry\x12\x10\n\x08salience\x18\x04 \x01(\x02\x12>\n\x08mentions\x18\x05 \x03(\x0b\x32,.google.cloud.language.v1beta2.EntityMention\x12;\n\tsentiment\x18\x06 \x01(\x0b\x32(.google.cloud.language.v1beta2.Sentiment\x1a/\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"y\n\x04Type\x12\x0b\n\x07UNKNOWN\x10\x00\x12\n\n\x06PERSON\x10\x01\x12\x0c\n\x08LOCATION\x10\x02\x12\x10\n\x0cORGANIZATION\x10\x03\x12\t\n\x05\x45VENT\x10\x04\x12\x0f\n\x0bWORK_OF_ART\x10\x05\x12\x11\n\rCONSUMER_GOOD\x10\x06\x12\t\n\x05OTHER\x10\x07\"\xda\x01\n\x05Token\x12\x35\n\x04text\x18\x01 \x01(\x0b\x32\'.google.cloud.language.v1beta2.TextSpan\x12\x43\n\x0epart_of_speech\x18\x02 \x01(\x0b\x32+.google.cloud.language.v1beta2.PartOfSpeech\x12\x46\n\x0f\x64\x65pendency_edge\x18\x03 \x01(\x0b\x32-.google.cloud.language.v1beta2.DependencyEdge\x12\r\n\x05lemma\x18\x04 \x01(\t\"-\n\tSentiment\x12\x11\n\tmagnitude\x18\x02 \x01(\x02\x12\r\n\x05score\x18\x03 \x01(\x02\"\xdf\x10\n\x0cPartOfSpeech\x12<\n\x03tag\x18\x01 \x01(\x0e\x32/.google.cloud.language.v1beta2.PartOfSpeech.Tag\x12\x42\n\x06\x61spect\x18\x02 \x01(\x0e\x32\x32.google.cloud.language.v1beta2.PartOfSpeech.Aspect\x12>\n\x04\x63\x61se\x18\x03 \x01(\x0e\x32\x30.google.cloud.language.v1beta2.PartOfSpeech.Case\x12>\n\x04\x66orm\x18\x04 \x01(\x0e\x32\x30.google.cloud.language.v1beta2.PartOfSpeech.Form\x12\x42\n\x06gender\x18\x05 \x01(\x0e\x32\x32.google.cloud.language.v1beta2.PartOfSpeech.Gender\x12>\n\x04mood\x18\x06 \x01(\x0e\x32\x30.google.cloud.language.v1beta2.PartOfSpeech.Mood\x12\x42\n\x06number\x18\x07 \x01(\x0e\x32\x32.google.cloud.language.v1beta2.PartOfSpeech.Number\x12\x42\n\x06person\x18\x08 \x01(\x0e\x32\x32.google.cloud.language.v1beta2.PartOfSpeech.Person\x12\x42\n\x06proper\x18\t \x01(\x0e\x32\x32.google.cloud.language.v1beta2.PartOfSpeech.Proper\x12L\n\x0breciprocity\x18\n \x01(\x0e\x32\x37.google.cloud.language.v1beta2.PartOfSpeech.Reciprocity\x12@\n\x05tense\x18\x0b \x01(\x0e\x32\x31.google.cloud.language.v1beta2.PartOfSpeech.Tense\x12@\n\x05voice\x18\x0c \x01(\x0e\x32\x31.google.cloud.language.v1beta2.PartOfSpeech.Voice\"\x8d\x01\n\x03Tag\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x07\n\x03\x41\x44J\x10\x01\x12\x07\n\x03\x41\x44P\x10\x02\x12\x07\n\x03\x41\x44V\x10\x03\x12\x08\n\x04\x43ONJ\x10\x04\x12\x07\n\x03\x44\x45T\x10\x05\x12\x08\n\x04NOUN\x10\x06\x12\x07\n\x03NUM\x10\x07\x12\x08\n\x04PRON\x10\x08\x12\x07\n\x03PRT\x10\t\x12\t\n\x05PUNCT\x10\n\x12\x08\n\x04VERB\x10\x0b\x12\x05\n\x01X\x10\x0c\x12\t\n\x05\x41\x46\x46IX\x10\r\"O\n\x06\x41spect\x12\x12\n\x0e\x41SPECT_UNKNOWN\x10\x00\x12\x0e\n\nPERFECTIVE\x10\x01\x12\x10\n\x0cIMPERFECTIVE\x10\x02\x12\x0f\n\x0bPROGRESSIVE\x10\x03\"\xf8\x01\n\x04\x43\x61se\x12\x10\n\x0c\x43\x41SE_UNKNOWN\x10\x00\x12\x0e\n\nACCUSATIVE\x10\x01\x12\r\n\tADVERBIAL\x10\x02\x12\x11\n\rCOMPLEMENTIVE\x10\x03\x12\n\n\x06\x44\x41TIVE\x10\x04\x12\x0c\n\x08GENITIVE\x10\x05\x12\x10\n\x0cINSTRUMENTAL\x10\x06\x12\x0c\n\x08LOCATIVE\x10\x07\x12\x0e\n\nNOMINATIVE\x10\x08\x12\x0b\n\x07OBLIQUE\x10\t\x12\r\n\tPARTITIVE\x10\n\x12\x11\n\rPREPOSITIONAL\x10\x0b\x12\x12\n\x0eREFLEXIVE_CASE\x10\x0c\x12\x11\n\rRELATIVE_CASE\x10\r\x12\x0c\n\x08VOCATIVE\x10\x0e\"\xaf\x01\n\x04\x46orm\x12\x10\n\x0c\x46ORM_UNKNOWN\x10\x00\x12\x0c\n\x08\x41\x44NOMIAL\x10\x01\x12\r\n\tAUXILIARY\x10\x02\x12\x12\n\x0e\x43OMPLEMENTIZER\x10\x03\x12\x10\n\x0c\x46INAL_ENDING\x10\x04\x12\n\n\x06GERUND\x10\x05\x12\n\n\x06REALIS\x10\x06\x12\x0c\n\x08IRREALIS\x10\x07\x12\t\n\x05SHORT\x10\x08\x12\x08\n\x04LONG\x10\t\x12\t\n\x05ORDER\x10\n\x12\x0c\n\x08SPECIFIC\x10\x0b\"E\n\x06Gender\x12\x12\n\x0eGENDER_UNKNOWN\x10\x00\x12\x0c\n\x08\x46\x45MININE\x10\x01\x12\r\n\tMASCULINE\x10\x02\x12\n\n\x06NEUTER\x10\x03\"\x7f\n\x04Mood\x12\x10\n\x0cMOOD_UNKNOWN\x10\x00\x12\x14\n\x10\x43ONDITIONAL_MOOD\x10\x01\x12\x0e\n\nIMPERATIVE\x10\x02\x12\x0e\n\nINDICATIVE\x10\x03\x12\x11\n\rINTERROGATIVE\x10\x04\x12\x0b\n\x07JUSSIVE\x10\x05\x12\x0f\n\x0bSUBJUNCTIVE\x10\x06\"@\n\x06Number\x12\x12\n\x0eNUMBER_UNKNOWN\x10\x00\x12\x0c\n\x08SINGULAR\x10\x01\x12\n\n\x06PLURAL\x10\x02\x12\x08\n\x04\x44UAL\x10\x03\"T\n\x06Person\x12\x12\n\x0ePERSON_UNKNOWN\x10\x00\x12\t\n\x05\x46IRST\x10\x01\x12\n\n\x06SECOND\x10\x02\x12\t\n\x05THIRD\x10\x03\x12\x14\n\x10REFLEXIVE_PERSON\x10\x04\"8\n\x06Proper\x12\x12\n\x0ePROPER_UNKNOWN\x10\x00\x12\n\n\x06PROPER\x10\x01\x12\x0e\n\nNOT_PROPER\x10\x02\"J\n\x0bReciprocity\x12\x17\n\x13RECIPROCITY_UNKNOWN\x10\x00\x12\x0e\n\nRECIPROCAL\x10\x01\x12\x12\n\x0eNON_RECIPROCAL\x10\x02\"s\n\x05Tense\x12\x11\n\rTENSE_UNKNOWN\x10\x00\x12\x15\n\x11\x43ONDITIONAL_TENSE\x10\x01\x12\n\n\x06\x46UTURE\x10\x02\x12\x08\n\x04PAST\x10\x03\x12\x0b\n\x07PRESENT\x10\x04\x12\r\n\tIMPERFECT\x10\x05\x12\x0e\n\nPLUPERFECT\x10\x06\"B\n\x05Voice\x12\x11\n\rVOICE_UNKNOWN\x10\x00\x12\n\n\x06\x41\x43TIVE\x10\x01\x12\r\n\tCAUSATIVE\x10\x02\x12\x0b\n\x07PASSIVE\x10\x03\"\xdd\x07\n\x0e\x44\x65pendencyEdge\x12\x18\n\x10head_token_index\x18\x01 \x01(\x05\x12\x42\n\x05label\x18\x02 \x01(\x0e\x32\x33.google.cloud.language.v1beta2.DependencyEdge.Label\"\xec\x06\n\x05Label\x12\x0b\n\x07UNKNOWN\x10\x00\x12\n\n\x06\x41\x42\x42REV\x10\x01\x12\t\n\x05\x41\x43OMP\x10\x02\x12\t\n\x05\x41\x44VCL\x10\x03\x12\n\n\x06\x41\x44VMOD\x10\x04\x12\x08\n\x04\x41MOD\x10\x05\x12\t\n\x05\x41PPOS\x10\x06\x12\x08\n\x04\x41TTR\x10\x07\x12\x07\n\x03\x41UX\x10\x08\x12\x0b\n\x07\x41UXPASS\x10\t\x12\x06\n\x02\x43\x43\x10\n\x12\t\n\x05\x43\x43OMP\x10\x0b\x12\x08\n\x04\x43ONJ\x10\x0c\x12\t\n\x05\x43SUBJ\x10\r\x12\r\n\tCSUBJPASS\x10\x0e\x12\x07\n\x03\x44\x45P\x10\x0f\x12\x07\n\x03\x44\x45T\x10\x10\x12\r\n\tDISCOURSE\x10\x11\x12\x08\n\x04\x44OBJ\x10\x12\x12\x08\n\x04\x45XPL\x10\x13\x12\x0c\n\x08GOESWITH\x10\x14\x12\x08\n\x04IOBJ\x10\x15\x12\x08\n\x04MARK\x10\x16\x12\x07\n\x03MWE\x10\x17\x12\x07\n\x03MWV\x10\x18\x12\x07\n\x03NEG\x10\x19\x12\x06\n\x02NN\x10\x1a\x12\x0c\n\x08NPADVMOD\x10\x1b\x12\t\n\x05NSUBJ\x10\x1c\x12\r\n\tNSUBJPASS\x10\x1d\x12\x07\n\x03NUM\x10\x1e\x12\n\n\x06NUMBER\x10\x1f\x12\x05\n\x01P\x10 \x12\r\n\tPARATAXIS\x10!\x12\x0b\n\x07PARTMOD\x10\"\x12\t\n\x05PCOMP\x10#\x12\x08\n\x04POBJ\x10$\x12\x08\n\x04POSS\x10%\x12\x0b\n\x07POSTNEG\x10&\x12\x0b\n\x07PRECOMP\x10\'\x12\x0b\n\x07PRECONJ\x10(\x12\n\n\x06PREDET\x10)\x12\x08\n\x04PREF\x10*\x12\x08\n\x04PREP\x10+\x12\t\n\x05PRONL\x10,\x12\x07\n\x03PRT\x10-\x12\x06\n\x02PS\x10.\x12\x0c\n\x08QUANTMOD\x10/\x12\t\n\x05RCMOD\x10\x30\x12\x0c\n\x08RCMODREL\x10\x31\x12\t\n\x05RDROP\x10\x32\x12\x07\n\x03REF\x10\x33\x12\x0b\n\x07REMNANT\x10\x34\x12\x0e\n\nREPARANDUM\x10\x35\x12\x08\n\x04ROOT\x10\x36\x12\x08\n\x04SNUM\x10\x37\x12\x08\n\x04SUFF\x10\x38\x12\x08\n\x04TMOD\x10\x39\x12\t\n\x05TOPIC\x10:\x12\x08\n\x04VMOD\x10;\x12\x0c\n\x08VOCATIVE\x10<\x12\t\n\x05XCOMP\x10=\x12\n\n\x06SUFFIX\x10>\x12\t\n\x05TITLE\x10?\x12\x0c\n\x08\x41\x44VPHMOD\x10@\x12\x0b\n\x07\x41UXCAUS\x10\x41\x12\t\n\x05\x41UXVV\x10\x42\x12\t\n\x05\x44TMOD\x10\x43\x12\x0b\n\x07\x46OREIGN\x10\x44\x12\x06\n\x02KW\x10\x45\x12\x08\n\x04LIST\x10\x46\x12\x08\n\x04NOMC\x10G\x12\x0c\n\x08NOMCSUBJ\x10H\x12\x10\n\x0cNOMCSUBJPASS\x10I\x12\x08\n\x04NUMC\x10J\x12\x07\n\x03\x43OP\x10K\x12\x0e\n\nDISLOCATED\x10L\"\xf6\x01\n\rEntityMention\x12\x35\n\x04text\x18\x01 \x01(\x0b\x32\'.google.cloud.language.v1beta2.TextSpan\x12?\n\x04type\x18\x02 \x01(\x0e\x32\x31.google.cloud.language.v1beta2.EntityMention.Type\x12;\n\tsentiment\x18\x03 \x01(\x0b\x32(.google.cloud.language.v1beta2.Sentiment\"0\n\x04Type\x12\x10\n\x0cTYPE_UNKNOWN\x10\x00\x12\n\n\x06PROPER\x10\x01\x12\n\n\x06\x43OMMON\x10\x02\"1\n\x08TextSpan\x12\x0f\n\x07\x63ontent\x18\x01 \x01(\t\x12\x14\n\x0c\x62\x65gin_offset\x18\x02 \x01(\x05\"\x98\x01\n\x17\x41nalyzeSentimentRequest\x12\x39\n\x08\x64ocument\x18\x01 \x01(\x0b\x32\'.google.cloud.language.v1beta2.Document\x12\x42\n\rencoding_type\x18\x02 \x01(\x0e\x32+.google.cloud.language.v1beta2.EncodingType\"\xae\x01\n\x18\x41nalyzeSentimentResponse\x12\x44\n\x12\x64ocument_sentiment\x18\x01 \x01(\x0b\x32(.google.cloud.language.v1beta2.Sentiment\x12\x10\n\x08language\x18\x02 \x01(\t\x12:\n\tsentences\x18\x03 \x03(\x0b\x32\'.google.cloud.language.v1beta2.Sentence\"\x9e\x01\n\x1d\x41nalyzeEntitySentimentRequest\x12\x39\n\x08\x64ocument\x18\x01 \x01(\x0b\x32\'.google.cloud.language.v1beta2.Document\x12\x42\n\rencoding_type\x18\x02 \x01(\x0e\x32+.google.cloud.language.v1beta2.EncodingType\"k\n\x1e\x41nalyzeEntitySentimentResponse\x12\x37\n\x08\x65ntities\x18\x01 \x03(\x0b\x32%.google.cloud.language.v1beta2.Entity\x12\x10\n\x08language\x18\x02 \x01(\t\"\x97\x01\n\x16\x41nalyzeEntitiesRequest\x12\x39\n\x08\x64ocument\x18\x01 \x01(\x0b\x32\'.google.cloud.language.v1beta2.Document\x12\x42\n\rencoding_type\x18\x02 \x01(\x0e\x32+.google.cloud.language.v1beta2.EncodingType\"d\n\x17\x41nalyzeEntitiesResponse\x12\x37\n\x08\x65ntities\x18\x01 \x03(\x0b\x32%.google.cloud.language.v1beta2.Entity\x12\x10\n\x08language\x18\x02 \x01(\t\"\x95\x01\n\x14\x41nalyzeSyntaxRequest\x12\x39\n\x08\x64ocument\x18\x01 \x01(\x0b\x32\'.google.cloud.language.v1beta2.Document\x12\x42\n\rencoding_type\x18\x02 \x01(\x0e\x32+.google.cloud.language.v1beta2.EncodingType\"\x9b\x01\n\x15\x41nalyzeSyntaxResponse\x12:\n\tsentences\x18\x01 \x03(\x0b\x32\'.google.cloud.language.v1beta2.Sentence\x12\x34\n\x06tokens\x18\x02 \x03(\x0b\x32$.google.cloud.language.v1beta2.Token\x12\x10\n\x08language\x18\x03 \x01(\t\"\xe8\x02\n\x13\x41nnotateTextRequest\x12\x39\n\x08\x64ocument\x18\x01 \x01(\x0b\x32\'.google.cloud.language.v1beta2.Document\x12M\n\x08\x66\x65\x61tures\x18\x02 \x01(\x0b\x32;.google.cloud.language.v1beta2.AnnotateTextRequest.Features\x12\x42\n\rencoding_type\x18\x03 \x01(\x0e\x32+.google.cloud.language.v1beta2.EncodingType\x1a\x82\x01\n\x08\x46\x65\x61tures\x12\x16\n\x0e\x65xtract_syntax\x18\x01 \x01(\x08\x12\x18\n\x10\x65xtract_entities\x18\x02 \x01(\x08\x12\"\n\x1a\x65xtract_document_sentiment\x18\x03 \x01(\x08\x12 \n\x18\x65xtract_entity_sentiment\x18\x04 \x01(\x08\"\x99\x02\n\x14\x41nnotateTextResponse\x12:\n\tsentences\x18\x01 \x03(\x0b\x32\'.google.cloud.language.v1beta2.Sentence\x12\x34\n\x06tokens\x18\x02 \x03(\x0b\x32$.google.cloud.language.v1beta2.Token\x12\x37\n\x08\x65ntities\x18\x03 \x03(\x0b\x32%.google.cloud.language.v1beta2.Entity\x12\x44\n\x12\x64ocument_sentiment\x18\x04 \x01(\x0b\x32(.google.cloud.language.v1beta2.Sentiment\x12\x10\n\x08language\x18\x05 \x01(\t*8\n\x0c\x45ncodingType\x12\x08\n\x04NONE\x10\x00\x12\x08\n\x04UTF8\x10\x01\x12\t\n\x05UTF16\x10\x02\x12\t\n\x05UTF32\x10\x03\x32\x97\x07\n\x0fLanguageService\x12\xb3\x01\n\x10\x41nalyzeSentiment\x12\x36.google.cloud.language.v1beta2.AnalyzeSentimentRequest\x1a\x37.google.cloud.language.v1beta2.AnalyzeSentimentResponse\".\x82\xd3\xe4\x93\x02(\"#/v1beta2/documents:analyzeSentiment:\x01*\x12\xaf\x01\n\x0f\x41nalyzeEntities\x12\x35.google.cloud.language.v1beta2.AnalyzeEntitiesRequest\x1a\x36.google.cloud.language.v1beta2.AnalyzeEntitiesResponse\"-\x82\xd3\xe4\x93\x02\'\"\"/v1beta2/documents:analyzeEntities:\x01*\x12\xcb\x01\n\x16\x41nalyzeEntitySentiment\x12<.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest\x1a=.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse\"4\x82\xd3\xe4\x93\x02.\")/v1beta2/documents:analyzeEntitySentiment:\x01*\x12\xa7\x01\n\rAnalyzeSyntax\x12\x33.google.cloud.language.v1beta2.AnalyzeSyntaxRequest\x1a\x34.google.cloud.language.v1beta2.AnalyzeSyntaxResponse\"+\x82\xd3\xe4\x93\x02%\" /v1beta2/documents:analyzeSyntax:\x01*\x12\xa3\x01\n\x0c\x41nnotateText\x12\x32.google.cloud.language.v1beta2.AnnotateTextRequest\x1a\x33.google.cloud.language.v1beta2.AnnotateTextResponse\"*\x82\xd3\xe4\x93\x02$\"\x1f/v1beta2/documents:annotateText:\x01*B\x82\x01\n!com.google.cloud.language.v1beta2B\x14LanguageServiceProtoP\x01ZEgoogle.golang.org/genproto/googleapis/cloud/language/v1beta2;languageb\x06proto3')
+  ,
+  dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_longrunning_dot_operations__pb2.DESCRIPTOR,google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,google_dot_rpc_dot_status__pb2.DESCRIPTOR,])
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+_ENCODINGTYPE = _descriptor.EnumDescriptor(
+  name='EncodingType',
+  full_name='google.cloud.language.v1beta2.EncodingType',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='NONE', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='UTF8', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='UTF16', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='UTF32', index=3, number=3,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=6539,
+  serialized_end=6595,
+)
+_sym_db.RegisterEnumDescriptor(_ENCODINGTYPE)
+
+EncodingType = enum_type_wrapper.EnumTypeWrapper(_ENCODINGTYPE)
+NONE = 0
+UTF8 = 1
+UTF16 = 2
+UTF32 = 3
+
+
+_DOCUMENT_TYPE = _descriptor.EnumDescriptor(
+  name='Type',
+  full_name='google.cloud.language.v1beta2.Document.Type',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='TYPE_UNSPECIFIED', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PLAIN_TEXT', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='HTML', index=2, number=2,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=355,
+  serialized_end=409,
+)
+_sym_db.RegisterEnumDescriptor(_DOCUMENT_TYPE)
+
+_ENTITY_TYPE = _descriptor.EnumDescriptor(
+  name='Type',
+  full_name='google.cloud.language.v1beta2.Entity.Type',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PERSON', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LOCATION', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ORGANIZATION', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='EVENT', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='WORK_OF_ART', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CONSUMER_GOOD', index=6, number=6,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='OTHER', index=7, number=7,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=895,
+  serialized_end=1016,
+)
+_sym_db.RegisterEnumDescriptor(_ENTITY_TYPE)
+
+_PARTOFSPEECH_TAG = _descriptor.EnumDescriptor(
+  name='Tag',
+  full_name='google.cloud.language.v1beta2.PartOfSpeech.Tag',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADJ', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADP', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADV', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CONJ', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DET', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOUN', index=6, number=6,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NUM', index=7, number=7,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRON', index=8, number=8,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRT', index=9, number=9,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PUNCT', index=10, number=10,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='VERB', index=11, number=11,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='X', index=12, number=12,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AFFIX', index=13, number=13,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2108,
+  serialized_end=2249,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_TAG)
+
+_PARTOFSPEECH_ASPECT = _descriptor.EnumDescriptor(
+  name='Aspect',
+  full_name='google.cloud.language.v1beta2.PartOfSpeech.Aspect',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='ASPECT_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PERFECTIVE', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='IMPERFECTIVE', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PROGRESSIVE', index=3, number=3,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2251,
+  serialized_end=2330,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_ASPECT)
+
+_PARTOFSPEECH_CASE = _descriptor.EnumDescriptor(
+  name='Case',
+  full_name='google.cloud.language.v1beta2.PartOfSpeech.Case',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='CASE_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ACCUSATIVE', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADVERBIAL', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='COMPLEMENTIVE', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DATIVE', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='GENITIVE', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='INSTRUMENTAL', index=6, number=6,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LOCATIVE', index=7, number=7,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOMINATIVE', index=8, number=8,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='OBLIQUE', index=9, number=9,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PARTITIVE', index=10, number=10,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PREPOSITIONAL', index=11, number=11,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='REFLEXIVE_CASE', index=12, number=12,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RELATIVE_CASE', index=13, number=13,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='VOCATIVE', index=14, number=14,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2333,
+  serialized_end=2581,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_CASE)
+
+_PARTOFSPEECH_FORM = _descriptor.EnumDescriptor(
+  name='Form',
+  full_name='google.cloud.language.v1beta2.PartOfSpeech.Form',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='FORM_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADNOMIAL', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AUXILIARY', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='COMPLEMENTIZER', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='FINAL_ENDING', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='GERUND', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='REALIS', index=6, number=6,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='IRREALIS', index=7, number=7,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SHORT', index=8, number=8,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LONG', index=9, number=9,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ORDER', index=10, number=10,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SPECIFIC', index=11, number=11,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2584,
+  serialized_end=2759,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_FORM)
+
+_PARTOFSPEECH_GENDER = _descriptor.EnumDescriptor(
+  name='Gender',
+  full_name='google.cloud.language.v1beta2.PartOfSpeech.Gender',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='GENDER_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='FEMININE', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MASCULINE', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NEUTER', index=3, number=3,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2761,
+  serialized_end=2830,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_GENDER)
+
+_PARTOFSPEECH_MOOD = _descriptor.EnumDescriptor(
+  name='Mood',
+  full_name='google.cloud.language.v1beta2.PartOfSpeech.Mood',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='MOOD_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CONDITIONAL_MOOD', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='IMPERATIVE', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='INDICATIVE', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='INTERROGATIVE', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='JUSSIVE', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SUBJUNCTIVE', index=6, number=6,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2832,
+  serialized_end=2959,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_MOOD)
+
+_PARTOFSPEECH_NUMBER = _descriptor.EnumDescriptor(
+  name='Number',
+  full_name='google.cloud.language.v1beta2.PartOfSpeech.Number',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='NUMBER_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SINGULAR', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PLURAL', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DUAL', index=3, number=3,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=2961,
+  serialized_end=3025,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_NUMBER)
+
+_PARTOFSPEECH_PERSON = _descriptor.EnumDescriptor(
+  name='Person',
+  full_name='google.cloud.language.v1beta2.PartOfSpeech.Person',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='PERSON_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='FIRST', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SECOND', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='THIRD', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='REFLEXIVE_PERSON', index=4, number=4,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=3027,
+  serialized_end=3111,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_PERSON)
+
+_PARTOFSPEECH_PROPER = _descriptor.EnumDescriptor(
+  name='Proper',
+  full_name='google.cloud.language.v1beta2.PartOfSpeech.Proper',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='PROPER_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PROPER', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOT_PROPER', index=2, number=2,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=3113,
+  serialized_end=3169,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_PROPER)
+
+_PARTOFSPEECH_RECIPROCITY = _descriptor.EnumDescriptor(
+  name='Reciprocity',
+  full_name='google.cloud.language.v1beta2.PartOfSpeech.Reciprocity',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='RECIPROCITY_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RECIPROCAL', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NON_RECIPROCAL', index=2, number=2,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=3171,
+  serialized_end=3245,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_RECIPROCITY)
+
+_PARTOFSPEECH_TENSE = _descriptor.EnumDescriptor(
+  name='Tense',
+  full_name='google.cloud.language.v1beta2.PartOfSpeech.Tense',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='TENSE_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CONDITIONAL_TENSE', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='FUTURE', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PAST', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRESENT', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='IMPERFECT', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PLUPERFECT', index=6, number=6,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=3247,
+  serialized_end=3362,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_TENSE)
+
+_PARTOFSPEECH_VOICE = _descriptor.EnumDescriptor(
+  name='Voice',
+  full_name='google.cloud.language.v1beta2.PartOfSpeech.Voice',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='VOICE_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ACTIVE', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CAUSATIVE', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PASSIVE', index=3, number=3,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=3364,
+  serialized_end=3430,
+)
+_sym_db.RegisterEnumDescriptor(_PARTOFSPEECH_VOICE)
+
+_DEPENDENCYEDGE_LABEL = _descriptor.EnumDescriptor(
+  name='Label',
+  full_name='google.cloud.language.v1beta2.DependencyEdge.Label',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ABBREV', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ACOMP', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADVCL', index=3, number=3,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADVMOD', index=4, number=4,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AMOD', index=5, number=5,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='APPOS', index=6, number=6,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ATTR', index=7, number=7,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AUX', index=8, number=8,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AUXPASS', index=9, number=9,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CC', index=10, number=10,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CCOMP', index=11, number=11,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CONJ', index=12, number=12,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CSUBJ', index=13, number=13,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CSUBJPASS', index=14, number=14,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DEP', index=15, number=15,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DET', index=16, number=16,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DISCOURSE', index=17, number=17,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DOBJ', index=18, number=18,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='EXPL', index=19, number=19,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='GOESWITH', index=20, number=20,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='IOBJ', index=21, number=21,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MARK', index=22, number=22,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MWE', index=23, number=23,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MWV', index=24, number=24,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NEG', index=25, number=25,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NN', index=26, number=26,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NPADVMOD', index=27, number=27,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NSUBJ', index=28, number=28,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NSUBJPASS', index=29, number=29,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NUM', index=30, number=30,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NUMBER', index=31, number=31,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='P', index=32, number=32,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PARATAXIS', index=33, number=33,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PARTMOD', index=34, number=34,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PCOMP', index=35, number=35,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POBJ', index=36, number=36,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POSS', index=37, number=37,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POSTNEG', index=38, number=38,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRECOMP', index=39, number=39,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRECONJ', index=40, number=40,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PREDET', index=41, number=41,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PREF', index=42, number=42,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PREP', index=43, number=43,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRONL', index=44, number=44,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRT', index=45, number=45,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PS', index=46, number=46,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='QUANTMOD', index=47, number=47,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RCMOD', index=48, number=48,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RCMODREL', index=49, number=49,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RDROP', index=50, number=50,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='REF', index=51, number=51,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='REMNANT', index=52, number=52,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='REPARANDUM', index=53, number=53,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ROOT', index=54, number=54,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SNUM', index=55, number=55,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SUFF', index=56, number=56,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='TMOD', index=57, number=57,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='TOPIC', index=58, number=58,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='VMOD', index=59, number=59,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='VOCATIVE', index=60, number=60,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='XCOMP', index=61, number=61,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SUFFIX', index=62, number=62,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='TITLE', index=63, number=63,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADVPHMOD', index=64, number=64,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AUXCAUS', index=65, number=65,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='AUXVV', index=66, number=66,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DTMOD', index=67, number=67,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='FOREIGN', index=68, number=68,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='KW', index=69, number=69,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LIST', index=70, number=70,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOMC', index=71, number=71,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOMCSUBJ', index=72, number=72,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NOMCSUBJPASS', index=73, number=73,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NUMC', index=74, number=74,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='COP', index=75, number=75,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DISLOCATED', index=76, number=76,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=3546,
+  serialized_end=4422,
+)
+_sym_db.RegisterEnumDescriptor(_DEPENDENCYEDGE_LABEL)
+
+_ENTITYMENTION_TYPE = _descriptor.EnumDescriptor(
+  name='Type',
+  full_name='google.cloud.language.v1beta2.EntityMention.Type',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='TYPE_UNKNOWN', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PROPER', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='COMMON', index=2, number=2,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=4623,
+  serialized_end=4671,
+)
+_sym_db.RegisterEnumDescriptor(_ENTITYMENTION_TYPE)
+
+
+_DOCUMENT = _descriptor.Descriptor(
+  name='Document',
+  full_name='google.cloud.language.v1beta2.Document',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='type', full_name='google.cloud.language.v1beta2.Document.type', index=0,
+      number=1, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='content', full_name='google.cloud.language.v1beta2.Document.content', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='gcs_content_uri', full_name='google.cloud.language.v1beta2.Document.gcs_content_uri', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='language', full_name='google.cloud.language.v1beta2.Document.language', index=3,
+      number=4, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _DOCUMENT_TYPE,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+    _descriptor.OneofDescriptor(
+      name='source', full_name='google.cloud.language.v1beta2.Document.source',
+      index=0, containing_type=None, fields=[]),
+  ],
+  serialized_start=219,
+  serialized_end=419,
+)
+
+
+_SENTENCE = _descriptor.Descriptor(
+  name='Sentence',
+  full_name='google.cloud.language.v1beta2.Sentence',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='text', full_name='google.cloud.language.v1beta2.Sentence.text', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='sentiment', full_name='google.cloud.language.v1beta2.Sentence.sentiment', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=421,
+  serialized_end=547,
+)
+
+
+_ENTITY_METADATAENTRY = _descriptor.Descriptor(
+  name='MetadataEntry',
+  full_name='google.cloud.language.v1beta2.Entity.MetadataEntry',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='key', full_name='google.cloud.language.v1beta2.Entity.MetadataEntry.key', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='value', full_name='google.cloud.language.v1beta2.Entity.MetadataEntry.value', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=846,
+  serialized_end=893,
+)
+
+_ENTITY = _descriptor.Descriptor(
+  name='Entity',
+  full_name='google.cloud.language.v1beta2.Entity',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='name', full_name='google.cloud.language.v1beta2.Entity.name', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='type', full_name='google.cloud.language.v1beta2.Entity.type', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='metadata', full_name='google.cloud.language.v1beta2.Entity.metadata', index=2,
+      number=3, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='salience', full_name='google.cloud.language.v1beta2.Entity.salience', index=3,
+      number=4, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='mentions', full_name='google.cloud.language.v1beta2.Entity.mentions', index=4,
+      number=5, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='sentiment', full_name='google.cloud.language.v1beta2.Entity.sentiment', index=5,
+      number=6, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[_ENTITY_METADATAENTRY, ],
+  enum_types=[
+    _ENTITY_TYPE,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=550,
+  serialized_end=1016,
+)
+
+
+_TOKEN = _descriptor.Descriptor(
+  name='Token',
+  full_name='google.cloud.language.v1beta2.Token',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='text', full_name='google.cloud.language.v1beta2.Token.text', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='part_of_speech', full_name='google.cloud.language.v1beta2.Token.part_of_speech', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='dependency_edge', full_name='google.cloud.language.v1beta2.Token.dependency_edge', index=2,
+      number=3, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='lemma', full_name='google.cloud.language.v1beta2.Token.lemma', index=3,
+      number=4, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1019,
+  serialized_end=1237,
+)
+
+
+_SENTIMENT = _descriptor.Descriptor(
+  name='Sentiment',
+  full_name='google.cloud.language.v1beta2.Sentiment',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='magnitude', full_name='google.cloud.language.v1beta2.Sentiment.magnitude', index=0,
+      number=2, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='score', full_name='google.cloud.language.v1beta2.Sentiment.score', index=1,
+      number=3, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1239,
+  serialized_end=1284,
+)
+
+
+_PARTOFSPEECH = _descriptor.Descriptor(
+  name='PartOfSpeech',
+  full_name='google.cloud.language.v1beta2.PartOfSpeech',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='tag', full_name='google.cloud.language.v1beta2.PartOfSpeech.tag', index=0,
+      number=1, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='aspect', full_name='google.cloud.language.v1beta2.PartOfSpeech.aspect', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='case', full_name='google.cloud.language.v1beta2.PartOfSpeech.case', index=2,
+      number=3, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='form', full_name='google.cloud.language.v1beta2.PartOfSpeech.form', index=3,
+      number=4, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='gender', full_name='google.cloud.language.v1beta2.PartOfSpeech.gender', index=4,
+      number=5, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='mood', full_name='google.cloud.language.v1beta2.PartOfSpeech.mood', index=5,
+      number=6, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='number', full_name='google.cloud.language.v1beta2.PartOfSpeech.number', index=6,
+      number=7, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='person', full_name='google.cloud.language.v1beta2.PartOfSpeech.person', index=7,
+      number=8, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='proper', full_name='google.cloud.language.v1beta2.PartOfSpeech.proper', index=8,
+      number=9, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='reciprocity', full_name='google.cloud.language.v1beta2.PartOfSpeech.reciprocity', index=9,
+      number=10, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='tense', full_name='google.cloud.language.v1beta2.PartOfSpeech.tense', index=10,
+      number=11, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='voice', full_name='google.cloud.language.v1beta2.PartOfSpeech.voice', index=11,
+      number=12, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _PARTOFSPEECH_TAG,
+    _PARTOFSPEECH_ASPECT,
+    _PARTOFSPEECH_CASE,
+    _PARTOFSPEECH_FORM,
+    _PARTOFSPEECH_GENDER,
+    _PARTOFSPEECH_MOOD,
+    _PARTOFSPEECH_NUMBER,
+    _PARTOFSPEECH_PERSON,
+    _PARTOFSPEECH_PROPER,
+    _PARTOFSPEECH_RECIPROCITY,
+    _PARTOFSPEECH_TENSE,
+    _PARTOFSPEECH_VOICE,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1287,
+  serialized_end=3430,
+)
+
+
+_DEPENDENCYEDGE = _descriptor.Descriptor(
+  name='DependencyEdge',
+  full_name='google.cloud.language.v1beta2.DependencyEdge',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='head_token_index', full_name='google.cloud.language.v1beta2.DependencyEdge.head_token_index', index=0,
+      number=1, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='label', full_name='google.cloud.language.v1beta2.DependencyEdge.label', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _DEPENDENCYEDGE_LABEL,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=3433,
+  serialized_end=4422,
+)
+
+
+_ENTITYMENTION = _descriptor.Descriptor(
+  name='EntityMention',
+  full_name='google.cloud.language.v1beta2.EntityMention',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='text', full_name='google.cloud.language.v1beta2.EntityMention.text', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='type', full_name='google.cloud.language.v1beta2.EntityMention.type', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='sentiment', full_name='google.cloud.language.v1beta2.EntityMention.sentiment', index=2,
+      number=3, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _ENTITYMENTION_TYPE,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=4425,
+  serialized_end=4671,
+)
+
+
+_TEXTSPAN = _descriptor.Descriptor(
+  name='TextSpan',
+  full_name='google.cloud.language.v1beta2.TextSpan',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='content', full_name='google.cloud.language.v1beta2.TextSpan.content', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='begin_offset', full_name='google.cloud.language.v1beta2.TextSpan.begin_offset', index=1,
+      number=2, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=4673,
+  serialized_end=4722,
+)
+
+
+_ANALYZESENTIMENTREQUEST = _descriptor.Descriptor(
+  name='AnalyzeSentimentRequest',
+  full_name='google.cloud.language.v1beta2.AnalyzeSentimentRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='document', full_name='google.cloud.language.v1beta2.AnalyzeSentimentRequest.document', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='encoding_type', full_name='google.cloud.language.v1beta2.AnalyzeSentimentRequest.encoding_type', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=4725,
+  serialized_end=4877,
+)
+
+
+_ANALYZESENTIMENTRESPONSE = _descriptor.Descriptor(
+  name='AnalyzeSentimentResponse',
+  full_name='google.cloud.language.v1beta2.AnalyzeSentimentResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='document_sentiment', full_name='google.cloud.language.v1beta2.AnalyzeSentimentResponse.document_sentiment', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='language', full_name='google.cloud.language.v1beta2.AnalyzeSentimentResponse.language', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='sentences', full_name='google.cloud.language.v1beta2.AnalyzeSentimentResponse.sentences', index=2,
+      number=3, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=4880,
+  serialized_end=5054,
+)
+
+
+_ANALYZEENTITYSENTIMENTREQUEST = _descriptor.Descriptor(
+  name='AnalyzeEntitySentimentRequest',
+  full_name='google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='document', full_name='google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest.document', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='encoding_type', full_name='google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest.encoding_type', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=5057,
+  serialized_end=5215,
+)
+
+
+_ANALYZEENTITYSENTIMENTRESPONSE = _descriptor.Descriptor(
+  name='AnalyzeEntitySentimentResponse',
+  full_name='google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='entities', full_name='google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse.entities', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='language', full_name='google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse.language', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=5217,
+  serialized_end=5324,
+)
+
+
+_ANALYZEENTITIESREQUEST = _descriptor.Descriptor(
+  name='AnalyzeEntitiesRequest',
+  full_name='google.cloud.language.v1beta2.AnalyzeEntitiesRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='document', full_name='google.cloud.language.v1beta2.AnalyzeEntitiesRequest.document', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='encoding_type', full_name='google.cloud.language.v1beta2.AnalyzeEntitiesRequest.encoding_type', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=5327,
+  serialized_end=5478,
+)
+
+
+_ANALYZEENTITIESRESPONSE = _descriptor.Descriptor(
+  name='AnalyzeEntitiesResponse',
+  full_name='google.cloud.language.v1beta2.AnalyzeEntitiesResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='entities', full_name='google.cloud.language.v1beta2.AnalyzeEntitiesResponse.entities', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='language', full_name='google.cloud.language.v1beta2.AnalyzeEntitiesResponse.language', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=5480,
+  serialized_end=5580,
+)
+
+
+_ANALYZESYNTAXREQUEST = _descriptor.Descriptor(
+  name='AnalyzeSyntaxRequest',
+  full_name='google.cloud.language.v1beta2.AnalyzeSyntaxRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='document', full_name='google.cloud.language.v1beta2.AnalyzeSyntaxRequest.document', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='encoding_type', full_name='google.cloud.language.v1beta2.AnalyzeSyntaxRequest.encoding_type', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=5583,
+  serialized_end=5732,
+)
+
+
+_ANALYZESYNTAXRESPONSE = _descriptor.Descriptor(
+  name='AnalyzeSyntaxResponse',
+  full_name='google.cloud.language.v1beta2.AnalyzeSyntaxResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='sentences', full_name='google.cloud.language.v1beta2.AnalyzeSyntaxResponse.sentences', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='tokens', full_name='google.cloud.language.v1beta2.AnalyzeSyntaxResponse.tokens', index=1,
+      number=2, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='language', full_name='google.cloud.language.v1beta2.AnalyzeSyntaxResponse.language', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=5735,
+  serialized_end=5890,
+)
+
+
+_ANNOTATETEXTREQUEST_FEATURES = _descriptor.Descriptor(
+  name='Features',
+  full_name='google.cloud.language.v1beta2.AnnotateTextRequest.Features',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='extract_syntax', full_name='google.cloud.language.v1beta2.AnnotateTextRequest.Features.extract_syntax', index=0,
+      number=1, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='extract_entities', full_name='google.cloud.language.v1beta2.AnnotateTextRequest.Features.extract_entities', index=1,
+      number=2, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='extract_document_sentiment', full_name='google.cloud.language.v1beta2.AnnotateTextRequest.Features.extract_document_sentiment', index=2,
+      number=3, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='extract_entity_sentiment', full_name='google.cloud.language.v1beta2.AnnotateTextRequest.Features.extract_entity_sentiment', index=3,
+      number=4, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=6123,
+  serialized_end=6253,
+)
+
+_ANNOTATETEXTREQUEST = _descriptor.Descriptor(
+  name='AnnotateTextRequest',
+  full_name='google.cloud.language.v1beta2.AnnotateTextRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='document', full_name='google.cloud.language.v1beta2.AnnotateTextRequest.document', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='features', full_name='google.cloud.language.v1beta2.AnnotateTextRequest.features', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='encoding_type', full_name='google.cloud.language.v1beta2.AnnotateTextRequest.encoding_type', index=2,
+      number=3, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[_ANNOTATETEXTREQUEST_FEATURES, ],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=5893,
+  serialized_end=6253,
+)
+
+
+_ANNOTATETEXTRESPONSE = _descriptor.Descriptor(
+  name='AnnotateTextResponse',
+  full_name='google.cloud.language.v1beta2.AnnotateTextResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='sentences', full_name='google.cloud.language.v1beta2.AnnotateTextResponse.sentences', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='tokens', full_name='google.cloud.language.v1beta2.AnnotateTextResponse.tokens', index=1,
+      number=2, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='entities', full_name='google.cloud.language.v1beta2.AnnotateTextResponse.entities', index=2,
+      number=3, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='document_sentiment', full_name='google.cloud.language.v1beta2.AnnotateTextResponse.document_sentiment', index=3,
+      number=4, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='language', full_name='google.cloud.language.v1beta2.AnnotateTextResponse.language', index=4,
+      number=5, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=6256,
+  serialized_end=6537,
+)
+
+_DOCUMENT.fields_by_name['type'].enum_type = _DOCUMENT_TYPE
+_DOCUMENT_TYPE.containing_type = _DOCUMENT
+_DOCUMENT.oneofs_by_name['source'].fields.append(
+  _DOCUMENT.fields_by_name['content'])
+_DOCUMENT.fields_by_name['content'].containing_oneof = _DOCUMENT.oneofs_by_name['source']
+_DOCUMENT.oneofs_by_name['source'].fields.append(
+  _DOCUMENT.fields_by_name['gcs_content_uri'])
+_DOCUMENT.fields_by_name['gcs_content_uri'].containing_oneof = _DOCUMENT.oneofs_by_name['source']
+_SENTENCE.fields_by_name['text'].message_type = _TEXTSPAN
+_SENTENCE.fields_by_name['sentiment'].message_type = _SENTIMENT
+_ENTITY_METADATAENTRY.containing_type = _ENTITY
+_ENTITY.fields_by_name['type'].enum_type = _ENTITY_TYPE
+_ENTITY.fields_by_name['metadata'].message_type = _ENTITY_METADATAENTRY
+_ENTITY.fields_by_name['mentions'].message_type = _ENTITYMENTION
+_ENTITY.fields_by_name['sentiment'].message_type = _SENTIMENT
+_ENTITY_TYPE.containing_type = _ENTITY
+_TOKEN.fields_by_name['text'].message_type = _TEXTSPAN
+_TOKEN.fields_by_name['part_of_speech'].message_type = _PARTOFSPEECH
+_TOKEN.fields_by_name['dependency_edge'].message_type = _DEPENDENCYEDGE
+_PARTOFSPEECH.fields_by_name['tag'].enum_type = _PARTOFSPEECH_TAG
+_PARTOFSPEECH.fields_by_name['aspect'].enum_type = _PARTOFSPEECH_ASPECT
+_PARTOFSPEECH.fields_by_name['case'].enum_type = _PARTOFSPEECH_CASE
+_PARTOFSPEECH.fields_by_name['form'].enum_type = _PARTOFSPEECH_FORM
+_PARTOFSPEECH.fields_by_name['gender'].enum_type = _PARTOFSPEECH_GENDER
+_PARTOFSPEECH.fields_by_name['mood'].enum_type = _PARTOFSPEECH_MOOD
+_PARTOFSPEECH.fields_by_name['number'].enum_type = _PARTOFSPEECH_NUMBER
+_PARTOFSPEECH.fields_by_name['person'].enum_type = _PARTOFSPEECH_PERSON
+_PARTOFSPEECH.fields_by_name['proper'].enum_type = _PARTOFSPEECH_PROPER
+_PARTOFSPEECH.fields_by_name['reciprocity'].enum_type = _PARTOFSPEECH_RECIPROCITY
+_PARTOFSPEECH.fields_by_name['tense'].enum_type = _PARTOFSPEECH_TENSE
+_PARTOFSPEECH.fields_by_name['voice'].enum_type = _PARTOFSPEECH_VOICE
+_PARTOFSPEECH_TAG.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_ASPECT.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_CASE.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_FORM.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_GENDER.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_MOOD.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_NUMBER.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_PERSON.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_PROPER.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_RECIPROCITY.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_TENSE.containing_type = _PARTOFSPEECH
+_PARTOFSPEECH_VOICE.containing_type = _PARTOFSPEECH
+_DEPENDENCYEDGE.fields_by_name['label'].enum_type = _DEPENDENCYEDGE_LABEL
+_DEPENDENCYEDGE_LABEL.containing_type = _DEPENDENCYEDGE
+_ENTITYMENTION.fields_by_name['text'].message_type = _TEXTSPAN
+_ENTITYMENTION.fields_by_name['type'].enum_type = _ENTITYMENTION_TYPE
+_ENTITYMENTION.fields_by_name['sentiment'].message_type = _SENTIMENT
+_ENTITYMENTION_TYPE.containing_type = _ENTITYMENTION
+_ANALYZESENTIMENTREQUEST.fields_by_name['document'].message_type = _DOCUMENT
+_ANALYZESENTIMENTREQUEST.fields_by_name['encoding_type'].enum_type = _ENCODINGTYPE
+_ANALYZESENTIMENTRESPONSE.fields_by_name['document_sentiment'].message_type = _SENTIMENT
+_ANALYZESENTIMENTRESPONSE.fields_by_name['sentences'].message_type = _SENTENCE
+_ANALYZEENTITYSENTIMENTREQUEST.fields_by_name['document'].message_type = _DOCUMENT
+_ANALYZEENTITYSENTIMENTREQUEST.fields_by_name['encoding_type'].enum_type = _ENCODINGTYPE
+_ANALYZEENTITYSENTIMENTRESPONSE.fields_by_name['entities'].message_type = _ENTITY
+_ANALYZEENTITIESREQUEST.fields_by_name['document'].message_type = _DOCUMENT
+_ANALYZEENTITIESREQUEST.fields_by_name['encoding_type'].enum_type = _ENCODINGTYPE
+_ANALYZEENTITIESRESPONSE.fields_by_name['entities'].message_type = _ENTITY
+_ANALYZESYNTAXREQUEST.fields_by_name['document'].message_type = _DOCUMENT
+_ANALYZESYNTAXREQUEST.fields_by_name['encoding_type'].enum_type = _ENCODINGTYPE
+_ANALYZESYNTAXRESPONSE.fields_by_name['sentences'].message_type = _SENTENCE
+_ANALYZESYNTAXRESPONSE.fields_by_name['tokens'].message_type = _TOKEN
+_ANNOTATETEXTREQUEST_FEATURES.containing_type = _ANNOTATETEXTREQUEST
+_ANNOTATETEXTREQUEST.fields_by_name['document'].message_type = _DOCUMENT
+_ANNOTATETEXTREQUEST.fields_by_name['features'].message_type = _ANNOTATETEXTREQUEST_FEATURES
+_ANNOTATETEXTREQUEST.fields_by_name['encoding_type'].enum_type = _ENCODINGTYPE
+_ANNOTATETEXTRESPONSE.fields_by_name['sentences'].message_type = _SENTENCE
+_ANNOTATETEXTRESPONSE.fields_by_name['tokens'].message_type = _TOKEN
+_ANNOTATETEXTRESPONSE.fields_by_name['entities'].message_type = _ENTITY
+_ANNOTATETEXTRESPONSE.fields_by_name['document_sentiment'].message_type = _SENTIMENT
+DESCRIPTOR.message_types_by_name['Document'] = _DOCUMENT
+DESCRIPTOR.message_types_by_name['Sentence'] = _SENTENCE
+DESCRIPTOR.message_types_by_name['Entity'] = _ENTITY
+DESCRIPTOR.message_types_by_name['Token'] = _TOKEN
+DESCRIPTOR.message_types_by_name['Sentiment'] = _SENTIMENT
+DESCRIPTOR.message_types_by_name['PartOfSpeech'] = _PARTOFSPEECH
+DESCRIPTOR.message_types_by_name['DependencyEdge'] = _DEPENDENCYEDGE
+DESCRIPTOR.message_types_by_name['EntityMention'] = _ENTITYMENTION
+DESCRIPTOR.message_types_by_name['TextSpan'] = _TEXTSPAN
+DESCRIPTOR.message_types_by_name['AnalyzeSentimentRequest'] = _ANALYZESENTIMENTREQUEST
+DESCRIPTOR.message_types_by_name['AnalyzeSentimentResponse'] = _ANALYZESENTIMENTRESPONSE
+DESCRIPTOR.message_types_by_name['AnalyzeEntitySentimentRequest'] = _ANALYZEENTITYSENTIMENTREQUEST
+DESCRIPTOR.message_types_by_name['AnalyzeEntitySentimentResponse'] = _ANALYZEENTITYSENTIMENTRESPONSE
+DESCRIPTOR.message_types_by_name['AnalyzeEntitiesRequest'] = _ANALYZEENTITIESREQUEST
+DESCRIPTOR.message_types_by_name['AnalyzeEntitiesResponse'] = _ANALYZEENTITIESRESPONSE
+DESCRIPTOR.message_types_by_name['AnalyzeSyntaxRequest'] = _ANALYZESYNTAXREQUEST
+DESCRIPTOR.message_types_by_name['AnalyzeSyntaxResponse'] = _ANALYZESYNTAXRESPONSE
+DESCRIPTOR.message_types_by_name['AnnotateTextRequest'] = _ANNOTATETEXTREQUEST
+DESCRIPTOR.message_types_by_name['AnnotateTextResponse'] = _ANNOTATETEXTRESPONSE
+DESCRIPTOR.enum_types_by_name['EncodingType'] = _ENCODINGTYPE
+
+Document = _reflection.GeneratedProtocolMessageType('Document', (_message.Message,), dict(
+  DESCRIPTOR = _DOCUMENT,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """Represents the input to API methods.
+  
+  
+  Attributes:
+      type:
+          Required. If the type is not set or is ``TYPE_UNSPECIFIED``,
+          returns an ``INVALID_ARGUMENT`` error.
+      source:
+          The source of the document: a string containing the content or
+          a Google Cloud Storage URI.
+      content:
+          The content of the input in string format.
+      gcs_content_uri:
+          The Google Cloud Storage URI where the file content is
+          located. This URI must be of the form:
+          gs://bucket\_name/object\_name. For more details, see
+          https://cloud.google.com/storage/docs/reference-uris. NOTE:
+          Cloud Storage object versioning is not supported.
+      language:
+          The language of the document (if not specified, the language
+          is automatically detected). Both ISO and BCP-47 language codes
+          are accepted. `Language Support
+          <https://cloud.google.com/natural-language/docs/languages>`__
+          lists currently supported languages for each API method. If
+          the language (either specified by the caller or automatically
+          detected) is not supported by the called API method, an
+          ``INVALID_ARGUMENT`` error is returned.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.Document)
+  ))
+_sym_db.RegisterMessage(Document)
+
+Sentence = _reflection.GeneratedProtocolMessageType('Sentence', (_message.Message,), dict(
+  DESCRIPTOR = _SENTENCE,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """Represents a sentence in the input document.
+  
+  
+  Attributes:
+      text:
+          The sentence text.
+      sentiment:
+          For calls to [AnalyzeSentiment][] or if [AnnotateTextRequest.F
+          eatures.extract\_document\_sentiment][google.cloud.language.v1
+          beta2.AnnotateTextRequest.Features.extract\_document\_sentimen
+          t] is set to true, this field will contain the sentiment for
+          the sentence.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.Sentence)
+  ))
+_sym_db.RegisterMessage(Sentence)
+
+Entity = _reflection.GeneratedProtocolMessageType('Entity', (_message.Message,), dict(
+
+  MetadataEntry = _reflection.GeneratedProtocolMessageType('MetadataEntry', (_message.Message,), dict(
+    DESCRIPTOR = _ENTITY_METADATAENTRY,
+    __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+    # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.Entity.MetadataEntry)
+    ))
+  ,
+  DESCRIPTOR = _ENTITY,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """Represents a phrase in the text that is a known entity, such as a
+  person, an organization, or location. The API associates information,
+  such as salience and mentions, with entities.
+  
+  
+  Attributes:
+      name:
+          The representative name for the entity.
+      type:
+          The entity type.
+      metadata:
+          Metadata associated with the entity.  Currently, Wikipedia
+          URLs and Knowledge Graph MIDs are provided, if available. The
+          associated keys are "wikipedia\_url" and "mid", respectively.
+      salience:
+          The salience score associated with the entity in the [0, 1.0]
+          range.  The salience score for an entity provides information
+          about the importance or centrality of that entity to the
+          entire document text. Scores closer to 0 are less salient,
+          while scores closer to 1.0 are highly salient.
+      mentions:
+          The mentions of this entity in the input document. The API
+          currently supports proper noun mentions.
+      sentiment:
+          For calls to [AnalyzeEntitySentiment][] or if [AnnotateTextReq
+          uest.Features.extract\_entity\_sentiment][google.cloud.languag
+          e.v1beta2.AnnotateTextRequest.Features.extract\_entity\_sentim
+          ent] is set to true, this field will contain the aggregate
+          sentiment expressed for this entity in the provided document.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.Entity)
+  ))
+_sym_db.RegisterMessage(Entity)
+_sym_db.RegisterMessage(Entity.MetadataEntry)
+
+Token = _reflection.GeneratedProtocolMessageType('Token', (_message.Message,), dict(
+  DESCRIPTOR = _TOKEN,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """Represents the smallest syntactic building block of the text.
+  
+  
+  Attributes:
+      text:
+          The token text.
+      part_of_speech:
+          Parts of speech tag for this token.
+      dependency_edge:
+          Dependency tree parse for this token.
+      lemma:
+          `Lemma
+          <https://en.wikipedia.org/wiki/Lemma_%28morphology%29>`__ of
+          the token.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.Token)
+  ))
+_sym_db.RegisterMessage(Token)
+
+Sentiment = _reflection.GeneratedProtocolMessageType('Sentiment', (_message.Message,), dict(
+  DESCRIPTOR = _SENTIMENT,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """Represents the feeling associated with the entire text or entities in
+  the text.
+  
+  
+  Attributes:
+      magnitude:
+          A non-negative number in the [0, +inf) range, which represents
+          the absolute magnitude of sentiment regardless of score
+          (positive or negative).
+      score:
+          Sentiment score between -1.0 (negative sentiment) and 1.0
+          (positive sentiment).
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.Sentiment)
+  ))
+_sym_db.RegisterMessage(Sentiment)
+
+PartOfSpeech = _reflection.GeneratedProtocolMessageType('PartOfSpeech', (_message.Message,), dict(
+  DESCRIPTOR = _PARTOFSPEECH,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """Represents part of speech information for a token.
+  
+  
+  Attributes:
+      tag:
+          The part of speech tag.
+      aspect:
+          The grammatical aspect.
+      case:
+          The grammatical case.
+      form:
+          The grammatical form.
+      gender:
+          The grammatical gender.
+      mood:
+          The grammatical mood.
+      number:
+          The grammatical number.
+      person:
+          The grammatical person.
+      proper:
+          The grammatical properness.
+      reciprocity:
+          The grammatical reciprocity.
+      tense:
+          The grammatical tense.
+      voice:
+          The grammatical voice.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.PartOfSpeech)
+  ))
+_sym_db.RegisterMessage(PartOfSpeech)
+
+DependencyEdge = _reflection.GeneratedProtocolMessageType('DependencyEdge', (_message.Message,), dict(
+  DESCRIPTOR = _DEPENDENCYEDGE,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """Represents dependency parse tree information for a token.
+  
+  
+  Attributes:
+      head_token_index:
+          Represents the head of this token in the dependency tree. This
+          is the index of the token which has an arc going to this
+          token. The index is the position of the token in the array of
+          tokens returned by the API method. If this token is a root
+          token, then the ``head_token_index`` is its own index.
+      label:
+          The parse label for the token.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.DependencyEdge)
+  ))
+_sym_db.RegisterMessage(DependencyEdge)
+
+EntityMention = _reflection.GeneratedProtocolMessageType('EntityMention', (_message.Message,), dict(
+  DESCRIPTOR = _ENTITYMENTION,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """Represents a mention for an entity in the text. Currently, proper noun
+  mentions are supported.
+  
+  
+  Attributes:
+      text:
+          The mention text.
+      type:
+          The type of the entity mention.
+      sentiment:
+          For calls to [AnalyzeEntitySentiment][] or if [AnnotateTextReq
+          uest.Features.extract\_entity\_sentiment][google.cloud.languag
+          e.v1beta2.AnnotateTextRequest.Features.extract\_entity\_sentim
+          ent] is set to true, this field will contain the sentiment
+          expressed for this mention of the entity in the provided
+          document.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.EntityMention)
+  ))
+_sym_db.RegisterMessage(EntityMention)
+
+TextSpan = _reflection.GeneratedProtocolMessageType('TextSpan', (_message.Message,), dict(
+  DESCRIPTOR = _TEXTSPAN,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """Represents an output piece of text.
+  
+  
+  Attributes:
+      content:
+          The content of the output text.
+      begin_offset:
+          The API calculates the beginning offset of the content in the
+          original document according to the
+          [EncodingType][google.cloud.language.v1beta2.EncodingType]
+          specified in the API request.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.TextSpan)
+  ))
+_sym_db.RegisterMessage(TextSpan)
+
+AnalyzeSentimentRequest = _reflection.GeneratedProtocolMessageType('AnalyzeSentimentRequest', (_message.Message,), dict(
+  DESCRIPTOR = _ANALYZESENTIMENTREQUEST,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """The sentiment analysis request message.
+  
+  
+  Attributes:
+      document:
+          Input document.
+      encoding_type:
+          The encoding type used by the API to calculate sentence
+          offsets for the sentence sentiment.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.AnalyzeSentimentRequest)
+  ))
+_sym_db.RegisterMessage(AnalyzeSentimentRequest)
+
+AnalyzeSentimentResponse = _reflection.GeneratedProtocolMessageType('AnalyzeSentimentResponse', (_message.Message,), dict(
+  DESCRIPTOR = _ANALYZESENTIMENTRESPONSE,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """The sentiment analysis response message.
+  
+  
+  Attributes:
+      document_sentiment:
+          The overall sentiment of the input document.
+      language:
+          The language of the text, which will be the same as the
+          language specified in the request or, if not specified, the
+          automatically-detected language. See [Document.language][googl
+          e.cloud.language.v1beta2.Document.language] field for more
+          details.
+      sentences:
+          The sentiment for all the sentences in the document.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.AnalyzeSentimentResponse)
+  ))
+_sym_db.RegisterMessage(AnalyzeSentimentResponse)
+
+AnalyzeEntitySentimentRequest = _reflection.GeneratedProtocolMessageType('AnalyzeEntitySentimentRequest', (_message.Message,), dict(
+  DESCRIPTOR = _ANALYZEENTITYSENTIMENTREQUEST,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """The entity-level sentiment analysis request message.
+  
+  
+  Attributes:
+      document:
+          Input document.
+      encoding_type:
+          The encoding type used by the API to calculate offsets.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest)
+  ))
+_sym_db.RegisterMessage(AnalyzeEntitySentimentRequest)
+
+AnalyzeEntitySentimentResponse = _reflection.GeneratedProtocolMessageType('AnalyzeEntitySentimentResponse', (_message.Message,), dict(
+  DESCRIPTOR = _ANALYZEENTITYSENTIMENTRESPONSE,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """The entity-level sentiment analysis response message.
+  
+  
+  Attributes:
+      entities:
+          The recognized entities in the input document with associated
+          sentiments.
+      language:
+          The language of the text, which will be the same as the
+          language specified in the request or, if not specified, the
+          automatically-detected language. See [Document.language][googl
+          e.cloud.language.v1beta2.Document.language] field for more
+          details.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse)
+  ))
+_sym_db.RegisterMessage(AnalyzeEntitySentimentResponse)
+
+AnalyzeEntitiesRequest = _reflection.GeneratedProtocolMessageType('AnalyzeEntitiesRequest', (_message.Message,), dict(
+  DESCRIPTOR = _ANALYZEENTITIESREQUEST,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """The entity analysis request message.
+  
+  
+  Attributes:
+      document:
+          Input document.
+      encoding_type:
+          The encoding type used by the API to calculate offsets.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.AnalyzeEntitiesRequest)
+  ))
+_sym_db.RegisterMessage(AnalyzeEntitiesRequest)
+
+AnalyzeEntitiesResponse = _reflection.GeneratedProtocolMessageType('AnalyzeEntitiesResponse', (_message.Message,), dict(
+  DESCRIPTOR = _ANALYZEENTITIESRESPONSE,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """The entity analysis response message.
+  
+  
+  Attributes:
+      entities:
+          The recognized entities in the input document.
+      language:
+          The language of the text, which will be the same as the
+          language specified in the request or, if not specified, the
+          automatically-detected language. See [Document.language][googl
+          e.cloud.language.v1beta2.Document.language] field for more
+          details.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.AnalyzeEntitiesResponse)
+  ))
+_sym_db.RegisterMessage(AnalyzeEntitiesResponse)
+
+AnalyzeSyntaxRequest = _reflection.GeneratedProtocolMessageType('AnalyzeSyntaxRequest', (_message.Message,), dict(
+  DESCRIPTOR = _ANALYZESYNTAXREQUEST,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """The syntax analysis request message.
+  
+  
+  Attributes:
+      document:
+          Input document.
+      encoding_type:
+          The encoding type used by the API to calculate offsets.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.AnalyzeSyntaxRequest)
+  ))
+_sym_db.RegisterMessage(AnalyzeSyntaxRequest)
+
+AnalyzeSyntaxResponse = _reflection.GeneratedProtocolMessageType('AnalyzeSyntaxResponse', (_message.Message,), dict(
+  DESCRIPTOR = _ANALYZESYNTAXRESPONSE,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """The syntax analysis response message.
+  
+  
+  Attributes:
+      sentences:
+          Sentences in the input document.
+      tokens:
+          Tokens, along with their syntactic information, in the input
+          document.
+      language:
+          The language of the text, which will be the same as the
+          language specified in the request or, if not specified, the
+          automatically-detected language. See [Document.language][googl
+          e.cloud.language.v1beta2.Document.language] field for more
+          details.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.AnalyzeSyntaxResponse)
+  ))
+_sym_db.RegisterMessage(AnalyzeSyntaxResponse)
+
+AnnotateTextRequest = _reflection.GeneratedProtocolMessageType('AnnotateTextRequest', (_message.Message,), dict(
+
+  Features = _reflection.GeneratedProtocolMessageType('Features', (_message.Message,), dict(
+    DESCRIPTOR = _ANNOTATETEXTREQUEST_FEATURES,
+    __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+    ,
+    __doc__ = """All available features for sentiment, syntax, and semantic analysis.
+    Setting each one to true will enable that specific analysis for the
+    input.
+    """,
+    # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.AnnotateTextRequest.Features)
+    ))
+  ,
+  DESCRIPTOR = _ANNOTATETEXTREQUEST,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """The request message for the text annotation API, which can perform
+  multiple analysis types (sentiment, entities, and syntax) in one call.
+  
+  
+  Attributes:
+      extract_syntax:
+          Extract syntax information.
+      extract_entities:
+          Extract entities.
+      extract_document_sentiment:
+          Extract document-level sentiment.
+      extract_entity_sentiment:
+          Extract entities and their associated sentiment.
+      document:
+          Input document.
+      features:
+          The enabled features.
+      encoding_type:
+          The encoding type used by the API to calculate offsets.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.AnnotateTextRequest)
+  ))
+_sym_db.RegisterMessage(AnnotateTextRequest)
+_sym_db.RegisterMessage(AnnotateTextRequest.Features)
+
+AnnotateTextResponse = _reflection.GeneratedProtocolMessageType('AnnotateTextResponse', (_message.Message,), dict(
+  DESCRIPTOR = _ANNOTATETEXTRESPONSE,
+  __module__ = 'google.cloud.proto.language.v1beta2.language_service_pb2'
+  ,
+  __doc__ = """The text annotations response message.
+  
+  
+  Attributes:
+      sentences:
+          Sentences in the input document. Populated if the user enables
+          [AnnotateTextRequest.Features.extract\_syntax][google.cloud.la
+          nguage.v1beta2.AnnotateTextRequest.Features.extract\_syntax].
+      tokens:
+          Tokens, along with their syntactic information, in the input
+          document. Populated if the user enables [AnnotateTextRequest.F
+          eatures.extract\_syntax][google.cloud.language.v1beta2.Annotat
+          eTextRequest.Features.extract\_syntax].
+      entities:
+          Entities, along with their semantic information, in the input
+          document. Populated if the user enables [AnnotateTextRequest.F
+          eatures.extract\_entities][google.cloud.language.v1beta2.Annot
+          ateTextRequest.Features.extract\_entities].
+      document_sentiment:
+          The overall sentiment for the document. Populated if the user
+          enables [AnnotateTextRequest.Features.extract\_document\_senti
+          ment][google.cloud.language.v1beta2.AnnotateTextRequest.Featur
+          es.extract\_document\_sentiment].
+      language:
+          The language of the text, which will be the same as the
+          language specified in the request or, if not specified, the
+          automatically-detected language. See [Document.language][googl
+          e.cloud.language.v1beta2.Document.language] field for more
+          details.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.language.v1beta2.AnnotateTextResponse)
+  ))
+_sym_db.RegisterMessage(AnnotateTextResponse)
+
+
+DESCRIPTOR.has_options = True
+DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n!com.google.cloud.language.v1beta2B\024LanguageServiceProtoP\001ZEgoogle.golang.org/genproto/googleapis/cloud/language/v1beta2;language'))
+_ENTITY_METADATAENTRY.has_options = True
+_ENTITY_METADATAENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
+try:
+  # THESE ELEMENTS WILL BE DEPRECATED.
+  # Please use the generated *_pb2_grpc.py files instead.
+  import grpc
+  from grpc.beta import implementations as beta_implementations
+  from grpc.beta import interfaces as beta_interfaces
+  from grpc.framework.common import cardinality
+  from grpc.framework.interfaces.face import utilities as face_utilities
+
+
+  class LanguageServiceStub(object):
+    """Provides text analysis operations such as sentiment analysis and entity
+    recognition.
+    """
+
+    def __init__(self, channel):
+      """Constructor.
+
+      Args:
+        channel: A grpc.Channel.
+      """
+      self.AnalyzeSentiment = channel.unary_unary(
+          '/google.cloud.language.v1beta2.LanguageService/AnalyzeSentiment',
+          request_serializer=AnalyzeSentimentRequest.SerializeToString,
+          response_deserializer=AnalyzeSentimentResponse.FromString,
+          )
+      self.AnalyzeEntities = channel.unary_unary(
+          '/google.cloud.language.v1beta2.LanguageService/AnalyzeEntities',
+          request_serializer=AnalyzeEntitiesRequest.SerializeToString,
+          response_deserializer=AnalyzeEntitiesResponse.FromString,
+          )
+      self.AnalyzeEntitySentiment = channel.unary_unary(
+          '/google.cloud.language.v1beta2.LanguageService/AnalyzeEntitySentiment',
+          request_serializer=AnalyzeEntitySentimentRequest.SerializeToString,
+          response_deserializer=AnalyzeEntitySentimentResponse.FromString,
+          )
+      self.AnalyzeSyntax = channel.unary_unary(
+          '/google.cloud.language.v1beta2.LanguageService/AnalyzeSyntax',
+          request_serializer=AnalyzeSyntaxRequest.SerializeToString,
+          response_deserializer=AnalyzeSyntaxResponse.FromString,
+          )
+      self.AnnotateText = channel.unary_unary(
+          '/google.cloud.language.v1beta2.LanguageService/AnnotateText',
+          request_serializer=AnnotateTextRequest.SerializeToString,
+          response_deserializer=AnnotateTextResponse.FromString,
+          )
+
+
+  class LanguageServiceServicer(object):
+    """Provides text analysis operations such as sentiment analysis and entity
+    recognition.
+    """
+
+    def AnalyzeSentiment(self, request, context):
+      """Analyzes the sentiment of the provided text.
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+    def AnalyzeEntities(self, request, context):
+      """Finds named entities (currently proper names and common nouns) in the text
+      along with entity types, salience, mentions for each entity, and
+      other properties.
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+    def AnalyzeEntitySentiment(self, request, context):
+      """Finds entities, similar to [AnalyzeEntities][google.cloud.language.v1beta2.LanguageService.AnalyzeEntities] in the text and analyzes
+      sentiment associated with each entity and its mentions.
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+    def AnalyzeSyntax(self, request, context):
+      """Analyzes the syntax of the text and provides sentence boundaries and
+      tokenization along with part of speech tags, dependency trees, and other
+      properties.
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+    def AnnotateText(self, request, context):
+      """A convenience method that provides all syntax, sentiment, and entity
+      features in one call.
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+
+  def add_LanguageServiceServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+        'AnalyzeSentiment': grpc.unary_unary_rpc_method_handler(
+            servicer.AnalyzeSentiment,
+            request_deserializer=AnalyzeSentimentRequest.FromString,
+            response_serializer=AnalyzeSentimentResponse.SerializeToString,
+        ),
+        'AnalyzeEntities': grpc.unary_unary_rpc_method_handler(
+            servicer.AnalyzeEntities,
+            request_deserializer=AnalyzeEntitiesRequest.FromString,
+            response_serializer=AnalyzeEntitiesResponse.SerializeToString,
+        ),
+        'AnalyzeEntitySentiment': grpc.unary_unary_rpc_method_handler(
+            servicer.AnalyzeEntitySentiment,
+            request_deserializer=AnalyzeEntitySentimentRequest.FromString,
+            response_serializer=AnalyzeEntitySentimentResponse.SerializeToString,
+        ),
+        'AnalyzeSyntax': grpc.unary_unary_rpc_method_handler(
+            servicer.AnalyzeSyntax,
+            request_deserializer=AnalyzeSyntaxRequest.FromString,
+            response_serializer=AnalyzeSyntaxResponse.SerializeToString,
+        ),
+        'AnnotateText': grpc.unary_unary_rpc_method_handler(
+            servicer.AnnotateText,
+            request_deserializer=AnnotateTextRequest.FromString,
+            response_serializer=AnnotateTextResponse.SerializeToString,
+        ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+        'google.cloud.language.v1beta2.LanguageService', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+
+
+  class BetaLanguageServiceServicer(object):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This class was generated
+    only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
+    """Provides text analysis operations such as sentiment analysis and entity
+    recognition.
+    """
+    def AnalyzeSentiment(self, request, context):
+      """Analyzes the sentiment of the provided text.
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+    def AnalyzeEntities(self, request, context):
+      """Finds named entities (currently proper names and common nouns) in the text
+      along with entity types, salience, mentions for each entity, and
+      other properties.
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+    def AnalyzeEntitySentiment(self, request, context):
+      """Finds entities, similar to [AnalyzeEntities][google.cloud.language.v1beta2.LanguageService.AnalyzeEntities] in the text and analyzes
+      sentiment associated with each entity and its mentions.
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+    def AnalyzeSyntax(self, request, context):
+      """Analyzes the syntax of the text and provides sentence boundaries and
+      tokenization along with part of speech tags, dependency trees, and other
+      properties.
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+    def AnnotateText(self, request, context):
+      """A convenience method that provides all syntax, sentiment, and entity
+      features in one call.
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+
+
+  class BetaLanguageServiceStub(object):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This class was generated
+    only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
+    """Provides text analysis operations such as sentiment analysis and entity
+    recognition.
+    """
+    def AnalyzeSentiment(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+      """Analyzes the sentiment of the provided text.
+      """
+      raise NotImplementedError()
+    AnalyzeSentiment.future = None
+    def AnalyzeEntities(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+      """Finds named entities (currently proper names and common nouns) in the text
+      along with entity types, salience, mentions for each entity, and
+      other properties.
+      """
+      raise NotImplementedError()
+    AnalyzeEntities.future = None
+    def AnalyzeEntitySentiment(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+      """Finds entities, similar to [AnalyzeEntities][google.cloud.language.v1beta2.LanguageService.AnalyzeEntities] in the text and analyzes
+      sentiment associated with each entity and its mentions.
+      """
+      raise NotImplementedError()
+    AnalyzeEntitySentiment.future = None
+    def AnalyzeSyntax(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+      """Analyzes the syntax of the text and provides sentence boundaries and
+      tokenization along with part of speech tags, dependency trees, and other
+      properties.
+      """
+      raise NotImplementedError()
+    AnalyzeSyntax.future = None
+    def AnnotateText(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+      """A convenience method that provides all syntax, sentiment, and entity
+      features in one call.
+      """
+      raise NotImplementedError()
+    AnnotateText.future = None
+
+
+  def beta_create_LanguageService_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This function was
+    generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
+    request_deserializers = {
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeEntities'): AnalyzeEntitiesRequest.FromString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeEntitySentiment'): AnalyzeEntitySentimentRequest.FromString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeSentiment'): AnalyzeSentimentRequest.FromString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeSyntax'): AnalyzeSyntaxRequest.FromString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnnotateText'): AnnotateTextRequest.FromString,
+    }
+    response_serializers = {
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeEntities'): AnalyzeEntitiesResponse.SerializeToString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeEntitySentiment'): AnalyzeEntitySentimentResponse.SerializeToString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeSentiment'): AnalyzeSentimentResponse.SerializeToString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeSyntax'): AnalyzeSyntaxResponse.SerializeToString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnnotateText'): AnnotateTextResponse.SerializeToString,
+    }
+    method_implementations = {
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeEntities'): face_utilities.unary_unary_inline(servicer.AnalyzeEntities),
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeEntitySentiment'): face_utilities.unary_unary_inline(servicer.AnalyzeEntitySentiment),
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeSentiment'): face_utilities.unary_unary_inline(servicer.AnalyzeSentiment),
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeSyntax'): face_utilities.unary_unary_inline(servicer.AnalyzeSyntax),
+      ('google.cloud.language.v1beta2.LanguageService', 'AnnotateText'): face_utilities.unary_unary_inline(servicer.AnnotateText),
+    }
+    server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout)
+    return beta_implementations.server(method_implementations, options=server_options)
+
+
+  def beta_create_LanguageService_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This function was
+    generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
+    request_serializers = {
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeEntities'): AnalyzeEntitiesRequest.SerializeToString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeEntitySentiment'): AnalyzeEntitySentimentRequest.SerializeToString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeSentiment'): AnalyzeSentimentRequest.SerializeToString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeSyntax'): AnalyzeSyntaxRequest.SerializeToString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnnotateText'): AnnotateTextRequest.SerializeToString,
+    }
+    response_deserializers = {
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeEntities'): AnalyzeEntitiesResponse.FromString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeEntitySentiment'): AnalyzeEntitySentimentResponse.FromString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeSentiment'): AnalyzeSentimentResponse.FromString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnalyzeSyntax'): AnalyzeSyntaxResponse.FromString,
+      ('google.cloud.language.v1beta2.LanguageService', 'AnnotateText'): AnnotateTextResponse.FromString,
+    }
+    cardinalities = {
+      'AnalyzeEntities': cardinality.Cardinality.UNARY_UNARY,
+      'AnalyzeEntitySentiment': cardinality.Cardinality.UNARY_UNARY,
+      'AnalyzeSentiment': cardinality.Cardinality.UNARY_UNARY,
+      'AnalyzeSyntax': cardinality.Cardinality.UNARY_UNARY,
+      'AnnotateText': cardinality.Cardinality.UNARY_UNARY,
+    }
+    stub_options = beta_implementations.stub_options(host=host, metadata_transformer=metadata_transformer, request_serializers=request_serializers, response_deserializers=response_deserializers, thread_pool=pool, thread_pool_size=pool_size)
+    return beta_implementations.dynamic_stub(channel, 'google.cloud.language.v1beta2.LanguageService', cardinalities, options=stub_options)
+except ImportError:
+  pass
+# @@protoc_insertion_point(module_scope)
diff --git a/language/google/cloud/proto/language/v1beta2/language_service_pb2_grpc.py b/language/google/cloud/proto/language/v1beta2/language_service_pb2_grpc.py
new file mode 100644
index 0000000000000..264d6d43f4680
--- /dev/null
+++ b/language/google/cloud/proto/language/v1beta2/language_service_pb2_grpc.py
@@ -0,0 +1,122 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+import grpc
+
+import google.cloud.proto.language.v1beta2.language_service_pb2 as google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2
+
+
+class LanguageServiceStub(object):
+  """Provides text analysis operations such as sentiment analysis and entity
+  recognition.
+  """
+
+  def __init__(self, channel):
+    """Constructor.
+
+    Args:
+      channel: A grpc.Channel.
+    """
+    self.AnalyzeSentiment = channel.unary_unary(
+        '/google.cloud.language.v1beta2.LanguageService/AnalyzeSentiment',
+        request_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeSentimentRequest.SerializeToString,
+        response_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeSentimentResponse.FromString,
+        )
+    self.AnalyzeEntities = channel.unary_unary(
+        '/google.cloud.language.v1beta2.LanguageService/AnalyzeEntities',
+        request_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeEntitiesRequest.SerializeToString,
+        response_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeEntitiesResponse.FromString,
+        )
+    self.AnalyzeEntitySentiment = channel.unary_unary(
+        '/google.cloud.language.v1beta2.LanguageService/AnalyzeEntitySentiment',
+        request_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeEntitySentimentRequest.SerializeToString,
+        response_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeEntitySentimentResponse.FromString,
+        )
+    self.AnalyzeSyntax = channel.unary_unary(
+        '/google.cloud.language.v1beta2.LanguageService/AnalyzeSyntax',
+        request_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeSyntaxRequest.SerializeToString,
+        response_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeSyntaxResponse.FromString,
+        )
+    self.AnnotateText = channel.unary_unary(
+        '/google.cloud.language.v1beta2.LanguageService/AnnotateText',
+        request_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnnotateTextRequest.SerializeToString,
+        response_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnnotateTextResponse.FromString,
+        )
+
+
+class LanguageServiceServicer(object):
+  """Provides text analysis operations such as sentiment analysis and entity
+  recognition.
+  """
+
+  def AnalyzeSentiment(self, request, context):
+    """Analyzes the sentiment of the provided text.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+  def AnalyzeEntities(self, request, context):
+    """Finds named entities (currently proper names and common nouns) in the text
+    along with entity types, salience, mentions for each entity, and
+    other properties.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+  def AnalyzeEntitySentiment(self, request, context):
+    """Finds entities, similar to [AnalyzeEntities][google.cloud.language.v1beta2.LanguageService.AnalyzeEntities] in the text and analyzes
+    sentiment associated with each entity and its mentions.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+  def AnalyzeSyntax(self, request, context):
+    """Analyzes the syntax of the text and provides sentence boundaries and
+    tokenization along with part of speech tags, dependency trees, and other
+    properties.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+  def AnnotateText(self, request, context):
+    """A convenience method that provides all syntax, sentiment, and entity
+    features in one call.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+
+def add_LanguageServiceServicer_to_server(servicer, server):
+  rpc_method_handlers = {
+      'AnalyzeSentiment': grpc.unary_unary_rpc_method_handler(
+          servicer.AnalyzeSentiment,
+          request_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeSentimentRequest.FromString,
+          response_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeSentimentResponse.SerializeToString,
+      ),
+      'AnalyzeEntities': grpc.unary_unary_rpc_method_handler(
+          servicer.AnalyzeEntities,
+          request_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeEntitiesRequest.FromString,
+          response_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeEntitiesResponse.SerializeToString,
+      ),
+      'AnalyzeEntitySentiment': grpc.unary_unary_rpc_method_handler(
+          servicer.AnalyzeEntitySentiment,
+          request_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeEntitySentimentRequest.FromString,
+          response_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeEntitySentimentResponse.SerializeToString,
+      ),
+      'AnalyzeSyntax': grpc.unary_unary_rpc_method_handler(
+          servicer.AnalyzeSyntax,
+          request_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeSyntaxRequest.FromString,
+          response_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnalyzeSyntaxResponse.SerializeToString,
+      ),
+      'AnnotateText': grpc.unary_unary_rpc_method_handler(
+          servicer.AnnotateText,
+          request_deserializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnnotateTextRequest.FromString,
+          response_serializer=google_dot_cloud_dot_proto_dot_language_dot_v1beta2_dot_language__service__pb2.AnnotateTextResponse.SerializeToString,
+      ),
+  }
+  generic_handler = grpc.method_handlers_generic_handler(
+      'google.cloud.language.v1beta2.LanguageService', rpc_method_handlers)
+  server.add_generic_rpc_handlers((generic_handler,))
diff --git a/language/setup.py b/language/setup.py
index d573938a7665b..16ee4d5603ad6 100644
--- a/language/setup.py
+++ b/language/setup.py
@@ -52,7 +52,12 @@
 
 REQUIREMENTS = [
     'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-gax >= 0.15.13, < 0.16dev',
+    'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',
 ]
+EXTRAS_REQUIRE = {
+    ':python_version<"3.4"': ['enum34'],
+}
 
 setup(
     name='google-cloud-language',
@@ -62,8 +67,13 @@
     namespace_packages=[
         'google',
         'google.cloud',
+        'google.cloud.gapic',
+        'google.cloud.gapic.language',
+        'google.cloud.proto',
+        'google.cloud.proto.language',
     ],
     packages=find_packages(exclude=('tests*',)),
     install_requires=REQUIREMENTS,
+    extras_require=EXTRAS_REQUIRE,
     **SETUP_BASE
 )
diff --git a/language/tests/gapic/v1/language_service_smoke_test.py b/language/tests/gapic/v1/language_service_smoke_test.py
new file mode 100644
index 0000000000000..67839505c670e
--- /dev/null
+++ b/language/tests/gapic/v1/language_service_smoke_test.py
@@ -0,0 +1,30 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import time
+import unittest
+
+from google.cloud.gapic.language.v1 import enums
+from google.cloud.gapic.language.v1 import language_service_client
+from google.cloud.proto.language.v1 import language_service_pb2
+
+
+class LanguageServiceSmokeTest(unittest.TestCase):
+    def test_analyze_sentiment(self):
+
+        client = language_service_client.LanguageServiceClient()
+        content = 'Hello, world!'
+        type_ = enums.Document.Type.PLAIN_TEXT
+        document = language_service_pb2.Document(content=content, type=type_)
+        response = client.analyze_sentiment(document)
diff --git a/language/tests/gapic/v1/test_language_service_client_v1.py b/language/tests/gapic/v1/test_language_service_client_v1.py
new file mode 100644
index 0000000000000..a0b1931727ce1
--- /dev/null
+++ b/language/tests/gapic/v1/test_language_service_client_v1.py
@@ -0,0 +1,232 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Unit tests."""
+
+import mock
+import unittest
+
+from google.gax import errors
+
+from google.cloud.gapic.language.v1 import enums
+from google.cloud.gapic.language.v1 import language_service_client
+from google.cloud.proto.language.v1 import language_service_pb2
+
+
+class CustomException(Exception):
+    pass
+
+
+class TestLanguageServiceClient(unittest.TestCase):
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_analyze_sentiment(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+
+        # Mock response
+        language = 'language-1613589672'
+        expected_response = language_service_pb2.AnalyzeSentimentResponse(
+            language=language)
+        grpc_stub.AnalyzeSentiment.return_value = expected_response
+
+        response = client.analyze_sentiment(document)
+        self.assertEqual(expected_response, response)
+
+        grpc_stub.AnalyzeSentiment.assert_called_once()
+        args, kwargs = grpc_stub.AnalyzeSentiment.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_request = args[0]
+
+        expected_request = language_service_pb2.AnalyzeSentimentRequest(
+            document=document)
+        self.assertEqual(expected_request, actual_request)
+
+    @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_analyze_sentiment_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+
+        # Mock exception response
+        grpc_stub.AnalyzeSentiment.side_effect = CustomException()
+
+        self.assertRaises(errors.GaxError, client.analyze_sentiment, document)
+
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_analyze_entities(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+        encoding_type = enums.EncodingType.NONE
+
+        # Mock response
+        language = 'language-1613589672'
+        expected_response = language_service_pb2.AnalyzeEntitiesResponse(
+            language=language)
+        grpc_stub.AnalyzeEntities.return_value = expected_response
+
+        response = client.analyze_entities(document, encoding_type)
+        self.assertEqual(expected_response, response)
+
+        grpc_stub.AnalyzeEntities.assert_called_once()
+        args, kwargs = grpc_stub.AnalyzeEntities.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_request = args[0]
+
+        expected_request = language_service_pb2.AnalyzeEntitiesRequest(
+            document=document, encoding_type=encoding_type)
+        self.assertEqual(expected_request, actual_request)
+
+    @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_analyze_entities_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+        encoding_type = enums.EncodingType.NONE
+
+        # Mock exception response
+        grpc_stub.AnalyzeEntities.side_effect = CustomException()
+
+        self.assertRaises(errors.GaxError, client.analyze_entities, document,
+                          encoding_type)
+
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_analyze_syntax(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+        encoding_type = enums.EncodingType.NONE
+
+        # Mock response
+        language = 'language-1613589672'
+        expected_response = language_service_pb2.AnalyzeSyntaxResponse(
+            language=language)
+        grpc_stub.AnalyzeSyntax.return_value = expected_response
+
+        response = client.analyze_syntax(document, encoding_type)
+        self.assertEqual(expected_response, response)
+
+        grpc_stub.AnalyzeSyntax.assert_called_once()
+        args, kwargs = grpc_stub.AnalyzeSyntax.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_request = args[0]
+
+        expected_request = language_service_pb2.AnalyzeSyntaxRequest(
+            document=document, encoding_type=encoding_type)
+        self.assertEqual(expected_request, actual_request)
+
+    @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_analyze_syntax_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+        encoding_type = enums.EncodingType.NONE
+
+        # Mock exception response
+        grpc_stub.AnalyzeSyntax.side_effect = CustomException()
+
+        self.assertRaises(errors.GaxError, client.analyze_syntax, document,
+                          encoding_type)
+
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_annotate_text(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+        features = language_service_pb2.AnnotateTextRequest.Features()
+        encoding_type = enums.EncodingType.NONE
+
+        # Mock response
+        language = 'language-1613589672'
+        expected_response = language_service_pb2.AnnotateTextResponse(
+            language=language)
+        grpc_stub.AnnotateText.return_value = expected_response
+
+        response = client.annotate_text(document, features, encoding_type)
+        self.assertEqual(expected_response, response)
+
+        grpc_stub.AnnotateText.assert_called_once()
+        args, kwargs = grpc_stub.AnnotateText.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_request = args[0]
+
+        expected_request = language_service_pb2.AnnotateTextRequest(
+            document=document, features=features, encoding_type=encoding_type)
+        self.assertEqual(expected_request, actual_request)
+
+    @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_annotate_text_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+        features = language_service_pb2.AnnotateTextRequest.Features()
+        encoding_type = enums.EncodingType.NONE
+
+        # Mock exception response
+        grpc_stub.AnnotateText.side_effect = CustomException()
+
+        self.assertRaises(errors.GaxError, client.annotate_text, document,
+                          features, encoding_type)
diff --git a/language/tests/gapic/v1beta2/language_service_smoke_test.py b/language/tests/gapic/v1beta2/language_service_smoke_test.py
new file mode 100644
index 0000000000000..d94531f88f75e
--- /dev/null
+++ b/language/tests/gapic/v1beta2/language_service_smoke_test.py
@@ -0,0 +1,30 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import time
+import unittest
+
+from google.cloud.gapic.language.v1beta2 import enums
+from google.cloud.gapic.language.v1beta2 import language_service_client
+from google.cloud.proto.language.v1beta2 import language_service_pb2
+
+
+class LanguageServiceSmokeTest(unittest.TestCase):
+    def test_analyze_sentiment(self):
+
+        client = language_service_client.LanguageServiceClient()
+        content = 'Hello, world!'
+        type_ = enums.Document.Type.PLAIN_TEXT
+        document = language_service_pb2.Document(content=content, type=type_)
+        response = client.analyze_sentiment(document)
diff --git a/language/tests/gapic/v1beta2/test_language_service_client_v1beta2.py b/language/tests/gapic/v1beta2/test_language_service_client_v1beta2.py
new file mode 100644
index 0000000000000..fea1c572d4ce9
--- /dev/null
+++ b/language/tests/gapic/v1beta2/test_language_service_client_v1beta2.py
@@ -0,0 +1,283 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Unit tests."""
+
+import mock
+import unittest
+
+from google.gax import errors
+
+from google.cloud.gapic.language.v1beta2 import enums
+from google.cloud.gapic.language.v1beta2 import language_service_client
+from google.cloud.proto.language.v1beta2 import language_service_pb2
+
+
+class CustomException(Exception):
+    pass
+
+
+class TestLanguageServiceClient(unittest.TestCase):
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_analyze_sentiment(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+
+        # Mock response
+        language = 'language-1613589672'
+        expected_response = language_service_pb2.AnalyzeSentimentResponse(
+            language=language)
+        grpc_stub.AnalyzeSentiment.return_value = expected_response
+
+        response = client.analyze_sentiment(document)
+        self.assertEqual(expected_response, response)
+
+        grpc_stub.AnalyzeSentiment.assert_called_once()
+        args, kwargs = grpc_stub.AnalyzeSentiment.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_request = args[0]
+
+        expected_request = language_service_pb2.AnalyzeSentimentRequest(
+            document=document)
+        self.assertEqual(expected_request, actual_request)
+
+    @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_analyze_sentiment_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+
+        # Mock exception response
+        grpc_stub.AnalyzeSentiment.side_effect = CustomException()
+
+        self.assertRaises(errors.GaxError, client.analyze_sentiment, document)
+
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_analyze_entities(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+        encoding_type = enums.EncodingType.NONE
+
+        # Mock response
+        language = 'language-1613589672'
+        expected_response = language_service_pb2.AnalyzeEntitiesResponse(
+            language=language)
+        grpc_stub.AnalyzeEntities.return_value = expected_response
+
+        response = client.analyze_entities(document, encoding_type)
+        self.assertEqual(expected_response, response)
+
+        grpc_stub.AnalyzeEntities.assert_called_once()
+        args, kwargs = grpc_stub.AnalyzeEntities.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_request = args[0]
+
+        expected_request = language_service_pb2.AnalyzeEntitiesRequest(
+            document=document, encoding_type=encoding_type)
+        self.assertEqual(expected_request, actual_request)
+
+    @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_analyze_entities_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+        encoding_type = enums.EncodingType.NONE
+
+        # Mock exception response
+        grpc_stub.AnalyzeEntities.side_effect = CustomException()
+
+        self.assertRaises(errors.GaxError, client.analyze_entities, document,
+                          encoding_type)
+
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_analyze_entity_sentiment(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+        encoding_type = enums.EncodingType.NONE
+
+        # Mock response
+        language = 'language-1613589672'
+        expected_response = language_service_pb2.AnalyzeEntitySentimentResponse(
+            language=language)
+        grpc_stub.AnalyzeEntitySentiment.return_value = expected_response
+
+        response = client.analyze_entity_sentiment(document, encoding_type)
+        self.assertEqual(expected_response, response)
+
+        grpc_stub.AnalyzeEntitySentiment.assert_called_once()
+        args, kwargs = grpc_stub.AnalyzeEntitySentiment.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_request = args[0]
+
+        expected_request = language_service_pb2.AnalyzeEntitySentimentRequest(
+            document=document, encoding_type=encoding_type)
+        self.assertEqual(expected_request, actual_request)
+
+    @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_analyze_entity_sentiment_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+        encoding_type = enums.EncodingType.NONE
+
+        # Mock exception response
+        grpc_stub.AnalyzeEntitySentiment.side_effect = CustomException()
+
+        self.assertRaises(errors.GaxError, client.analyze_entity_sentiment,
+                          document, encoding_type)
+
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_analyze_syntax(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+        encoding_type = enums.EncodingType.NONE
+
+        # Mock response
+        language = 'language-1613589672'
+        expected_response = language_service_pb2.AnalyzeSyntaxResponse(
+            language=language)
+        grpc_stub.AnalyzeSyntax.return_value = expected_response
+
+        response = client.analyze_syntax(document, encoding_type)
+        self.assertEqual(expected_response, response)
+
+        grpc_stub.AnalyzeSyntax.assert_called_once()
+        args, kwargs = grpc_stub.AnalyzeSyntax.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_request = args[0]
+
+        expected_request = language_service_pb2.AnalyzeSyntaxRequest(
+            document=document, encoding_type=encoding_type)
+        self.assertEqual(expected_request, actual_request)
+
+    @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_analyze_syntax_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+        encoding_type = enums.EncodingType.NONE
+
+        # Mock exception response
+        grpc_stub.AnalyzeSyntax.side_effect = CustomException()
+
+        self.assertRaises(errors.GaxError, client.analyze_syntax, document,
+                          encoding_type)
+
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_annotate_text(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+        features = language_service_pb2.AnnotateTextRequest.Features()
+        encoding_type = enums.EncodingType.NONE
+
+        # Mock response
+        language = 'language-1613589672'
+        expected_response = language_service_pb2.AnnotateTextResponse(
+            language=language)
+        grpc_stub.AnnotateText.return_value = expected_response
+
+        response = client.annotate_text(document, features, encoding_type)
+        self.assertEqual(expected_response, response)
+
+        grpc_stub.AnnotateText.assert_called_once()
+        args, kwargs = grpc_stub.AnnotateText.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_request = args[0]
+
+        expected_request = language_service_pb2.AnnotateTextRequest(
+            document=document, features=features, encoding_type=encoding_type)
+        self.assertEqual(expected_request, actual_request)
+
+    @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_annotate_text_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = language_service_client.LanguageServiceClient()
+
+        # Mock request
+        document = language_service_pb2.Document()
+        features = language_service_pb2.AnnotateTextRequest.Features()
+        encoding_type = enums.EncodingType.NONE
+
+        # Mock exception response
+        grpc_stub.AnnotateText.side_effect = CustomException()
+
+        self.assertRaises(errors.GaxError, client.annotate_text, document,
+                          features, encoding_type)
diff --git a/vision/setup.py b/vision/setup.py
index aeabefeb86c19..3055a5130cff7 100644
--- a/vision/setup.py
+++ b/vision/setup.py
@@ -26,7 +26,7 @@
 
 REQUIREMENTS = [
     'google-cloud-core >= 0.25.0, < 0.26dev',
-    'google-gax >= 0.15.7, < 0.16dev',
+    'google-gax >= 0.15.13, < 0.16dev',
     'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',
 ]
 EXTRAS_REQUIRE = {

From 9cf5e9b5b9fcc61db0ae1f91d7307dcafdb07348 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Wed, 26 Jul 2017 13:06:39 -0700
Subject: [PATCH 122/211] Cut release of vision API. (#3677)

Also bumping the version on the uber-package.
---
 vision/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vision/setup.py b/vision/setup.py
index 3055a5130cff7..ad485c0e8642a 100644
--- a/vision/setup.py
+++ b/vision/setup.py
@@ -37,7 +37,7 @@
     author='Google Cloud Platform',
     author_email='googleapis-publisher@google.com',
     name='google-cloud-vision',
-    version='0.25.0',
+    version='0.25.1',
     description='Python Client for Google Cloud Vision',
     long_description=readme,
     namespace_packages=[

From 86316d4b35906fd4330aa9a07fc95367d3c4577d Mon Sep 17 00:00:00 2001
From: Angela Li <yanhuil@google.com>
Date: Wed, 26 Jul 2017 13:51:56 -0700
Subject: [PATCH 123/211] Auto-generated trace library (GAPIC only) (#3512)

---
 docs/trace/apis.rst                           |  19 +
 docs/trace/conf.py                            | 311 +++++++
 docs/trace/index.rst                          |  41 +
 docs/trace/starting.rst                       |  78 ++
 nox.py                                        |   2 +-
 trace/.coveragerc                             |  11 +
 trace/LICENSE                                 | 201 +++++
 trace/MANIFEST.in                             |   7 +
 trace/PUBLISHING.rst                          |  46 ++
 trace/README.rst                              |  97 +++
 trace/google/__init__.py                      |   1 +
 trace/google/cloud/__init__.py                |   1 +
 trace/google/cloud/gapic/__init__.py          |   1 +
 trace/google/cloud/gapic/trace/__init__.py    |   1 +
 trace/google/cloud/gapic/trace/v1/__init__.py |   0
 trace/google/cloud/gapic/trace/v1/enums.py    |  53 ++
 .../gapic/trace/v1/trace_service_client.py    | 310 +++++++
 .../trace/v1/trace_service_client_config.json |  43 +
 trace/google/cloud/proto/__init__.py          |   1 +
 trace/google/cloud/proto/devtools/__init__.py |   1 +
 .../proto/devtools/cloudtrace/__init__.py     |   1 +
 .../proto/devtools/cloudtrace/v1/__init__.py  |   1 +
 .../proto/devtools/cloudtrace/v1/trace_pb2.py | 765 ++++++++++++++++++
 .../devtools/cloudtrace/v1/trace_pb2_grpc.py  |  93 +++
 trace/google/cloud/trace.py                   |  24 +
 trace/google/cloud/trace/__init__.py          |  18 +
 trace/google/cloud/trace/_gax.py              | 213 +++++
 trace/google/cloud/trace/client.py            | 167 ++++
 trace/google/cloud/trace_v1/__init__.py       |  25 +
 trace/google/cloud/trace_v1/types.py          |  28 +
 trace/nox.py                                  |  79 ++
 trace/setup.py                                |  44 +
 trace/tests/__init__.py                       |  13 +
 .../gapic/v1/test_trace_service_client_v1.py  | 177 ++++
 trace/tests/unit/test__gax.py                 | 429 ++++++++++
 trace/tests/unit/test_client.py               | 252 ++++++
 36 files changed, 3553 insertions(+), 1 deletion(-)
 create mode 100644 docs/trace/apis.rst
 create mode 100644 docs/trace/conf.py
 create mode 100644 docs/trace/index.rst
 create mode 100644 docs/trace/starting.rst
 create mode 100644 trace/.coveragerc
 create mode 100644 trace/LICENSE
 create mode 100644 trace/MANIFEST.in
 create mode 100644 trace/PUBLISHING.rst
 create mode 100644 trace/README.rst
 create mode 100644 trace/google/__init__.py
 create mode 100644 trace/google/cloud/__init__.py
 create mode 100644 trace/google/cloud/gapic/__init__.py
 create mode 100644 trace/google/cloud/gapic/trace/__init__.py
 create mode 100644 trace/google/cloud/gapic/trace/v1/__init__.py
 create mode 100644 trace/google/cloud/gapic/trace/v1/enums.py
 create mode 100644 trace/google/cloud/gapic/trace/v1/trace_service_client.py
 create mode 100644 trace/google/cloud/gapic/trace/v1/trace_service_client_config.json
 create mode 100644 trace/google/cloud/proto/__init__.py
 create mode 100644 trace/google/cloud/proto/devtools/__init__.py
 create mode 100644 trace/google/cloud/proto/devtools/cloudtrace/__init__.py
 create mode 100644 trace/google/cloud/proto/devtools/cloudtrace/v1/__init__.py
 create mode 100644 trace/google/cloud/proto/devtools/cloudtrace/v1/trace_pb2.py
 create mode 100644 trace/google/cloud/proto/devtools/cloudtrace/v1/trace_pb2_grpc.py
 create mode 100644 trace/google/cloud/trace.py
 create mode 100644 trace/google/cloud/trace/__init__.py
 create mode 100644 trace/google/cloud/trace/_gax.py
 create mode 100644 trace/google/cloud/trace/client.py
 create mode 100644 trace/google/cloud/trace_v1/__init__.py
 create mode 100644 trace/google/cloud/trace_v1/types.py
 create mode 100644 trace/nox.py
 create mode 100644 trace/setup.py
 create mode 100644 trace/tests/__init__.py
 create mode 100644 trace/tests/gapic/v1/test_trace_service_client_v1.py
 create mode 100644 trace/tests/unit/test__gax.py
 create mode 100644 trace/tests/unit/test_client.py

diff --git a/docs/trace/apis.rst b/docs/trace/apis.rst
new file mode 100644
index 0000000000000..80a8d50c0c60a
--- /dev/null
+++ b/docs/trace/apis.rst
@@ -0,0 +1,19 @@
+API Reference
+=============
+
+APIs
+----
+
+.. autosummary::
+   :toctree:
+
+   google.cloud.gapic.trace.v1.trace_service_client
+
+
+API types
+~~~~~~~~~
+
+.. autosummary::
+   :toctree:
+
+   google.cloud.gapic.trace.v1.enums
diff --git a/docs/trace/conf.py b/docs/trace/conf.py
new file mode 100644
index 0000000000000..5eead079b01ce
--- /dev/null
+++ b/docs/trace/conf.py
@@ -0,0 +1,311 @@
+# -*- coding: utf-8 -*-
+#
+# google-cloud-trace documentation build configuration file
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+import shlex
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.insert(0, os.path.abspath('..'))
+
+__version__ = '0.15.4'
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.autosummary',
+    'sphinx.ext.intersphinx',
+    'sphinx.ext.coverage',
+    'sphinx.ext.napoleon',
+    'sphinx.ext.viewcode',
+]
+
+# autodoc/autosummary flags
+autoclass_content = 'both'
+autodoc_default_flags = ['members']
+autosummary_generate = True
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'google-cloud-trace'
+copyright = u'2017, Google'
+author = u'Google APIs'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The full version, including alpha/beta/rc tags.
+release = __version__
+# The short X.Y version.
+version = '.'.join(release.split('.')[0:2])
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = True
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'sphinx_rtd_theme'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+# html_static_path = []
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+#   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
+#   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
+#html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# Now only 'ja' uses this config value
+#html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#html_search_scorer = 'scorer.js'
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'google-cloud-trace-doc'
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
+
+    # Latex figure (float) alignment
+    #'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'google-cloud-trace.tex',
+     u'google-cloud-trace Documentation', author, 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [(master_doc, 'google-cloud-trace',
+              u'google-cloud-trace Documentation', [author], 1)]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'google-cloud-trace',
+     u'google-cloud-trace Documentation', author,
+     'google-cloud-trace',
+     'GAPIC library for the {metadata.shortName} v1 service', 'APIs'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False
+
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {
+    'python': ('http://python.readthedocs.org/en/latest/', None),
+    'gax': ('https://gax-python.readthedocs.org/en/latest/', None),
+}
+
+# Napoleon settings
+napoleon_google_docstring = True
+napoleon_numpy_docstring = True
+napoleon_include_private_with_doc = False
+napoleon_include_special_with_doc = True
+napoleon_use_admonition_for_examples = False
+napoleon_use_admonition_for_notes = False
+napoleon_use_admonition_for_references = False
+napoleon_use_ivar = False
+napoleon_use_param = True
+napoleon_use_rtype = True
diff --git a/docs/trace/index.rst b/docs/trace/index.rst
new file mode 100644
index 0000000000000..08044709bcc66
--- /dev/null
+++ b/docs/trace/index.rst
@@ -0,0 +1,41 @@
+.. gapic-google-cloud-trace-v1 sphinx documentation master file
+
+
+GAPIC library for the Stackdriver Trace API
+=============================================================================================================
+
+This is the API documentation for ``gapic-google-cloud-trace-v1``.
+
+gapic-google-cloud-trace-v1 uses google-gax_ (Google API extensions) to provide an
+easy-to-use client library for the `Stackdriver Trace API`_ (v1) defined in the googleapis_ git repository
+
+
+.. _`google-gax`: https://github.com/googleapis/gax-python
+.. _`googleapis`: https://github.com/googleapis/googleapis/tree/master/google/devtools/cloudtrace/v1
+.. _`Stackdriver Trace API`: https://developers.google.com/apis-explorer/?hl=en_US#p/cloudtrace/v1/
+
+
+APIs
+----
+
+.. autosummary::
+
+   google.cloud.gapic.trace.v1.trace_service_client
+
+
+Contents
+--------
+
+.. toctree::
+
+   self
+   starting
+   apis
+
+
+Indices and tables
+------------------
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff --git a/docs/trace/starting.rst b/docs/trace/starting.rst
new file mode 100644
index 0000000000000..245fcfd68a875
--- /dev/null
+++ b/docs/trace/starting.rst
@@ -0,0 +1,78 @@
+Getting started
+===============
+
+gapic-google-cloud-trace-v1 will allow you to connect to the `Stackdriver Trace API`_ and access all its methods. In order to achieve this, you need to set up authentication as well as install the library locally.
+
+.. _`Stackdriver Trace API`: https://developers.google.com/apis-explorer/?hl=en_US#p/cloudtrace/v1/
+
+
+Installation
+------------
+
+
+Install this library in a `virtualenv`_ using pip. `virtualenv`_ is a tool to
+create isolated Python environments. The basic problem it addresses is one of
+dependencies and versions, and indirectly permissions.
+
+With `virtualenv`_, it's possible to install this library without needing system
+install permissions, and without clashing with the installed system
+dependencies.
+
+.. _`virtualenv`: https://virtualenv.pypa.io/en/latest/
+
+
+Mac/Linux
+~~~~~~~~~~
+
+.. code-block:: console
+
+    pip install virtualenv
+    virtualenv <your-env>
+    source <your-env>/bin/activate
+    <your-env>/bin/pip install gapic-google-cloud-trace-v1
+
+Windows
+~~~~~~~
+
+.. code-block:: console
+
+    pip install virtualenv
+    virtualenv <your-env>
+    <your-env>\Scripts\activate
+    <your-env>\Scripts\pip.exe install gapic-google-cloud-trace-v1
+
+
+Using the API
+-------------
+
+
+Authentication
+~~~~~~~~~~~~~~
+
+To authenticate all your API calls, first install and setup the `Google Cloud SDK`_.
+Once done, you can then run the following command in your terminal:
+
+.. code-block:: console
+
+    $ gcloud beta auth application-default login
+
+or
+
+.. code-block:: console
+
+    $ gcloud auth login
+
+Please see `gcloud beta auth application-default login`_ document for the difference between these commands.
+
+.. _Google Cloud SDK: https://cloud.google.com/sdk/
+.. _gcloud beta auth application-default login: https://cloud.google.com/sdk/gcloud/reference/beta/auth/application-default/login
+.. code-block:: console
+
+At this point you are all set to continue.
+
+
+Examples
+~~~~~~~~
+
+To see example usage, please read through the :doc:`API reference </apis>`.  The
+documentation for each API method includes simple examples.
diff --git a/nox.py b/nox.py
index 3d283c821bdc1..25db4c616c4f6 100644
--- a/nox.py
+++ b/nox.py
@@ -34,7 +34,7 @@ def docs(session):
         'core/', 'bigquery/', 'bigtable/', 'datastore/', 'dns/', 'language/',
         'logging/', 'error_reporting/', 'monitoring/', 'pubsub/',
         'resource_manager/', 'runtimeconfig/', 'spanner/', 'speech/',
-        'storage/', 'translate/', 'vision/',
+        'storage/', 'trace/', 'translate/', 'vision/',
     )
     session.install('-e', '.')
 
diff --git a/trace/.coveragerc b/trace/.coveragerc
new file mode 100644
index 0000000000000..a54b99aa14b7a
--- /dev/null
+++ b/trace/.coveragerc
@@ -0,0 +1,11 @@
+[run]
+branch = True
+
+[report]
+fail_under = 100
+show_missing = True
+exclude_lines =
+    # Re-enable the standard pragma
+    pragma: NO COVER
+    # Ignore debug-only repr
+    def __repr__
diff --git a/trace/LICENSE b/trace/LICENSE
new file mode 100644
index 0000000000000..724a8807144b9
--- /dev/null
+++ b/trace/LICENSE
@@ -0,0 +1,201 @@
+                            Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/trace/MANIFEST.in b/trace/MANIFEST.in
new file mode 100644
index 0000000000000..8a2c2aa5ab99f
--- /dev/null
+++ b/trace/MANIFEST.in
@@ -0,0 +1,7 @@
+include README.rst LICENSE
+recursive-include tests *
+global-include google *.json *.proto
+graft google
+global-exclude *.py[co]
+global-exclude __pycache__
+prune .tox
diff --git a/trace/PUBLISHING.rst b/trace/PUBLISHING.rst
new file mode 100644
index 0000000000000..a6d81225248bd
--- /dev/null
+++ b/trace/PUBLISHING.rst
@@ -0,0 +1,46 @@
+PUBLISHING
+----------
+
+Note: This folder has been generated by the GAPIC code generator.
+
+The instructions assumes that no changes have been made to folder and its
+contents since it was created.
+
+PREREQUISITES
+-------------
+
+- Python must installed
+- [tox](https://testrun.org/tox/latest/) must be installed
+
+
+TO PUBLISH
+----------
+
+- Make sure you have `an account`_ on pypi_.
+- Publish your package using tox.
+- *tox must be used here or the uploaded package will be invalid!!*
+
+  ::
+
+    tox -e upload-package
+
+
+TO PUBLISH THE DOCS
+-------------------
+
+- Create the docs
+
+  ::
+
+    tox -e docs
+
+- Publish them to pythonhosted.org
+
+  ::
+
+    tox -e upload-docs
+
+
+_`Packaging and Distributing projects`: https://packaging.python.org/en/latest/distributing.html#uploading-your-project-to-pypi
+_`an account`: https://pypi.python.org/pypi?%3Aaction=register_form
+_pypi: http://pypi.python.org
diff --git a/trace/README.rst b/trace/README.rst
new file mode 100644
index 0000000000000..39178ee440fca
--- /dev/null
+++ b/trace/README.rst
@@ -0,0 +1,97 @@
+Python Client for Stackdriver Trace API (`Alpha`_)
+==================================================================================================
+
+Idiomatic Python client for `Stackdriver Trace API`_
+
+- `Client Library Documentation`_
+- `Product Documentation`_
+
+.. _Alpha: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/README.rst
+.. _Stackdriver Trace API: https://cloud.google.com/trace
+.. _Client Library Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/trace-usage
+.. _Product Documentation:  https://cloud.google.com/trace
+
+Quick Start
+-----------
+
+In order to use this library, you first need to go through the following steps:
+
+1. `Select or create a Cloud Platform project.`_
+2. `Enable the monitoring api.`_
+3. `Setup Authentication.`_
+
+.. _Select or create a Cloud Platform project.: https://console.cloud.google.com/project
+.. _Enable the trace api.:  https://cloud.google.com/trace
+.. _Setup Authentication.: https://googlecloudplatform.github.io/google-cloud-python/stable/google-cloud-auth
+
+Installation
+~~~~~~~~~~~~
+
+Install this library in a `virtualenv`_ using pip. `virtualenv`_ is a tool to
+create isolated Python environments. The basic problem it addresses is one of
+dependencies and versions, and indirectly permissions.
+
+With `virtualenv`_, it's possible to install this library without needing system
+install permissions, and without clashing with the installed system
+dependencies.
+
+.. _`virtualenv`: https://virtualenv.pypa.io/en/latest/
+
+
+Mac/Linux
+^^^^^^^^^
+
+.. code-block:: console
+
+    pip install virtualenv
+    virtualenv <your-env>
+    source <your-env>/bin/activate
+    <your-env>/bin/pip install gapic-google-cloud-trace-v1
+
+
+Windows
+^^^^^^^
+
+.. code-block:: console
+
+    pip install virtualenv
+    virtualenv <your-env>
+    <your-env>\Scripts\activate
+    <your-env>\Scripts\pip.exe install gapic-google-cloud-trace-v1
+
+Preview
+~~~~~~~
+
+TraceServiceClient
+^^^^^^^^^^^^^^^^^^^^^^
+
+.. code:: py
+
+  from google.cloud.gapic.trace.v1 import trace_service_client
+  from google.gax import CallOptions, INITIAL_PAGE
+  client = trace_service_client.TraceServiceClient()
+  project_id = ''
+
+  # Iterate over all results
+  for element in client.list_traces(project_id):
+      # process element
+      pass
+
+  # Or iterate over results one page at a time
+  for page in client.list_traces(project_id, options=CallOptions(page_token=INITIAL_PAGE)):
+      for element in page:
+          # process element
+          pass
+
+Next Steps
+~~~~~~~~~~
+
+-  Read the `Client Library Documentation`_ for Stackdriver Trace API
+   API to see other available methods on the client.
+-  Read the `Stackdriver Trace API Product documentation`_ to learn
+   more about the product and see How-to Guides.
+-  View this `repository’s main README`_ to see the full list of Cloud
+   APIs that we cover.
+
+.. _Stackdriver Trace API Product documentation:  https://cloud.google.com/trace
+.. _repository’s main README: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/README.rst
\ No newline at end of file
diff --git a/trace/google/__init__.py b/trace/google/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/trace/google/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/trace/google/cloud/__init__.py b/trace/google/cloud/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/trace/google/cloud/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/trace/google/cloud/gapic/__init__.py b/trace/google/cloud/gapic/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/trace/google/cloud/gapic/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/trace/google/cloud/gapic/trace/__init__.py b/trace/google/cloud/gapic/trace/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/trace/google/cloud/gapic/trace/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/trace/google/cloud/gapic/trace/v1/__init__.py b/trace/google/cloud/gapic/trace/v1/__init__.py
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/trace/google/cloud/gapic/trace/v1/enums.py b/trace/google/cloud/gapic/trace/v1/enums.py
new file mode 100644
index 0000000000000..c6cc48fb471a1
--- /dev/null
+++ b/trace/google/cloud/gapic/trace/v1/enums.py
@@ -0,0 +1,53 @@
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Wrappers for protocol buffer enum types."""
+
+
+class TraceSpan(object):
+    class SpanKind(object):
+        """
+        Type of span. Can be used to specify additional relationships between spans
+        in addition to a parent/child relationship.
+
+        Attributes:
+          SPAN_KIND_UNSPECIFIED (int): Unspecified.
+          RPC_SERVER (int): Indicates that the span covers server-side handling of an RPC or other
+            remote network request.
+          RPC_CLIENT (int): Indicates that the span covers the client-side wrapper around an RPC or
+            other remote request.
+        """
+        SPAN_KIND_UNSPECIFIED = 0
+        RPC_SERVER = 1
+        RPC_CLIENT = 2
+
+
+class ListTracesRequest(object):
+    class ViewType(object):
+        """
+        Type of data returned for traces in the list.
+
+        Attributes:
+          VIEW_TYPE_UNSPECIFIED (int): Default is ``MINIMAL`` if unspecified.
+          MINIMAL (int): Minimal view of the trace record that contains only the project
+            and trace IDs.
+          ROOTSPAN (int): Root span view of the trace record that returns the root spans along
+            with the minimal trace data.
+          COMPLETE (int): Complete view of the trace record that contains the actual trace data.
+            This is equivalent to calling the REST ``get`` or RPC ``GetTrace`` method
+            using the ID of each listed trace.
+        """
+        VIEW_TYPE_UNSPECIFIED = 0
+        MINIMAL = 1
+        ROOTSPAN = 2
+        COMPLETE = 3
diff --git a/trace/google/cloud/gapic/trace/v1/trace_service_client.py b/trace/google/cloud/gapic/trace/v1/trace_service_client.py
new file mode 100644
index 0000000000000..22ef0eb1aec13
--- /dev/null
+++ b/trace/google/cloud/gapic/trace/v1/trace_service_client.py
@@ -0,0 +1,310 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# EDITING INSTRUCTIONS
+# This file was generated from the file
+# https://github.com/google/googleapis/blob/master/google/devtools/cloudtrace/v1/trace.proto,
+# and updates to that file get reflected here through a refresh process.
+# For the short term, the refresh process will only be runnable by Google engineers.
+#
+# The only allowed edits are to method and file documentation. A 3-way
+# merge preserves those additions if the generated source changes.
+"""Accesses the google.devtools.cloudtrace.v1 TraceService API."""
+
+import collections
+import json
+import os
+import pkg_resources
+import platform
+
+from google.gax import api_callable
+from google.gax import config
+from google.gax import path_template
+import google.gax
+
+from google.cloud.gapic.trace.v1 import enums
+from google.cloud.proto.devtools.cloudtrace.v1 import trace_pb2
+from google.protobuf import timestamp_pb2
+
+_PageDesc = google.gax.PageDescriptor
+
+
+class TraceServiceClient(object):
+    """
+    This file describes an API for collecting and viewing traces and spans
+    within a trace.  A Trace is a collection of spans corresponding to a single
+    operation or set of operations for an application. A span is an individual
+    timed event which forms a node of the trace tree. Spans for a single trace
+    may span multiple services.
+    """
+
+    SERVICE_ADDRESS = 'cloudtrace.googleapis.com'
+    """The default address of the service."""
+
+    DEFAULT_SERVICE_PORT = 443
+    """The default port of the service."""
+
+    _PAGE_DESCRIPTORS = {
+        'list_traces': _PageDesc('page_token', 'next_page_token', 'traces')
+    }
+
+    # The scopes needed to make gRPC calls to all of the methods defined in
+    # this service
+    _ALL_SCOPES = ('https://www.googleapis.com/auth/cloud-platform',
+                   'https://www.googleapis.com/auth/trace.append',
+                   'https://www.googleapis.com/auth/trace.readonly', )
+
+    def __init__(self,
+                 service_path=SERVICE_ADDRESS,
+                 port=DEFAULT_SERVICE_PORT,
+                 channel=None,
+                 credentials=None,
+                 ssl_credentials=None,
+                 scopes=None,
+                 client_config=None,
+                 app_name=None,
+                 app_version='',
+                 lib_name=None,
+                 lib_version='',
+                 metrics_headers=()):
+        """Constructor.
+
+        Args:
+          service_path (string): The domain name of the API remote host.
+          port (int): The port on which to connect to the remote host.
+          channel (:class:`grpc.Channel`): A ``Channel`` instance through
+            which to make calls.
+          credentials (object): The authorization credentials to attach to
+            requests. These credentials identify this application to the
+            service.
+          ssl_credentials (:class:`grpc.ChannelCredentials`): A
+            ``ChannelCredentials`` instance for use with an SSL-enabled
+            channel.
+          scopes (list[string]): A list of OAuth2 scopes to attach to requests.
+          client_config (dict):
+            A dictionary for call options for each method. See
+            :func:`google.gax.construct_settings` for the structure of
+            this data. Falls back to the default config if not specified
+            or the specified config is missing data points.
+          app_name (string): The name of the application calling
+            the service. Recommended for analytics purposes.
+          app_version (string): The version of the application calling
+            the service. Recommended for analytics purposes.
+          lib_name (string): The API library software used for calling
+            the service. (Unless you are writing an API client itself,
+            leave this as default.)
+          lib_version (string): The API library software version used
+            for calling the service. (Unless you are writing an API client
+            itself, leave this as default.)
+          metrics_headers (dict): A dictionary of values for tracking
+            client library metrics. Ultimately serializes to a string
+            (e.g. 'foo/1.2.3 bar/3.14.1'). This argument should be
+            considered private.
+
+        Returns:
+          A TraceServiceClient object.
+        """
+        # Unless the calling application specifically requested
+        # OAuth scopes, request everything.
+        if scopes is None:
+            scopes = self._ALL_SCOPES
+
+        # Initialize an empty client config, if none is set.
+        if client_config is None:
+            client_config = {}
+
+        # Initialize metrics_headers as an ordered dictionary
+        # (cuts down on cardinality of the resulting string slightly).
+        metrics_headers = collections.OrderedDict(metrics_headers)
+        metrics_headers['gl-python'] = platform.python_version()
+
+        # The library may or may not be set, depending on what is
+        # calling this client. Newer client libraries set the library name
+        # and version.
+        if lib_name:
+            metrics_headers[lib_name] = lib_version
+
+        # Finally, track the GAPIC package version.
+        metrics_headers['gapic'] = pkg_resources.get_distribution(
+            'google-cloud-trace', ).version
+
+        # Load the configuration defaults.
+        default_client_config = json.loads(
+            pkg_resources.resource_string(
+                __name__, 'trace_service_client_config.json').decode())
+        defaults = api_callable.construct_settings(
+            'google.devtools.cloudtrace.v1.TraceService',
+            default_client_config,
+            client_config,
+            config.STATUS_CODE_NAMES,
+            metrics_headers=metrics_headers,
+            page_descriptors=self._PAGE_DESCRIPTORS, )
+        self.trace_service_stub = config.create_stub(
+            trace_pb2.TraceServiceStub,
+            channel=channel,
+            service_path=service_path,
+            service_port=port,
+            credentials=credentials,
+            scopes=scopes,
+            ssl_credentials=ssl_credentials)
+
+        self._patch_traces = api_callable.create_api_call(
+            self.trace_service_stub.PatchTraces,
+            settings=defaults['patch_traces'])
+        self._get_trace = api_callable.create_api_call(
+            self.trace_service_stub.GetTrace, settings=defaults['get_trace'])
+        self._list_traces = api_callable.create_api_call(
+            self.trace_service_stub.ListTraces,
+            settings=defaults['list_traces'])
+
+    # Service calls
+    def patch_traces(self, project_id, traces, options=None):
+        """
+        Sends new traces to Stackdriver Trace or updates existing traces. If the ID
+        of a trace that you send matches that of an existing trace, any fields
+        in the existing trace and its spans are overwritten by the provided values,
+        and any new fields provided are merged with the existing trace data. If the
+        ID does not match, a new trace is created.
+
+        Example:
+          >>> from google.cloud.gapic.trace.v1 import trace_service_client
+          >>> from google.cloud.proto.devtools.cloudtrace.v1 import trace_pb2
+          >>> client = trace_service_client.TraceServiceClient()
+          >>> project_id = ''
+          >>> traces = trace_pb2.Traces()
+          >>> client.patch_traces(project_id, traces)
+
+        Args:
+          project_id (string): ID of the Cloud project where the trace data is stored.
+          traces (:class:`google.cloud.proto.devtools.cloudtrace.v1.trace_pb2.Traces`): The body of the message.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        # Create the request object.
+        request = trace_pb2.PatchTracesRequest(
+            project_id=project_id, traces=traces)
+        self._patch_traces(request, options)
+
+    def get_trace(self, project_id, trace_id, options=None):
+        """
+        Gets a single trace by its ID.
+
+        Example:
+          >>> from google.cloud.gapic.trace.v1 import trace_service_client
+          >>> client = trace_service_client.TraceServiceClient()
+          >>> project_id = ''
+          >>> trace_id = ''
+          >>> response = client.get_trace(project_id, trace_id)
+
+        Args:
+          project_id (string): ID of the Cloud project where the trace data is stored.
+          trace_id (string): ID of the trace to return.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          A :class:`google.cloud.proto.devtools.cloudtrace.v1.trace_pb2.Trace` instance.
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        # Create the request object.
+        request = trace_pb2.GetTraceRequest(
+            project_id=project_id, trace_id=trace_id)
+        return self._get_trace(request, options)
+
+    def list_traces(self,
+                    project_id,
+                    view=None,
+                    page_size=None,
+                    start_time=None,
+                    end_time=None,
+                    filter_=None,
+                    order_by=None,
+                    options=None):
+        """
+        Returns of a list of traces that match the specified filter conditions.
+
+        Example:
+          >>> from google.cloud.gapic.trace.v1 import trace_service_client
+          >>> from google.gax import CallOptions, INITIAL_PAGE
+          >>> client = trace_service_client.TraceServiceClient()
+          >>> project_id = ''
+          >>>
+          >>> # Iterate over all results
+          >>> for element in client.list_traces(project_id):
+          >>>     # process element
+          >>>     pass
+          >>>
+          >>> # Or iterate over results one page at a time
+          >>> for page in client.list_traces(project_id, options=CallOptions(page_token=INITIAL_PAGE)):
+          >>>     for element in page:
+          >>>         # process element
+          >>>         pass
+
+        Args:
+          project_id (string): ID of the Cloud project where the trace data is stored.
+          view (enum :class:`google.cloud.gapic.trace.v1.enums.ListTracesRequest.ViewType`): Type of data returned for traces in the list. Optional. Default is
+            ``MINIMAL``.
+          page_size (int): Maximum number of traces to return. If not specified or <= 0, the
+            implementation selects a reasonable value.  The implementation may
+            return fewer traces than the requested page size. Optional.
+          start_time (:class:`google.protobuf.timestamp_pb2.Timestamp`): End of the time interval (inclusive) during which the trace data was
+            collected from the application.
+          end_time (:class:`google.protobuf.timestamp_pb2.Timestamp`): Start of the time interval (inclusive) during which the trace data was
+            collected from the application.
+          filter_ (string): An optional filter for the request.
+          order_by (string): Field used to sort the returned traces. Optional.
+            Can be one of the following:
+
+            *   ``trace_id``
+            *   ``name`` (``name`` field of root span in the trace)
+            *   ``duration`` (difference between ``end_time`` and ``start_time`` fields of
+            ::
+
+                 the root span)
+            *   ``start`` (``start_time`` field of the root span)
+
+            Descending order can be specified by appending ``desc`` to the sort field
+            (for example, ``name desc``).
+
+            Only one sort field is permitted.
+          options (:class:`google.gax.CallOptions`): Overrides the default
+            settings for this call, e.g, timeout, retries etc.
+
+        Returns:
+          A :class:`google.gax.PageIterator` instance. By default, this
+          is an iterable of :class:`google.cloud.proto.devtools.cloudtrace.v1.trace_pb2.Trace` instances.
+          This object can also be configured to iterate over the pages
+          of the response through the `CallOptions` parameter.
+
+        Raises:
+          :exc:`google.gax.errors.GaxError` if the RPC is aborted.
+          :exc:`ValueError` if the parameters are invalid.
+        """
+        # Create the request object.
+        request = trace_pb2.ListTracesRequest(
+            project_id=project_id,
+            view=view,
+            page_size=page_size,
+            start_time=start_time,
+            end_time=end_time,
+            filter=filter_,
+            order_by=order_by)
+        return self._list_traces(request, options)
diff --git a/trace/google/cloud/gapic/trace/v1/trace_service_client_config.json b/trace/google/cloud/gapic/trace/v1/trace_service_client_config.json
new file mode 100644
index 0000000000000..5e826c186b13e
--- /dev/null
+++ b/trace/google/cloud/gapic/trace/v1/trace_service_client_config.json
@@ -0,0 +1,43 @@
+{
+  "interfaces": {
+    "google.devtools.cloudtrace.v1.TraceService": {
+      "retry_codes": {
+        "idempotent": [
+          "DEADLINE_EXCEEDED",
+          "UNAVAILABLE"
+        ],
+        "non_idempotent": [
+          "UNAVAILABLE"
+        ]
+      },
+      "retry_params": {
+        "default": {
+          "initial_retry_delay_millis": 100,
+          "retry_delay_multiplier": 1.2,
+          "max_retry_delay_millis": 1000,
+          "initial_rpc_timeout_millis": 20000,
+          "rpc_timeout_multiplier": 1.5,
+          "max_rpc_timeout_millis": 30000,
+          "total_timeout_millis": 45000
+        }
+      },
+      "methods": {
+        "PatchTraces": {
+          "timeout_millis": 30000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        },
+        "GetTrace": {
+          "timeout_millis": 30000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        },
+        "ListTraces": {
+          "timeout_millis": 30000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        }
+      }
+    }
+  }
+}
diff --git a/trace/google/cloud/proto/__init__.py b/trace/google/cloud/proto/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/trace/google/cloud/proto/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/trace/google/cloud/proto/devtools/__init__.py b/trace/google/cloud/proto/devtools/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/trace/google/cloud/proto/devtools/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/trace/google/cloud/proto/devtools/cloudtrace/__init__.py b/trace/google/cloud/proto/devtools/cloudtrace/__init__.py
new file mode 100644
index 0000000000000..de40ea7ca058e
--- /dev/null
+++ b/trace/google/cloud/proto/devtools/cloudtrace/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/trace/google/cloud/proto/devtools/cloudtrace/v1/__init__.py b/trace/google/cloud/proto/devtools/cloudtrace/v1/__init__.py
new file mode 100644
index 0000000000000..8b137891791fe
--- /dev/null
+++ b/trace/google/cloud/proto/devtools/cloudtrace/v1/__init__.py
@@ -0,0 +1 @@
+
diff --git a/trace/google/cloud/proto/devtools/cloudtrace/v1/trace_pb2.py b/trace/google/cloud/proto/devtools/cloudtrace/v1/trace_pb2.py
new file mode 100644
index 0000000000000..389893c0d9fd2
--- /dev/null
+++ b/trace/google/cloud/proto/devtools/cloudtrace/v1/trace_pb2.py
@@ -0,0 +1,765 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: google/cloud/proto/devtools/cloudtrace/v1/trace.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf import descriptor_pb2
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='google/cloud/proto/devtools/cloudtrace/v1/trace.proto',
+  package='google.devtools.cloudtrace.v1',
+  syntax='proto3',
+  serialized_pb=_b('\n5google/cloud/proto/devtools/cloudtrace/v1/trace.proto\x12\x1dgoogle.devtools.cloudtrace.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"f\n\x05Trace\x12\x12\n\nproject_id\x18\x01 \x01(\t\x12\x10\n\x08trace_id\x18\x02 \x01(\t\x12\x37\n\x05spans\x18\x03 \x03(\x0b\x32(.google.devtools.cloudtrace.v1.TraceSpan\">\n\x06Traces\x12\x34\n\x06traces\x18\x01 \x03(\x0b\x32$.google.devtools.cloudtrace.v1.Trace\"\x9d\x03\n\tTraceSpan\x12\x0f\n\x07span_id\x18\x01 \x01(\x06\x12?\n\x04kind\x18\x02 \x01(\x0e\x32\x31.google.devtools.cloudtrace.v1.TraceSpan.SpanKind\x12\x0c\n\x04name\x18\x03 \x01(\t\x12.\n\nstart_time\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12,\n\x08\x65nd_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x16\n\x0eparent_span_id\x18\x06 \x01(\x06\x12\x44\n\x06labels\x18\x07 \x03(\x0b\x32\x34.google.devtools.cloudtrace.v1.TraceSpan.LabelsEntry\x1a-\n\x0bLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"E\n\x08SpanKind\x12\x19\n\x15SPAN_KIND_UNSPECIFIED\x10\x00\x12\x0e\n\nRPC_SERVER\x10\x01\x12\x0e\n\nRPC_CLIENT\x10\x02\"\xe7\x02\n\x11ListTracesRequest\x12\x12\n\nproject_id\x18\x01 \x01(\t\x12G\n\x04view\x18\x02 \x01(\x0e\x32\x39.google.devtools.cloudtrace.v1.ListTracesRequest.ViewType\x12\x11\n\tpage_size\x18\x03 \x01(\x05\x12\x12\n\npage_token\x18\x04 \x01(\t\x12.\n\nstart_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12,\n\x08\x65nd_time\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0e\n\x06\x66ilter\x18\x07 \x01(\t\x12\x10\n\x08order_by\x18\x08 \x01(\t\"N\n\x08ViewType\x12\x19\n\x15VIEW_TYPE_UNSPECIFIED\x10\x00\x12\x0b\n\x07MINIMAL\x10\x01\x12\x0c\n\x08ROOTSPAN\x10\x02\x12\x0c\n\x08\x43OMPLETE\x10\x03\"c\n\x12ListTracesResponse\x12\x34\n\x06traces\x18\x01 \x03(\x0b\x32$.google.devtools.cloudtrace.v1.Trace\x12\x17\n\x0fnext_page_token\x18\x02 \x01(\t\"7\n\x0fGetTraceRequest\x12\x12\n\nproject_id\x18\x01 \x01(\t\x12\x10\n\x08trace_id\x18\x02 \x01(\t\"_\n\x12PatchTracesRequest\x12\x12\n\nproject_id\x18\x01 \x01(\t\x12\x35\n\x06traces\x18\x02 \x01(\x0b\x32%.google.devtools.cloudtrace.v1.Traces2\xd1\x03\n\x0cTraceService\x12\x9b\x01\n\nListTraces\x12\x30.google.devtools.cloudtrace.v1.ListTracesRequest\x1a\x31.google.devtools.cloudtrace.v1.ListTracesResponse\"(\x82\xd3\xe4\x93\x02\"\x12 /v1/projects/{project_id}/traces\x12\x95\x01\n\x08GetTrace\x12..google.devtools.cloudtrace.v1.GetTraceRequest\x1a$.google.devtools.cloudtrace.v1.Trace\"3\x82\xd3\xe4\x93\x02-\x12+/v1/projects/{project_id}/traces/{trace_id}\x12\x8a\x01\n\x0bPatchTraces\x12\x31.google.devtools.cloudtrace.v1.PatchTracesRequest\x1a\x16.google.protobuf.Empty\"0\x82\xd3\xe4\x93\x02*2 /v1/projects/{project_id}/traces:\x06tracesB\x92\x01\n!com.google.devtools.cloudtrace.v1B\nTraceProtoP\x01ZGgoogle.golang.org/genproto/googleapis/devtools/cloudtrace/v1;cloudtrace\xaa\x02\x15Google.Cloud.Trace.V1b\x06proto3')
+  ,
+  dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_protobuf_dot_empty__pb2.DESCRIPTOR,google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,])
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+
+
+_TRACESPAN_SPANKIND = _descriptor.EnumDescriptor(
+  name='SpanKind',
+  full_name='google.devtools.cloudtrace.v1.TraceSpan.SpanKind',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='SPAN_KIND_UNSPECIFIED', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RPC_SERVER', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RPC_CLIENT', index=2, number=2,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=693,
+  serialized_end=762,
+)
+_sym_db.RegisterEnumDescriptor(_TRACESPAN_SPANKIND)
+
+_LISTTRACESREQUEST_VIEWTYPE = _descriptor.EnumDescriptor(
+  name='ViewType',
+  full_name='google.devtools.cloudtrace.v1.ListTracesRequest.ViewType',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='VIEW_TYPE_UNSPECIFIED', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MINIMAL', index=1, number=1,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ROOTSPAN', index=2, number=2,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='COMPLETE', index=3, number=3,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=1046,
+  serialized_end=1124,
+)
+_sym_db.RegisterEnumDescriptor(_LISTTRACESREQUEST_VIEWTYPE)
+
+
+_TRACE = _descriptor.Descriptor(
+  name='Trace',
+  full_name='google.devtools.cloudtrace.v1.Trace',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='project_id', full_name='google.devtools.cloudtrace.v1.Trace.project_id', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='trace_id', full_name='google.devtools.cloudtrace.v1.Trace.trace_id', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='spans', full_name='google.devtools.cloudtrace.v1.Trace.spans', index=2,
+      number=3, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=180,
+  serialized_end=282,
+)
+
+
+_TRACES = _descriptor.Descriptor(
+  name='Traces',
+  full_name='google.devtools.cloudtrace.v1.Traces',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='traces', full_name='google.devtools.cloudtrace.v1.Traces.traces', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=284,
+  serialized_end=346,
+)
+
+
+_TRACESPAN_LABELSENTRY = _descriptor.Descriptor(
+  name='LabelsEntry',
+  full_name='google.devtools.cloudtrace.v1.TraceSpan.LabelsEntry',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='key', full_name='google.devtools.cloudtrace.v1.TraceSpan.LabelsEntry.key', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='value', full_name='google.devtools.cloudtrace.v1.TraceSpan.LabelsEntry.value', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=646,
+  serialized_end=691,
+)
+
+_TRACESPAN = _descriptor.Descriptor(
+  name='TraceSpan',
+  full_name='google.devtools.cloudtrace.v1.TraceSpan',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='span_id', full_name='google.devtools.cloudtrace.v1.TraceSpan.span_id', index=0,
+      number=1, type=6, cpp_type=4, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='kind', full_name='google.devtools.cloudtrace.v1.TraceSpan.kind', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='name', full_name='google.devtools.cloudtrace.v1.TraceSpan.name', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='start_time', full_name='google.devtools.cloudtrace.v1.TraceSpan.start_time', index=3,
+      number=4, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='end_time', full_name='google.devtools.cloudtrace.v1.TraceSpan.end_time', index=4,
+      number=5, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='parent_span_id', full_name='google.devtools.cloudtrace.v1.TraceSpan.parent_span_id', index=5,
+      number=6, type=6, cpp_type=4, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='labels', full_name='google.devtools.cloudtrace.v1.TraceSpan.labels', index=6,
+      number=7, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[_TRACESPAN_LABELSENTRY, ],
+  enum_types=[
+    _TRACESPAN_SPANKIND,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=349,
+  serialized_end=762,
+)
+
+
+_LISTTRACESREQUEST = _descriptor.Descriptor(
+  name='ListTracesRequest',
+  full_name='google.devtools.cloudtrace.v1.ListTracesRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='project_id', full_name='google.devtools.cloudtrace.v1.ListTracesRequest.project_id', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='view', full_name='google.devtools.cloudtrace.v1.ListTracesRequest.view', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='page_size', full_name='google.devtools.cloudtrace.v1.ListTracesRequest.page_size', index=2,
+      number=3, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='page_token', full_name='google.devtools.cloudtrace.v1.ListTracesRequest.page_token', index=3,
+      number=4, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='start_time', full_name='google.devtools.cloudtrace.v1.ListTracesRequest.start_time', index=4,
+      number=5, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='end_time', full_name='google.devtools.cloudtrace.v1.ListTracesRequest.end_time', index=5,
+      number=6, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='filter', full_name='google.devtools.cloudtrace.v1.ListTracesRequest.filter', index=6,
+      number=7, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='order_by', full_name='google.devtools.cloudtrace.v1.ListTracesRequest.order_by', index=7,
+      number=8, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _LISTTRACESREQUEST_VIEWTYPE,
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=765,
+  serialized_end=1124,
+)
+
+
+_LISTTRACESRESPONSE = _descriptor.Descriptor(
+  name='ListTracesResponse',
+  full_name='google.devtools.cloudtrace.v1.ListTracesResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='traces', full_name='google.devtools.cloudtrace.v1.ListTracesResponse.traces', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='next_page_token', full_name='google.devtools.cloudtrace.v1.ListTracesResponse.next_page_token', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1126,
+  serialized_end=1225,
+)
+
+
+_GETTRACEREQUEST = _descriptor.Descriptor(
+  name='GetTraceRequest',
+  full_name='google.devtools.cloudtrace.v1.GetTraceRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='project_id', full_name='google.devtools.cloudtrace.v1.GetTraceRequest.project_id', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='trace_id', full_name='google.devtools.cloudtrace.v1.GetTraceRequest.trace_id', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1227,
+  serialized_end=1282,
+)
+
+
+_PATCHTRACESREQUEST = _descriptor.Descriptor(
+  name='PatchTracesRequest',
+  full_name='google.devtools.cloudtrace.v1.PatchTracesRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='project_id', full_name='google.devtools.cloudtrace.v1.PatchTracesRequest.project_id', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='traces', full_name='google.devtools.cloudtrace.v1.PatchTracesRequest.traces', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1284,
+  serialized_end=1379,
+)
+
+_TRACE.fields_by_name['spans'].message_type = _TRACESPAN
+_TRACES.fields_by_name['traces'].message_type = _TRACE
+_TRACESPAN_LABELSENTRY.containing_type = _TRACESPAN
+_TRACESPAN.fields_by_name['kind'].enum_type = _TRACESPAN_SPANKIND
+_TRACESPAN.fields_by_name['start_time'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP
+_TRACESPAN.fields_by_name['end_time'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP
+_TRACESPAN.fields_by_name['labels'].message_type = _TRACESPAN_LABELSENTRY
+_TRACESPAN_SPANKIND.containing_type = _TRACESPAN
+_LISTTRACESREQUEST.fields_by_name['view'].enum_type = _LISTTRACESREQUEST_VIEWTYPE
+_LISTTRACESREQUEST.fields_by_name['start_time'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP
+_LISTTRACESREQUEST.fields_by_name['end_time'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP
+_LISTTRACESREQUEST_VIEWTYPE.containing_type = _LISTTRACESREQUEST
+_LISTTRACESRESPONSE.fields_by_name['traces'].message_type = _TRACE
+_PATCHTRACESREQUEST.fields_by_name['traces'].message_type = _TRACES
+DESCRIPTOR.message_types_by_name['Trace'] = _TRACE
+DESCRIPTOR.message_types_by_name['Traces'] = _TRACES
+DESCRIPTOR.message_types_by_name['TraceSpan'] = _TRACESPAN
+DESCRIPTOR.message_types_by_name['ListTracesRequest'] = _LISTTRACESREQUEST
+DESCRIPTOR.message_types_by_name['ListTracesResponse'] = _LISTTRACESRESPONSE
+DESCRIPTOR.message_types_by_name['GetTraceRequest'] = _GETTRACEREQUEST
+DESCRIPTOR.message_types_by_name['PatchTracesRequest'] = _PATCHTRACESREQUEST
+
+Trace = _reflection.GeneratedProtocolMessageType('Trace', (_message.Message,), dict(
+  DESCRIPTOR = _TRACE,
+  __module__ = 'google.cloud.proto.devtools.cloudtrace.v1.trace_pb2'
+  # @@protoc_insertion_point(class_scope:google.devtools.cloudtrace.v1.Trace)
+  ))
+_sym_db.RegisterMessage(Trace)
+
+Traces = _reflection.GeneratedProtocolMessageType('Traces', (_message.Message,), dict(
+  DESCRIPTOR = _TRACES,
+  __module__ = 'google.cloud.proto.devtools.cloudtrace.v1.trace_pb2'
+  # @@protoc_insertion_point(class_scope:google.devtools.cloudtrace.v1.Traces)
+  ))
+_sym_db.RegisterMessage(Traces)
+
+TraceSpan = _reflection.GeneratedProtocolMessageType('TraceSpan', (_message.Message,), dict(
+
+  LabelsEntry = _reflection.GeneratedProtocolMessageType('LabelsEntry', (_message.Message,), dict(
+    DESCRIPTOR = _TRACESPAN_LABELSENTRY,
+    __module__ = 'google.cloud.proto.devtools.cloudtrace.v1.trace_pb2'
+    # @@protoc_insertion_point(class_scope:google.devtools.cloudtrace.v1.TraceSpan.LabelsEntry)
+    ))
+  ,
+  DESCRIPTOR = _TRACESPAN,
+  __module__ = 'google.cloud.proto.devtools.cloudtrace.v1.trace_pb2'
+  # @@protoc_insertion_point(class_scope:google.devtools.cloudtrace.v1.TraceSpan)
+  ))
+_sym_db.RegisterMessage(TraceSpan)
+_sym_db.RegisterMessage(TraceSpan.LabelsEntry)
+
+ListTracesRequest = _reflection.GeneratedProtocolMessageType('ListTracesRequest', (_message.Message,), dict(
+  DESCRIPTOR = _LISTTRACESREQUEST,
+  __module__ = 'google.cloud.proto.devtools.cloudtrace.v1.trace_pb2'
+  # @@protoc_insertion_point(class_scope:google.devtools.cloudtrace.v1.ListTracesRequest)
+  ))
+_sym_db.RegisterMessage(ListTracesRequest)
+
+ListTracesResponse = _reflection.GeneratedProtocolMessageType('ListTracesResponse', (_message.Message,), dict(
+  DESCRIPTOR = _LISTTRACESRESPONSE,
+  __module__ = 'google.cloud.proto.devtools.cloudtrace.v1.trace_pb2'
+  # @@protoc_insertion_point(class_scope:google.devtools.cloudtrace.v1.ListTracesResponse)
+  ))
+_sym_db.RegisterMessage(ListTracesResponse)
+
+GetTraceRequest = _reflection.GeneratedProtocolMessageType('GetTraceRequest', (_message.Message,), dict(
+  DESCRIPTOR = _GETTRACEREQUEST,
+  __module__ = 'google.cloud.proto.devtools.cloudtrace.v1.trace_pb2'
+  # @@protoc_insertion_point(class_scope:google.devtools.cloudtrace.v1.GetTraceRequest)
+  ))
+_sym_db.RegisterMessage(GetTraceRequest)
+
+PatchTracesRequest = _reflection.GeneratedProtocolMessageType('PatchTracesRequest', (_message.Message,), dict(
+  DESCRIPTOR = _PATCHTRACESREQUEST,
+  __module__ = 'google.cloud.proto.devtools.cloudtrace.v1.trace_pb2'
+  # @@protoc_insertion_point(class_scope:google.devtools.cloudtrace.v1.PatchTracesRequest)
+  ))
+_sym_db.RegisterMessage(PatchTracesRequest)
+
+
+DESCRIPTOR.has_options = True
+DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n!com.google.devtools.cloudtrace.v1B\nTraceProtoP\001ZGgoogle.golang.org/genproto/googleapis/devtools/cloudtrace/v1;cloudtrace\252\002\025Google.Cloud.Trace.V1'))
+_TRACESPAN_LABELSENTRY.has_options = True
+_TRACESPAN_LABELSENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
+try:
+  # THESE ELEMENTS WILL BE DEPRECATED.
+  # Please use the generated *_pb2_grpc.py files instead.
+  import grpc
+  from grpc.beta import implementations as beta_implementations
+  from grpc.beta import interfaces as beta_interfaces
+  from grpc.framework.common import cardinality
+  from grpc.framework.interfaces.face import utilities as face_utilities
+
+
+  class TraceServiceStub(object):
+    """This file describes an API for collecting and viewing traces and spans
+    within a trace.  A Trace is a collection of spans corresponding to a single
+    operation or set of operations for an application. A span is an individual
+    timed event which forms a node of the trace tree. Spans for a single trace
+    may span multiple services.
+    """
+
+    def __init__(self, channel):
+      """Constructor.
+
+      Args:
+        channel: A grpc.Channel.
+      """
+      self.ListTraces = channel.unary_unary(
+          '/google.devtools.cloudtrace.v1.TraceService/ListTraces',
+          request_serializer=ListTracesRequest.SerializeToString,
+          response_deserializer=ListTracesResponse.FromString,
+          )
+      self.GetTrace = channel.unary_unary(
+          '/google.devtools.cloudtrace.v1.TraceService/GetTrace',
+          request_serializer=GetTraceRequest.SerializeToString,
+          response_deserializer=Trace.FromString,
+          )
+      self.PatchTraces = channel.unary_unary(
+          '/google.devtools.cloudtrace.v1.TraceService/PatchTraces',
+          request_serializer=PatchTracesRequest.SerializeToString,
+          response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
+          )
+
+
+  class TraceServiceServicer(object):
+    """This file describes an API for collecting and viewing traces and spans
+    within a trace.  A Trace is a collection of spans corresponding to a single
+    operation or set of operations for an application. A span is an individual
+    timed event which forms a node of the trace tree. Spans for a single trace
+    may span multiple services.
+    """
+
+    def ListTraces(self, request, context):
+      """Returns of a list of traces that match the specified filter conditions.
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+    def GetTrace(self, request, context):
+      """Gets a single trace by its ID.
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+    def PatchTraces(self, request, context):
+      """Sends new traces to Stackdriver Trace or updates existing traces. If the ID
+      of a trace that you send matches that of an existing trace, any fields
+      in the existing trace and its spans are overwritten by the provided values,
+      and any new fields provided are merged with the existing trace data. If the
+      ID does not match, a new trace is created.
+      """
+      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+      context.set_details('Method not implemented!')
+      raise NotImplementedError('Method not implemented!')
+
+
+  def add_TraceServiceServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+        'ListTraces': grpc.unary_unary_rpc_method_handler(
+            servicer.ListTraces,
+            request_deserializer=ListTracesRequest.FromString,
+            response_serializer=ListTracesResponse.SerializeToString,
+        ),
+        'GetTrace': grpc.unary_unary_rpc_method_handler(
+            servicer.GetTrace,
+            request_deserializer=GetTraceRequest.FromString,
+            response_serializer=Trace.SerializeToString,
+        ),
+        'PatchTraces': grpc.unary_unary_rpc_method_handler(
+            servicer.PatchTraces,
+            request_deserializer=PatchTracesRequest.FromString,
+            response_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString,
+        ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+        'google.devtools.cloudtrace.v1.TraceService', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+
+
+  class BetaTraceServiceServicer(object):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This class was generated
+    only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
+    """This file describes an API for collecting and viewing traces and spans
+    within a trace.  A Trace is a collection of spans corresponding to a single
+    operation or set of operations for an application. A span is an individual
+    timed event which forms a node of the trace tree. Spans for a single trace
+    may span multiple services.
+    """
+    def ListTraces(self, request, context):
+      """Returns of a list of traces that match the specified filter conditions.
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+    def GetTrace(self, request, context):
+      """Gets a single trace by its ID.
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+    def PatchTraces(self, request, context):
+      """Sends new traces to Stackdriver Trace or updates existing traces. If the ID
+      of a trace that you send matches that of an existing trace, any fields
+      in the existing trace and its spans are overwritten by the provided values,
+      and any new fields provided are merged with the existing trace data. If the
+      ID does not match, a new trace is created.
+      """
+      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
+
+
+  class BetaTraceServiceStub(object):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This class was generated
+    only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
+    """This file describes an API for collecting and viewing traces and spans
+    within a trace.  A Trace is a collection of spans corresponding to a single
+    operation or set of operations for an application. A span is an individual
+    timed event which forms a node of the trace tree. Spans for a single trace
+    may span multiple services.
+    """
+    def ListTraces(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+      """Returns of a list of traces that match the specified filter conditions.
+      """
+      raise NotImplementedError()
+    ListTraces.future = None
+    def GetTrace(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+      """Gets a single trace by its ID.
+      """
+      raise NotImplementedError()
+    GetTrace.future = None
+    def PatchTraces(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+      """Sends new traces to Stackdriver Trace or updates existing traces. If the ID
+      of a trace that you send matches that of an existing trace, any fields
+      in the existing trace and its spans are overwritten by the provided values,
+      and any new fields provided are merged with the existing trace data. If the
+      ID does not match, a new trace is created.
+      """
+      raise NotImplementedError()
+    PatchTraces.future = None
+
+
+  def beta_create_TraceService_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This function was
+    generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
+    request_deserializers = {
+      ('google.devtools.cloudtrace.v1.TraceService', 'GetTrace'): GetTraceRequest.FromString,
+      ('google.devtools.cloudtrace.v1.TraceService', 'ListTraces'): ListTracesRequest.FromString,
+      ('google.devtools.cloudtrace.v1.TraceService', 'PatchTraces'): PatchTracesRequest.FromString,
+    }
+    response_serializers = {
+      ('google.devtools.cloudtrace.v1.TraceService', 'GetTrace'): Trace.SerializeToString,
+      ('google.devtools.cloudtrace.v1.TraceService', 'ListTraces'): ListTracesResponse.SerializeToString,
+      ('google.devtools.cloudtrace.v1.TraceService', 'PatchTraces'): google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString,
+    }
+    method_implementations = {
+      ('google.devtools.cloudtrace.v1.TraceService', 'GetTrace'): face_utilities.unary_unary_inline(servicer.GetTrace),
+      ('google.devtools.cloudtrace.v1.TraceService', 'ListTraces'): face_utilities.unary_unary_inline(servicer.ListTraces),
+      ('google.devtools.cloudtrace.v1.TraceService', 'PatchTraces'): face_utilities.unary_unary_inline(servicer.PatchTraces),
+    }
+    server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout)
+    return beta_implementations.server(method_implementations, options=server_options)
+
+
+  def beta_create_TraceService_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None):
+    """The Beta API is deprecated for 0.15.0 and later.
+
+    It is recommended to use the GA API (classes and functions in this
+    file not marked beta) for all further purposes. This function was
+    generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
+    request_serializers = {
+      ('google.devtools.cloudtrace.v1.TraceService', 'GetTrace'): GetTraceRequest.SerializeToString,
+      ('google.devtools.cloudtrace.v1.TraceService', 'ListTraces'): ListTracesRequest.SerializeToString,
+      ('google.devtools.cloudtrace.v1.TraceService', 'PatchTraces'): PatchTracesRequest.SerializeToString,
+    }
+    response_deserializers = {
+      ('google.devtools.cloudtrace.v1.TraceService', 'GetTrace'): Trace.FromString,
+      ('google.devtools.cloudtrace.v1.TraceService', 'ListTraces'): ListTracesResponse.FromString,
+      ('google.devtools.cloudtrace.v1.TraceService', 'PatchTraces'): google_dot_protobuf_dot_empty__pb2.Empty.FromString,
+    }
+    cardinalities = {
+      'GetTrace': cardinality.Cardinality.UNARY_UNARY,
+      'ListTraces': cardinality.Cardinality.UNARY_UNARY,
+      'PatchTraces': cardinality.Cardinality.UNARY_UNARY,
+    }
+    stub_options = beta_implementations.stub_options(host=host, metadata_transformer=metadata_transformer, request_serializers=request_serializers, response_deserializers=response_deserializers, thread_pool=pool, thread_pool_size=pool_size)
+    return beta_implementations.dynamic_stub(channel, 'google.devtools.cloudtrace.v1.TraceService', cardinalities, options=stub_options)
+except ImportError:
+  pass
+# @@protoc_insertion_point(module_scope)
diff --git a/trace/google/cloud/proto/devtools/cloudtrace/v1/trace_pb2_grpc.py b/trace/google/cloud/proto/devtools/cloudtrace/v1/trace_pb2_grpc.py
new file mode 100644
index 0000000000000..de3ca9f57728b
--- /dev/null
+++ b/trace/google/cloud/proto/devtools/cloudtrace/v1/trace_pb2_grpc.py
@@ -0,0 +1,93 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+import grpc
+
+import google.cloud.proto.devtools.cloudtrace.v1.trace_pb2 as google_dot_cloud_dot_proto_dot_devtools_dot_cloudtrace_dot_v1_dot_trace__pb2
+import google.protobuf.empty_pb2 as google_dot_protobuf_dot_empty__pb2
+
+
+class TraceServiceStub(object):
+  """This file describes an API for collecting and viewing traces and spans
+  within a trace.  A Trace is a collection of spans corresponding to a single
+  operation or set of operations for an application. A span is an individual
+  timed event which forms a node of the trace tree. Spans for a single trace
+  may span multiple services.
+  """
+
+  def __init__(self, channel):
+    """Constructor.
+
+    Args:
+      channel: A grpc.Channel.
+    """
+    self.ListTraces = channel.unary_unary(
+        '/google.devtools.cloudtrace.v1.TraceService/ListTraces',
+        request_serializer=google_dot_cloud_dot_proto_dot_devtools_dot_cloudtrace_dot_v1_dot_trace__pb2.ListTracesRequest.SerializeToString,
+        response_deserializer=google_dot_cloud_dot_proto_dot_devtools_dot_cloudtrace_dot_v1_dot_trace__pb2.ListTracesResponse.FromString,
+        )
+    self.GetTrace = channel.unary_unary(
+        '/google.devtools.cloudtrace.v1.TraceService/GetTrace',
+        request_serializer=google_dot_cloud_dot_proto_dot_devtools_dot_cloudtrace_dot_v1_dot_trace__pb2.GetTraceRequest.SerializeToString,
+        response_deserializer=google_dot_cloud_dot_proto_dot_devtools_dot_cloudtrace_dot_v1_dot_trace__pb2.Trace.FromString,
+        )
+    self.PatchTraces = channel.unary_unary(
+        '/google.devtools.cloudtrace.v1.TraceService/PatchTraces',
+        request_serializer=google_dot_cloud_dot_proto_dot_devtools_dot_cloudtrace_dot_v1_dot_trace__pb2.PatchTracesRequest.SerializeToString,
+        response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
+        )
+
+
+class TraceServiceServicer(object):
+  """This file describes an API for collecting and viewing traces and spans
+  within a trace.  A Trace is a collection of spans corresponding to a single
+  operation or set of operations for an application. A span is an individual
+  timed event which forms a node of the trace tree. Spans for a single trace
+  may span multiple services.
+  """
+
+  def ListTraces(self, request, context):
+    """Returns of a list of traces that match the specified filter conditions.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+  def GetTrace(self, request, context):
+    """Gets a single trace by its ID.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+  def PatchTraces(self, request, context):
+    """Sends new traces to Stackdriver Trace or updates existing traces. If the ID
+    of a trace that you send matches that of an existing trace, any fields
+    in the existing trace and its spans are overwritten by the provided values,
+    and any new fields provided are merged with the existing trace data. If the
+    ID does not match, a new trace is created.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+
+def add_TraceServiceServicer_to_server(servicer, server):
+  rpc_method_handlers = {
+      'ListTraces': grpc.unary_unary_rpc_method_handler(
+          servicer.ListTraces,
+          request_deserializer=google_dot_cloud_dot_proto_dot_devtools_dot_cloudtrace_dot_v1_dot_trace__pb2.ListTracesRequest.FromString,
+          response_serializer=google_dot_cloud_dot_proto_dot_devtools_dot_cloudtrace_dot_v1_dot_trace__pb2.ListTracesResponse.SerializeToString,
+      ),
+      'GetTrace': grpc.unary_unary_rpc_method_handler(
+          servicer.GetTrace,
+          request_deserializer=google_dot_cloud_dot_proto_dot_devtools_dot_cloudtrace_dot_v1_dot_trace__pb2.GetTraceRequest.FromString,
+          response_serializer=google_dot_cloud_dot_proto_dot_devtools_dot_cloudtrace_dot_v1_dot_trace__pb2.Trace.SerializeToString,
+      ),
+      'PatchTraces': grpc.unary_unary_rpc_method_handler(
+          servicer.PatchTraces,
+          request_deserializer=google_dot_cloud_dot_proto_dot_devtools_dot_cloudtrace_dot_v1_dot_trace__pb2.PatchTracesRequest.FromString,
+          response_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString,
+      ),
+  }
+  generic_handler = grpc.method_handlers_generic_handler(
+      'google.devtools.cloudtrace.v1.TraceService', rpc_method_handlers)
+  server.add_generic_rpc_handlers((generic_handler,))
diff --git a/trace/google/cloud/trace.py b/trace/google/cloud/trace.py
new file mode 100644
index 0000000000000..d2382ffab5024
--- /dev/null
+++ b/trace/google/cloud/trace.py
@@ -0,0 +1,24 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from google.cloud.trace_v1 import enums
+from google.cloud.trace_v1 import TraceServiceClient
+from google.cloud.trace_v1 import types
+
+
+__all__ = (
+    'enums',
+    'TraceServiceClient',
+    'types',
+)
diff --git a/trace/google/cloud/trace/__init__.py b/trace/google/cloud/trace/__init__.py
new file mode 100644
index 0000000000000..558d1302e5966
--- /dev/null
+++ b/trace/google/cloud/trace/__init__.py
@@ -0,0 +1,18 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from google.cloud.trace.client import Client
+
+
+__all__ = ['Client']
diff --git a/trace/google/cloud/trace/_gax.py b/trace/google/cloud/trace/_gax.py
new file mode 100644
index 0000000000000..b412b54ee8566
--- /dev/null
+++ b/trace/google/cloud/trace/_gax.py
@@ -0,0 +1,213 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""GAX Wrapper for interacting with the Stackdriver Trace API."""
+
+from google.cloud.gapic.trace.v1 import trace_service_client
+from google.cloud.proto.devtools.cloudtrace.v1 import trace_pb2
+from google.gax import CallOptions
+from google.gax import INITIAL_PAGE
+from google.cloud._helpers import make_secure_channel
+from google.cloud._http import DEFAULT_USER_AGENT
+from google.cloud.iterator import GAXIterator
+from google.protobuf.json_format import MessageToDict
+from google.protobuf.json_format import ParseDict
+
+
+class _TraceAPI(object):
+    """Wrapper to help mapping trace-related APIs.
+
+    See
+    https://cloud.google.com/trace/docs/reference/v1/rpc/google.devtools.
+    cloudtrace.v1
+
+    :type gax_api:
+        :class:`~google.cloud.gapic.trace.v1.trace_service_client.
+               TraceServiceClient`
+    :param gax_api: API object used to make GAX requests.
+
+    :type client: :class:`~google.cloud.trace.client.Client`
+    :param client: The client that owns this API object.
+    """
+    def __init__(self, gax_api, client):
+        self._gax_api = gax_api
+        self.client = client
+
+    def patch_traces(self, project_id, traces, options=None):
+        """Sends new traces to Stackdriver Trace or updates existing traces.
+
+        :type project_id: str
+        :param project_id: ID of the Cloud project where the trace data is
+                           stored.
+
+        :type traces: dict
+        :param traces: The traces to be patched in the API call.
+
+        :type options: :class:`~google.gax.CallOptions`
+        :param options: (Optional) Overrides the default settings for this
+                        call, e.g, timeout, retries etc.
+        """
+        traces_pb = _traces_mapping_to_pb(traces)
+        self._gax_api.patch_traces(project_id, traces_pb, options)
+
+    def get_trace(self, project_id, trace_id, options=None):
+        """Gets a single trace by its ID.
+
+        :type project_id: str
+        :param project_id: ID of the Cloud project where the trace data is
+                           stored.
+
+        :type trace_id: str
+        :param trace_id: ID of the trace to return.
+
+        :type options: :class:`~google.gax.CallOptions`
+        :param options: (Optional) Overrides the default settings for this
+                        call, e.g, timeout, retries etc.
+
+        :rtype: :dict
+        :returns: A Trace dict.
+        """
+        trace_pb = self._gax_api.get_trace(project_id, trace_id, options)
+        trace_mapping = _parse_trace_pb(trace_pb)
+        return trace_mapping
+
+    def list_traces(
+            self,
+            project_id,
+            view=None,
+            page_size=None,
+            start_time=None,
+            end_time=None,
+            filter_=None,
+            order_by=None,
+            page_token=None):
+        """Returns of a list of traces that match the specified filter
+        conditions.
+
+        :type project_id: str
+        :param project_id: ID of the Cloud project where the trace data is
+                           stored.
+
+        :type view: :class:`google.cloud.gapic.trace.v1.enums.
+                           ListTracesRequest.ViewType`
+        :param view: (Optional) Type of data returned for traces in the list.
+                     Default is ``MINIMAL``.
+
+        :type page_size: int
+        :param page_size: (Optional) Maximum number of traces to return.
+                          If not specified or <= 0, the implementation selects
+                          a reasonable value. The implementation may return
+                          fewer traces than the requested page size.
+
+        :type start_time: :class:`google.protobuf.timestamp_pb2.Timestamp`
+        :param start_time: (Optional) Start of the time interval (inclusive)
+                           during which the trace data was collected from the
+                           application.
+
+        :type end_time: :class:`google.protobuf.timestamp_pb2.Timestamp`
+        :param end_time: (Optional) End of the time interval (inclusive)
+                         during which the trace data was collected from the
+                         application.
+
+        :type filter_: str
+        :param filter_: (Optional) An optional filter for the request.
+
+        :type order_by: str
+        :param order_by: (Optional) Field used to sort the returned traces.
+
+        :type page_token: str
+        :param page_token: opaque marker for the next "page" of entries. If not
+                           passed, the API will return the first page of
+                           entries.
+
+        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :returns: Traces that match the specified filter conditions.
+        """
+        if page_token is None:
+            page_token = INITIAL_PAGE
+        options = CallOptions(page_token=page_token)
+        page_iter = self._gax_api.list_traces(
+            project_id=project_id,
+            view=view,
+            page_size=page_size,
+            start_time=start_time,
+            end_time=end_time,
+            filter_=filter_,
+            order_by=order_by,
+            options=options)
+        item_to_value = _item_to_mapping
+        return GAXIterator(self.client, page_iter, item_to_value)
+
+
+def _parse_trace_pb(trace_pb):
+    """Parse a ``Trace`` protobuf to a dictionary.
+
+    :type trace_pb: :class:`google.cloud.proto.devtools.cloudtrace.v1.
+                            trace_pb2.Trace`
+    :param trace_pb: A trace protobuf instance.
+
+    :rtype: dict
+    :returns: The converted trace dict.
+    """
+    try:
+        return MessageToDict(trace_pb)
+    except TypeError:
+        raise
+
+
+def _item_to_mapping(iterator, trace_pb):
+    """Helper callable function for the GAXIterator
+
+    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :param iterator: The iterator that is currently in use.
+
+    :type trace_pb: :class:`google.cloud.proto.devtools.cloudtrace.v1.
+                            trace_pb2.Trace`
+    :param trace_pb: A trace protobuf instance.
+    """
+    mapping = _parse_trace_pb(trace_pb)
+    return mapping
+
+
+def make_gax_trace_api(client):
+    """Create an instance of the GAX Trace API.
+
+    :type client: :class:`~google.cloud.trace.client.Client`
+    :param client: The client that holds configuration details.
+
+    :rtype: :class:`~google.cloud.trace._gax._TraceAPI`
+    :returns: A Trace API instance with the proper configurations.
+    """
+    channel = make_secure_channel(
+        client._credentials,
+        DEFAULT_USER_AGENT,
+        trace_service_client.TraceServiceClient.SERVICE_ADDRESS)
+    generated = trace_service_client.TraceServiceClient(
+        channel=channel,
+        lib_name='gccl')
+    return _TraceAPI(generated, client)
+
+
+def _traces_mapping_to_pb(traces_mapping):
+    """Convert a trace dict to protobuf.
+
+    :type traces_mapping: dict
+    :param traces_mapping: A trace mapping.
+
+    :rtype: class:`google.cloud.proto.devtools.cloudtrace.v1.trace_pb2.Traces`
+    :returns: The converted protobuf type traces.
+    """
+    traces_pb = trace_pb2.Traces()
+    ParseDict(traces_mapping, traces_pb)
+    return traces_pb
diff --git a/trace/google/cloud/trace/client.py b/trace/google/cloud/trace/client.py
new file mode 100644
index 0000000000000..d2104924a2bff
--- /dev/null
+++ b/trace/google/cloud/trace/client.py
@@ -0,0 +1,167 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Client for interacting with the Stackdriver Trace API."""
+
+from google.cloud.trace._gax import make_gax_trace_api
+from google.cloud.client import ClientWithProject
+from google.cloud._helpers import _datetime_to_pb_timestamp
+
+
+class Client(ClientWithProject):
+    """Client to bundle configuration needed for API requests.
+
+    :type project: str
+    :param project: The project which the client acts on behalf of.
+                    If not passed, falls back to the default inferred from
+                    the environment.
+
+    :type credentials: :class:`~google.auth.credentials.Credentials`
+    :param credentials: (Optional) The OAuth2 Credentials to use for this
+                        client. If not passed, falls back to the default
+                        inferred from the environment.
+    """
+    _trace_api = None
+
+    def __init__(self, project=None, credentials=None):
+        super(Client, self).__init__(
+            project=project, credentials=credentials)
+
+    @property
+    def trace_api(self):
+        """Helper for trace-related API calls.
+
+        See
+        https://cloud.google.com/trace/docs/reference/v1/rpc/google.devtools.
+        cloudtrace.v1
+        """
+        self._trace_api = make_gax_trace_api(self)
+        return self._trace_api
+
+    def patch_traces(self, traces, project_id=None, options=None):
+        """Sends new traces to Stackdriver Trace or updates existing traces.
+
+        :type traces: dict
+        :param traces: The traces to be patched in the API call.
+
+        :type project_id: str
+        :param project_id: (Optional) ID of the Cloud project where the trace
+                           data is stored.
+
+        :type options: :class:`~google.gax.CallOptions`
+        :param options: (Optional) Overrides the default settings for this
+                        call, e.g, timeout, retries etc.
+        """
+        if project_id is None:
+            project_id = self.project
+
+        self.trace_api.patch_traces(
+            project_id=project_id,
+            traces=traces,
+            options=options)
+
+    def get_trace(self, trace_id, project_id=None, options=None):
+        """Gets a single trace by its ID.
+
+        :type project_id: str
+        :param project_id: ID of the Cloud project where the trace data is
+                           stored.
+
+        :type trace_id: str
+        :param trace_id: ID of the trace to return.
+
+        :type options: :class:`~google.gax.CallOptions`
+        :param options: (Optional) Overrides the default settings for this
+                        call, e.g, timeout, retries etc.
+
+        :rtype: dict
+        :returns: A Trace dict.
+        """
+        if project_id is None:
+            project_id = self.project
+
+        return self.trace_api.get_trace(
+            project_id=project_id,
+            trace_id=trace_id,
+            options=options)
+
+    def list_traces(
+            self,
+            project_id=None,
+            view=None,
+            page_size=None,
+            start_time=None,
+            end_time=None,
+            filter_=None,
+            order_by=None,
+            page_token=None):
+        """Returns of a list of traces that match the filter conditions.
+
+        :type project_id: str
+        :param project_id: (Optional) ID of the Cloud project where the trace
+                           data is stored.
+
+        :type view: :class:`google.cloud.gapic.trace.v1.enums.
+                            ListTracesRequest.ViewType`
+        :param view: (Optional) Type of data returned for traces in the list.
+                     Default is ``MINIMAL``.
+
+        :type page_size: int
+        :param page_size: (Optional) Maximum number of traces to return.
+                          If not specified or <= 0, the implementation selects
+                          a reasonable value. The implementation may return
+                          fewer traces than the requested page size.
+
+        :type start_time: :class:`~datetime.datetime`
+        :param start_time: (Optional) Start of the time interval (inclusive)
+                           during which the trace data was collected from the
+                           application.
+
+        :type end_time: :class:`~datetime.datetime`
+        :param end_time: (Optional) End of the time interval (inclusive) during
+                         which the trace data was collected from the
+                         application.
+
+        :type filter_: str
+        :param filter_: (Optional) An optional filter for the request.
+
+        :type order_by: str
+        :param order_by: (Optional) Field used to sort the returned traces.
+
+        :type page_token: str
+        :param page_token: opaque marker for the next "page" of entries. If not
+                           passed, the API will return the first page of
+                           entries.
+
+        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :returns: Traces that match the specified filter conditions.
+        """
+        if project_id is None:
+            project_id = self.project
+
+        if start_time is not None:
+            start_time = _datetime_to_pb_timestamp(start_time)
+
+        if end_time is not None:
+            end_time = _datetime_to_pb_timestamp(end_time)
+
+        return self.trace_api.list_traces(
+            project_id=project_id,
+            view=view,
+            page_size=page_size,
+            start_time=start_time,
+            end_time=end_time,
+            filter_=filter_,
+            order_by=order_by,
+            page_token=page_token)
diff --git a/trace/google/cloud/trace_v1/__init__.py b/trace/google/cloud/trace_v1/__init__.py
new file mode 100644
index 0000000000000..8d4fa6bd3c392
--- /dev/null
+++ b/trace/google/cloud/trace_v1/__init__.py
@@ -0,0 +1,25 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from google.cloud.gapic.trace.v1.trace_service_client import TraceServiceClient
+from google.cloud.gapic.trace.v1 import enums
+
+from google.cloud.trace_v1 import types
+
+
+__all__ = (
+    'enums',
+    'TraceServiceClient',
+    'types',
+)
diff --git a/trace/google/cloud/trace_v1/types.py b/trace/google/cloud/trace_v1/types.py
new file mode 100644
index 0000000000000..ed6d5b585829e
--- /dev/null
+++ b/trace/google/cloud/trace_v1/types.py
@@ -0,0 +1,28 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+import sys
+
+from google.cloud.proto.devtools.cloudtrace.v1 import trace_pb2
+from google.gax.utils.messages import get_messages
+
+
+names = []
+for name, message in get_messages(trace_pb2).items():
+    setattr(sys.modules[__name__], name, message)
+    names.append(name)
+
+
+__all__ = tuple(sorted(names))
diff --git a/trace/nox.py b/trace/nox.py
new file mode 100644
index 0000000000000..08c69cb85df56
--- /dev/null
+++ b/trace/nox.py
@@ -0,0 +1,79 @@
+# Copyright 2016 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+
+import nox
+
+
+LOCAL_DEPS = ('../core/',)
+
+
+@nox.session
+@nox.parametrize('python_version', ['2.7', '3.4', '3.5', '3.6'])
+def unit_tests(session, python_version):
+    """Run the unit test suite."""
+
+    # Run unit tests against all supported versions of Python.
+    session.interpreter = 'python{}'.format(python_version)
+
+    # Install all test dependencies, then install this package in-place.
+    session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
+    session.install('-e', '.')
+
+    # Run py.test against the unit tests.
+    session.run(
+        'py.test',
+        '--quiet',
+        '--cov=google.cloud.trace',
+        '--cov-append',
+        '--cov-config=.coveragerc',
+        '--cov-report=',
+        '--cov-fail-under=97',
+        'tests/',
+        *session.posargs
+    )
+
+
+@nox.session
+def lint(session):
+    """Run flake8.
+    Returns a failure if flake8 finds linting errors or sufficiently
+    serious code quality issues.
+    """
+    session.interpreter = 'python3.6'
+    session.install('flake8', *LOCAL_DEPS)
+    session.install('.')
+    session.run('flake8', 'google/cloud/trace')
+
+
+@nox.session
+def lint_setup_py(session):
+    """Verify that setup.py is valid (including RST check)."""
+    session.interpreter = 'python3.6'
+    session.install('docutils', 'pygments')
+    session.run(
+        'python', 'setup.py', 'check', '--restructuredtext', '--strict')
+
+
+@nox.session
+def cover(session):
+    """Run the final coverage report.
+    This outputs the coverage report aggregating coverage from the unit
+    test runs (not system test runs), and then erases coverage data.
+    """
+    session.interpreter = 'python3.6'
+    session.install('coverage', 'pytest-cov')
+    session.run('coverage', 'report', '--show-missing', '--fail-under=100')
+    session.run('coverage', 'erase')
diff --git a/trace/setup.py b/trace/setup.py
new file mode 100644
index 0000000000000..aeeae31756e42
--- /dev/null
+++ b/trace/setup.py
@@ -0,0 +1,44 @@
+"""A setup module for the GAPIC Stackdriver Trace API library.
+
+See:
+https://packaging.python.org/en/latest/distributing.html
+https://github.com/pypa/sampleproject
+"""
+
+from setuptools import setup, find_packages
+
+install_requires = [
+    'google-gax>=0.15.7, <0.16dev',
+    'googleapis-common-protos[grpc]>=1.5.2, <2.0dev',
+    'google-cloud-core >= 0.24.0, < 0.25dev',
+]
+
+setup(
+    name='google-cloud-trace',
+    version='0.15.4',
+    author='Google Inc',
+    author_email='googleapis-packages@google.com',
+    classifiers=[
+        'Intended Audience :: Developers',
+        'Development Status :: 3 - Alpha',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: Apache Software License',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: Implementation :: CPython',
+    ],
+    description='GAPIC library for the Stackdriver Trace API',
+    include_package_data=True,
+    long_description=open('README.rst').read(),
+    install_requires=install_requires,
+    license='Apache-2.0',
+    packages=find_packages(),
+    namespace_packages=[
+        'google', 'google.cloud', 'google.cloud.gapic',
+        'google.cloud.gapic.trace'
+    ],
+    url='https://github.com/googleapis/googleapis')
diff --git a/trace/tests/__init__.py b/trace/tests/__init__.py
new file mode 100644
index 0000000000000..7c07b241f066d
--- /dev/null
+++ b/trace/tests/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/trace/tests/gapic/v1/test_trace_service_client_v1.py b/trace/tests/gapic/v1/test_trace_service_client_v1.py
new file mode 100644
index 0000000000000..c9ca3b6d1629b
--- /dev/null
+++ b/trace/tests/gapic/v1/test_trace_service_client_v1.py
@@ -0,0 +1,177 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Unit tests."""
+
+import mock
+import unittest
+
+from google.gax import errors
+
+from google.cloud.gapic.trace.v1 import trace_service_client
+from google.cloud.proto.devtools.cloudtrace.v1 import trace_pb2
+from google.protobuf import empty_pb2
+
+
+class CustomException(Exception):
+    pass
+
+
+class TestTraceServiceClient(unittest.TestCase):
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_patch_traces(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = trace_service_client.TraceServiceClient()
+
+        # Mock request
+        project_id = 'projectId-1969970175'
+        traces = trace_pb2.Traces()
+
+        client.patch_traces(project_id, traces)
+
+        grpc_stub.PatchTraces.assert_called_once()
+        args, kwargs = grpc_stub.PatchTraces.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_request = args[0]
+
+        expected_request = trace_pb2.PatchTracesRequest(
+            project_id=project_id, traces=traces)
+        self.assertEqual(expected_request, actual_request)
+
+    @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_patch_traces_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = trace_service_client.TraceServiceClient()
+
+        # Mock request
+        project_id = 'projectId-1969970175'
+        traces = trace_pb2.Traces()
+
+        # Mock exception response
+        grpc_stub.PatchTraces.side_effect = CustomException()
+
+        self.assertRaises(errors.GaxError, client.patch_traces, project_id,
+                          traces)
+
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_get_trace(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = trace_service_client.TraceServiceClient()
+
+        # Mock request
+        project_id = 'projectId-1969970175'
+        trace_id = 'traceId1270300245'
+
+        # Mock response
+        project_id_2 = 'projectId2939242356'
+        trace_id_2 = 'traceId2987826376'
+        expected_response = trace_pb2.Trace(
+            project_id=project_id_2, trace_id=trace_id_2)
+        grpc_stub.GetTrace.return_value = expected_response
+
+        response = client.get_trace(project_id, trace_id)
+        self.assertEqual(expected_response, response)
+
+        grpc_stub.GetTrace.assert_called_once()
+        args, kwargs = grpc_stub.GetTrace.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_request = args[0]
+
+        expected_request = trace_pb2.GetTraceRequest(
+            project_id=project_id, trace_id=trace_id)
+        self.assertEqual(expected_request, actual_request)
+
+    @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_get_trace_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = trace_service_client.TraceServiceClient()
+
+        # Mock request
+        project_id = 'projectId-1969970175'
+        trace_id = 'traceId1270300245'
+
+        # Mock exception response
+        grpc_stub.GetTrace.side_effect = CustomException()
+
+        self.assertRaises(errors.GaxError, client.get_trace, project_id,
+                          trace_id)
+
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_list_traces(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = trace_service_client.TraceServiceClient()
+
+        # Mock request
+        project_id = 'projectId-1969970175'
+
+        # Mock response
+        next_page_token = ''
+        traces_element = trace_pb2.Trace()
+        traces = [traces_element]
+        expected_response = trace_pb2.ListTracesResponse(
+            next_page_token=next_page_token, traces=traces)
+        grpc_stub.ListTraces.return_value = expected_response
+
+        paged_list_response = client.list_traces(project_id)
+        resources = list(paged_list_response)
+        self.assertEqual(1, len(resources))
+        self.assertEqual(expected_response.traces[0], resources[0])
+
+        grpc_stub.ListTraces.assert_called_once()
+        args, kwargs = grpc_stub.ListTraces.call_args
+        self.assertEqual(len(args), 2)
+        self.assertEqual(len(kwargs), 1)
+        self.assertIn('metadata', kwargs)
+        actual_request = args[0]
+
+        expected_request = trace_pb2.ListTracesRequest(project_id=project_id)
+        self.assertEqual(expected_request, actual_request)
+
+    @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
+    @mock.patch('google.gax.config.create_stub', spec=True)
+    def test_list_traces_exception(self, mock_create_stub):
+        # Mock gRPC layer
+        grpc_stub = mock.Mock()
+        mock_create_stub.return_value = grpc_stub
+
+        client = trace_service_client.TraceServiceClient()
+
+        # Mock request
+        project_id = 'projectId-1969970175'
+
+        # Mock exception response
+        grpc_stub.ListTraces.side_effect = CustomException()
+
+        paged_list_response = client.list_traces(project_id)
+        self.assertRaises(errors.GaxError, list, paged_list_response)
diff --git a/trace/tests/unit/test__gax.py b/trace/tests/unit/test__gax.py
new file mode 100644
index 0000000000000..3f950021b85e1
--- /dev/null
+++ b/trace/tests/unit/test__gax.py
@@ -0,0 +1,429 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import unittest
+
+import mock
+
+from google.cloud._testing import _GAXBaseAPI
+
+
+class _Base(object):
+    project = 'PROJECT'
+
+    def _make_one(self, *args, **kw):
+        return self._get_target_class()(*args, **kw)
+
+
+class Test__TraceAPI(_Base, unittest.TestCase):
+
+    @staticmethod
+    def _get_target_class():
+        from google.cloud.trace._gax import _TraceAPI
+
+        return _TraceAPI
+
+    def test_constructor(self):
+        gax_api = object()
+        client = object()
+        api = self._make_one(gax_api, client)
+        self.assertIs(api._gax_api, gax_api)
+        self.assertIs(api.client, client)
+
+    def test_patch_traces(self):
+        from google.cloud.gapic.trace.v1 import trace_service_client
+        from google.cloud.proto.devtools.cloudtrace.v1.trace_pb2 import (
+            TraceSpan, Trace, Traces)
+        from google.cloud.trace._gax import _traces_mapping_to_pb
+        from google.cloud._helpers import _datetime_to_pb_timestamp
+
+        from datetime import datetime
+
+        trace_id = 'test_trace_id'
+        span_id = 1234
+        span_name = 'test_span_name'
+        start_time = datetime.utcnow()
+        end_time = datetime.utcnow()
+
+        traces = {
+            'traces': [
+                {
+                    'projectId': self.project,
+                    'traceId': trace_id,
+                    'spans': [
+                        {
+                            'spanId': span_id,
+                            'name': span_name,
+                            'startTime': start_time.isoformat() + 'Z',
+                            'endTime': end_time.isoformat() + 'Z',
+                        },
+                    ],
+                },
+            ],
+        }
+
+        traces_pb = _traces_mapping_to_pb(traces)
+
+        gax_api = mock.Mock(spec=trace_service_client.TraceServiceClient)
+        api = self._make_one(gax_api, None)
+        api.patch_traces(project_id=self.project, traces=traces)
+
+        gax_api.patch_traces.assert_called_with(self.project, traces_pb, None)
+
+        call_args = gax_api.patch_traces.call_args[0]
+        self.assertEqual(len(call_args), 3)
+        traces_called = call_args[1]
+        self.assertEqual(len(traces_called.traces), 1)
+        trace = traces_called.traces[0]
+
+        self.assertEqual(len(trace.spans), 1)
+        span = trace.spans[0]
+
+        self.assertIsInstance(traces_called, Traces)
+        self.assertEqual(trace.project_id, self.project)
+        self.assertEqual(trace.trace_id, trace_id)
+        self.assertIsInstance(trace, Trace)
+
+        self.assertEqual(span.span_id, span_id)
+        self.assertEqual(span.name, span_name)
+        self.assertEqual(
+            span.start_time,
+            _datetime_to_pb_timestamp(start_time))
+        self.assertEqual(
+            span.end_time,
+            _datetime_to_pb_timestamp(end_time))
+        self.assertIsInstance(span, TraceSpan)
+
+    def test_get_trace(self):
+        from google.cloud.gapic.trace.v1 import trace_service_client
+
+        trace_id = 'test_trace_id'
+
+        gax_api = mock.Mock(spec=trace_service_client.TraceServiceClient)
+        api = self._make_one(gax_api, None)
+        patch = mock.patch('google.cloud.trace._gax._parse_trace_pb',
+                           return_value='fake_pb_result')
+
+        with patch:
+            api.get_trace(project_id=self.project, trace_id=trace_id)
+
+        gax_api.get_trace.assert_called_with(self.project, trace_id, None)
+
+    def _make_trace_pb(
+            self,
+            project,
+            trace_id,
+            span_id,
+            span_name,
+            start_time,
+            end_time,
+            parent_span_id,
+            labels):
+        from google.cloud.trace._gax import _traces_mapping_to_pb
+
+        span_kind = 2
+
+        traces = {
+            'traces': [
+                {
+                    'projectId': project,
+                    'traceId': trace_id,
+                    'spans': [
+                        {
+                            'spanId': span_id,
+                            'name': span_name,
+                            'startTime': start_time,
+                            'endTime': end_time,
+                            'kind': span_kind,
+                            'parentSpanId': parent_span_id,
+                            'labels': labels,
+                        },
+                    ],
+                },
+            ],
+        }
+
+        traces_pb = _traces_mapping_to_pb(traces)
+        trace_pb = traces_pb.traces
+        return trace_pb
+
+    def test_list_traces_no_paging(self):
+        from google.cloud._testing import _GAXPageIterator
+        from google.cloud.gapic.trace.v1 import trace_service_client
+        from google.cloud.gapic.trace.v1.enums import ListTracesRequest as Enum
+        from google.gax import INITIAL_PAGE
+
+        from datetime import datetime
+
+        trace_id = 'test_trace_id'
+        span_id = 1234
+        span_name = 'test_span_name'
+        span_kind = 'RPC_CLIENT'
+        parent_span_id = 123
+        start_time = datetime.utcnow().isoformat() + 'Z'
+        end_time = datetime.utcnow().isoformat() + 'Z'
+        labels = {
+            '/http/status_code': '200',
+            '/component': 'HTTP load balancer',
+        }
+        size = 10
+        view_type = Enum.ViewType.COMPLETE
+
+        trace_pb = self._make_trace_pb(
+            self.project,
+            trace_id,
+            span_id,
+            span_name,
+            start_time,
+            end_time,
+            parent_span_id,
+            labels)
+
+        response = _GAXPageIterator(trace_pb)
+        gax_api = mock.Mock(spec=trace_service_client.TraceServiceClient)
+        gax_api.list_traces.return_value = response
+        api = self._make_one(gax_api, None)
+
+        iterator = api.list_traces(
+            project_id=self.project,
+            view=view_type,
+            page_size=size)
+
+        traces = list(iterator)
+
+        self.assertEqual(len(traces), 1)
+        trace = traces[0]
+
+        self.assertEqual(len(trace['spans']), 1)
+        span = trace['spans'][0]
+
+        self.assertEqual(trace['projectId'], self.project)
+        self.assertEqual(trace['traceId'], trace_id)
+
+        self.assertEqual(span['spanId'], str(span_id))
+        self.assertEqual(span['name'], span_name)
+
+        self.assertEqual(
+            span['startTime'], start_time)
+        self.assertEqual(
+            span['endTime'], end_time)
+        self.assertEqual(span['kind'], span_kind)
+        self.assertEqual(span['parentSpanId'], str(parent_span_id))
+        self.assertEqual(span['labels'], labels)
+
+        call_args = gax_api.list_traces.call_args[1]
+
+        self.assertEqual(call_args['project_id'], self.project)
+        self.assertEqual(call_args['view'], view_type)
+        self.assertEqual(call_args['page_size'], size)
+        self.assertIsNone(call_args['start_time'])
+        self.assertIsNone(call_args['end_time'])
+        self.assertIsNone(call_args['filter_'])
+        self.assertIsNone(call_args['order_by'])
+        self.assertEqual(call_args['options'].page_token, INITIAL_PAGE)
+
+    def test_list_traces_with_paging(self):
+        from google.cloud._testing import _GAXPageIterator
+        from google.cloud.gapic.trace.v1 import trace_service_client
+        from google.cloud.gapic.trace.v1.enums import ListTracesRequest as Enum
+
+        from datetime import datetime
+
+        trace_id = 'test_trace_id'
+        span_id = 1234
+        span_name = 'test_span_name'
+        span_kind = 'RPC_CLIENT'
+        parent_span_id = 123
+        start_time = datetime.utcnow().isoformat() + 'Z'
+        end_time = datetime.utcnow().isoformat() + 'Z'
+        labels = {
+            '/http/status_code': '200',
+            '/component': 'HTTP load balancer',
+        }
+        size = 10
+        view_type = Enum.ViewType.COMPLETE
+        token = 'TOKEN'
+
+        trace_pb = self._make_trace_pb(
+            self.project,
+            trace_id,
+            span_id,
+            span_name,
+            start_time,
+            end_time,
+            parent_span_id,
+            labels)
+
+        response = _GAXPageIterator(trace_pb)
+        gax_api = mock.Mock(spec=trace_service_client.TraceServiceClient)
+        gax_api.list_traces.return_value = response
+        api = self._make_one(gax_api, None)
+
+        iterator = api.list_traces(
+            project_id=self.project,
+            view=view_type,
+            page_size=size,
+            page_token=token)
+
+        traces = list(iterator)
+
+        self.assertEqual(len(traces), 1)
+        trace = traces[0]
+
+        self.assertEqual(len(trace['spans']), 1)
+        span = trace['spans'][0]
+
+        self.assertEqual(trace['projectId'], self.project)
+        self.assertEqual(trace['traceId'], trace_id)
+
+        self.assertEqual(span['spanId'], str(span_id))
+        self.assertEqual(span['name'], span_name)
+
+        self.assertEqual(
+            span['startTime'], start_time)
+        self.assertEqual(
+            span['endTime'], end_time)
+        self.assertEqual(span['kind'], span_kind)
+        self.assertEqual(span['parentSpanId'], str(parent_span_id))
+        self.assertEqual(span['labels'], labels)
+
+        call_args = gax_api.list_traces.call_args[1]
+
+        self.assertEqual(call_args['project_id'], self.project)
+        self.assertEqual(call_args['view'], view_type)
+        self.assertEqual(call_args['page_size'], size)
+        self.assertIsNone(call_args['start_time'])
+        self.assertIsNone(call_args['end_time'])
+        self.assertIsNone(call_args['filter_'])
+        self.assertIsNone(call_args['order_by'])
+        self.assertEqual(call_args['options'].page_token, token)
+
+
+class Test__parse_trace_pb(unittest.TestCase):
+
+    @staticmethod
+    def _call_fut(*args, **kwargs):
+        from google.cloud.trace._gax import _parse_trace_pb
+
+        return _parse_trace_pb(*args, **kwargs)
+
+    def test_registered_type(self):
+        from google.cloud.proto.devtools.cloudtrace.v1.trace_pb2 import (
+            TraceSpan, Trace)
+        from google.protobuf.timestamp_pb2 import Timestamp
+
+        project = u'PROJECT'
+        trace_id = u'test_trace_id'
+        span_id = 1234
+        span_name = u'test_span_name'
+        start_time = '2017-06-24T00:12:50.369990Z'
+        end_time = '2017-06-24T00:13:39.633255Z'
+        start_seconds = 1498263170
+        start_nanos = 369990000
+        end_seconds = 1498263219
+        end_nanos = 633255000
+
+        start_time_pb = Timestamp(seconds=start_seconds, nanos=start_nanos)
+        end_time_pb = Timestamp(seconds=end_seconds, nanos=end_nanos)
+
+        span_pb = TraceSpan(
+            span_id=span_id,
+            name=span_name,
+            start_time=start_time_pb,
+            end_time=end_time_pb)
+
+        trace_pb = Trace(
+            project_id=project,
+            trace_id=trace_id,
+            spans=[span_pb])
+
+        parse_result = self._call_fut(trace_pb)
+
+        expected_result = {
+            'projectId': project,
+            'traceId': trace_id,
+            'spans': [
+                {
+                    'spanId': str(span_id),
+                    'name': span_name,
+                    'startTime': start_time,
+                    'endTime': end_time,
+                },
+            ],
+        }
+
+        self.assertEqual(parse_result, expected_result)
+
+    @mock.patch('google.cloud.trace._gax.MessageToDict',
+                side_effect=TypeError)
+    def test_unregistered_type(self, msg_to_dict_mock):
+        trace_pb = mock.Mock(spec=['HasField'])
+        trace_pb.HasField.return_value = False
+        with self.assertRaises(TypeError):
+            self._call_fut(trace_pb)
+
+
+class Test_make_gax_trace_api(unittest.TestCase):
+
+    def _call_fut(self, client):
+        from google.cloud.trace._gax import make_gax_trace_api
+
+        return make_gax_trace_api(client)
+
+    def test_it(self):
+        from google.cloud.trace._gax import _TraceAPI
+        from google.cloud._http import DEFAULT_USER_AGENT
+
+        credentials = object()
+        client = mock.Mock(_credentials=credentials, spec=['_credentials'])
+        channels = []
+        channel_args = []
+        generated_api_kwargs = []
+        channel_obj = object()
+        generated = object()
+
+        def make_channel(*args):
+            channel_args.append(args)
+            return channel_obj
+
+        def generated_api(channel=None, **kwargs):
+            channels.append(channel)
+            generated_api_kwargs.append(kwargs)
+            return generated
+
+        host = 'foo.apis.invalid'
+        generated_api.SERVICE_ADDRESS = host
+
+        patch_channel = mock.patch(
+            'google.cloud.trace._gax.make_secure_channel',
+            new=make_channel)
+
+        patch_api = mock.patch(
+            'google.cloud.trace._gax.trace_service_client.TraceServiceClient',
+            new=generated_api)
+
+        with patch_api:
+            with patch_channel:
+                trace_api = self._call_fut(client)
+
+        self.assertEqual(channels, [channel_obj])
+        self.assertEqual(channel_args,
+                         [(credentials, DEFAULT_USER_AGENT, host)])
+
+        self.assertEqual(len(generated_api_kwargs), 1)
+        self.assertEqual(generated_api_kwargs[0]['lib_name'], 'gccl')
+
+        self.assertIsInstance(trace_api, _TraceAPI)
+        self.assertIs(trace_api._gax_api, generated)
+        self.assertIs(trace_api.client, client)
diff --git a/trace/tests/unit/test_client.py b/trace/tests/unit/test_client.py
new file mode 100644
index 0000000000000..62cc8ad8e9f24
--- /dev/null
+++ b/trace/tests/unit/test_client.py
@@ -0,0 +1,252 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import unittest
+
+import mock
+
+
+def _make_credentials():
+    import google.auth.credentials
+
+    return mock.Mock(spec=google.auth.credentials.Credentials)
+
+
+class TestClient(unittest.TestCase):
+
+    project = 'PROJECT'
+
+    @staticmethod
+    def _get_target_class():
+        from google.cloud.trace.client import Client
+
+        return Client
+
+    def _make_one(self, *args, **kw):
+        return self._get_target_class()(*args, **kw)
+
+    def test_constructor(self):
+        credentials = _make_credentials()
+        client = self._make_one(project=self.project, credentials=credentials)
+        self.assertEqual(client.project, self.project)
+
+    def test_trace_api(self):
+        clients = []
+        api_obj = object()
+
+        def make_api(client_obj):
+            clients.append(client_obj)
+            return api_obj
+
+        credentials = _make_credentials()
+        client = self._make_one(project=self.project, credentials=credentials)
+
+        patch = mock.patch(
+            'google.cloud.trace.client.make_gax_trace_api',
+            new=make_api)
+
+        with patch:
+            api = client.trace_api
+
+        self.assertIs(api, api_obj)
+        self.assertEqual(clients, [client])
+
+    def test_patch_traces_default(self):
+        from google.cloud.trace._gax import _TraceAPI
+
+        credentials = _make_credentials()
+        client = self._make_one(project=self.project, credentials=credentials)
+        traces = 'fake_traces_for_test'
+
+        mock_trace_api = mock.Mock(spec=_TraceAPI)
+        mock_trace_api.patch_traces = mock.Mock()
+        patch = mock.patch('google.cloud.trace.client.make_gax_trace_api', return_value=mock_trace_api)
+
+        with patch:
+            client.patch_traces(traces=traces)
+
+        mock_trace_api.patch_traces.assert_called_with(
+            options=None,
+            project_id='PROJECT',
+            traces='fake_traces_for_test')
+
+    def test_patch_traces_explicit(self):
+        from google.cloud.trace._gax import _TraceAPI
+
+        credentials = _make_credentials()
+        client = self._make_one(project=self.project, credentials=credentials)
+        traces = 'fake_traces_for_test'
+
+        mock_trace_api = mock.Mock(spec=_TraceAPI)
+        mock_trace_api.patch_traces = mock.Mock()
+        patch = mock.patch('google.cloud.trace.client.make_gax_trace_api', return_value=mock_trace_api)
+
+        with patch:
+            client.patch_traces(
+                project_id=self.project,
+                traces=traces)
+
+        mock_trace_api.patch_traces.assert_called_with(
+            options=None,
+            project_id='PROJECT',
+            traces='fake_traces_for_test')
+
+    def test_get_trace_default(self):
+        from google.cloud.trace._gax import _TraceAPI
+
+        def get_trace(trace_id, project_id=None, options=None):
+            _get_trace_called_with = (trace_id, project_id, options)
+            return _get_trace_called_with
+
+        credentials = _make_credentials()
+        client = self._make_one(project=self.project, credentials=credentials)
+        trace_id = '5e6e73b4131303cb6f5c9dfbaf104e33'
+
+        mock_trace_api = mock.Mock(spec=_TraceAPI)
+        mock_trace_api.get_trace = get_trace
+        patch = mock.patch('google.cloud.trace.client.make_gax_trace_api',
+                           return_value=mock_trace_api)
+
+        with patch:
+            get_trace_called_with = client.get_trace(trace_id=trace_id)
+
+        self.assertEqual(get_trace_called_with,
+                         (trace_id, self.project, None))
+
+    def test_get_trace_explicit(self):
+        from google.cloud.trace._gax import _TraceAPI
+
+        def get_trace(trace_id, project_id=None, options=None):
+            _get_trace_called_with = (trace_id, project_id, options)
+            return _get_trace_called_with
+
+        credentials = _make_credentials()
+        client = self._make_one(project=self.project, credentials=credentials)
+        trace_id = '5e6e73b4131303cb6f5c9dfbaf104e33'
+
+        mock_trace_api = mock.Mock(spec=_TraceAPI)
+        mock_trace_api.get_trace = get_trace
+        patch = mock.patch('google.cloud.trace.client.make_gax_trace_api',
+                           return_value=mock_trace_api)
+
+        with patch:
+            get_trace_called_with = client.get_trace(
+                trace_id=trace_id,
+                project_id=self.project)
+
+        self.assertEqual(get_trace_called_with,
+                         (trace_id, self.project, None))
+
+    def test_list_traces_default(self):
+        from google.cloud.trace._gax import _TraceAPI
+
+        def list_traces(
+                project_id,
+                view=None,
+                page_size=None,
+                start_time=None,
+                end_time=None,
+                filter_=None,
+                order_by=None,
+                page_token=None):
+            _list_traces_called_with = (
+                project_id,
+                view,
+                page_size,
+                start_time,
+                end_time,
+                filter_,
+                order_by,
+                page_token)
+            return _list_traces_called_with
+
+        credentials = _make_credentials()
+        client = self._make_one(project=self.project, credentials=credentials)
+
+        mock_trace_api = mock.Mock(spec=_TraceAPI)
+        mock_trace_api.list_traces = list_traces
+        patch = mock.patch('google.cloud.trace.client.make_gax_trace_api',
+                           return_value=mock_trace_api)
+
+        with patch:
+            list_traces_called_with = client.list_traces()
+
+        self.assertEqual(list_traces_called_with, (
+            self.project,
+            None, None, None, None, None, None, None))
+
+    def test_list_traces_explicit(self):
+        from google.cloud._helpers import _datetime_to_pb_timestamp
+        from google.cloud.gapic.trace.v1.enums import ListTracesRequest as Enum
+        from google.cloud.trace._gax import _TraceAPI
+
+        from datetime import datetime
+
+        def list_traces(
+                project_id,
+                view=None,
+                page_size=None,
+                start_time=None,
+                end_time=None,
+                filter_=None,
+                order_by=None,
+                page_token=None):
+            _list_traces_called_with = (
+                project_id,
+                view,
+                page_size,
+                start_time,
+                end_time,
+                filter_,
+                order_by,
+                page_token)
+            return _list_traces_called_with
+
+        credentials = _make_credentials()
+        client = self._make_one(project=self.project, credentials=credentials)
+
+        mock_trace_api = mock.Mock(spec=_TraceAPI)
+        mock_trace_api.list_traces = list_traces
+        patch = mock.patch('google.cloud.trace.client.make_gax_trace_api',
+                           return_value=mock_trace_api)
+
+        view = Enum.ViewType.COMPLETE
+        page_size = 10
+        start_time = datetime.utcnow()
+        end_time = datetime.utcnow()
+        filter_ = '+span:span1'
+        order_by = 'traceId'
+        page_token = 'TOKEN'
+
+
+        with patch:
+            list_traces_called_with = client.list_traces(
+                project_id=self.project,
+                view=view,
+                page_size=page_size,
+                start_time=start_time,
+                end_time=end_time,
+                filter_=filter_,
+                order_by=order_by,
+                page_token=page_token)
+
+        self.assertEqual(list_traces_called_with, (
+            self.project,
+            view,
+            page_size,
+            _datetime_to_pb_timestamp(start_time),
+            _datetime_to_pb_timestamp(end_time),
+            filter_,
+            order_by,
+            page_token))

From 9452572450a9670e1f631b95ec8bb86023568390 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Wed, 26 Jul 2017 14:43:54 -0700
Subject: [PATCH 124/211] Simplifying Client constructor's for Bigtable and
 Spanner. (#3672)

* Simplifying Client constructor's for Bigtable and Spanner.

* Fixing Bigtable unit tests after Client re-factor.

Also slightly changing the Client constructor so that
it only called `with_scopes()` one time on the credentials
(was previously calling with `SCOPE=None` and then again with the
custom scope for the instance)

* Fixing Spanner unit tests after Client re-factor.

Also slightly changing the `copy()` method so that it
just passes the same credentials instance.

Also updating `nox` config to allow session `posargs`.

* Removing unused imports after Bigtable/Spanner Client re-factor.
---
 bigtable/google/cloud/bigtable/client.py |  51 +--
 bigtable/nox.py                          |  13 +-
 bigtable/tests/unit/test_client.py       | 386 ++++++++++++-----------
 spanner/google/cloud/spanner/client.py   |  45 ++-
 spanner/nox.py                           |  13 +-
 spanner/tests/unit/test_client.py        |  56 ++--
 6 files changed, 297 insertions(+), 267 deletions(-)

diff --git a/bigtable/google/cloud/bigtable/client.py b/bigtable/google/cloud/bigtable/client.py
index 62877371a945a..de6d0768266fa 100644
--- a/bigtable/google/cloud/bigtable/client.py
+++ b/bigtable/google/cloud/bigtable/client.py
@@ -31,16 +31,13 @@
 
 import os
 
-import google.auth
-import google.auth.credentials
 from google.gax.utils import metrics
 from google.longrunning import operations_grpc
 
 from google.cloud._helpers import make_insecure_stub
 from google.cloud._helpers import make_secure_stub
 from google.cloud._http import DEFAULT_USER_AGENT
-from google.cloud.client import _ClientFactoryMixin
-from google.cloud.client import _ClientProjectMixin
+from google.cloud.client import ClientWithProject
 from google.cloud.environment_vars import BIGTABLE_EMULATOR
 
 from google.cloud.bigtable import __version__
@@ -166,13 +163,13 @@ def _make_table_stub(client):
             client.emulator_host)
 
 
-class Client(_ClientFactoryMixin, _ClientProjectMixin):
+class Client(ClientWithProject):
     """Client for interacting with Google Cloud Bigtable API.
 
     .. note::
 
         Since the Cloud Bigtable API requires the gRPC transport, no
-        ``http`` argument is accepted by this class.
+        ``_http`` argument is accepted by this class.
 
     :type project: :class:`str` or :func:`unicode <unicode>`
     :param project: (Optional) The ID of the project which owns the
@@ -209,31 +206,21 @@ class Client(_ClientFactoryMixin, _ClientProjectMixin):
 
     def __init__(self, project=None, credentials=None,
                  read_only=False, admin=False, user_agent=DEFAULT_USER_AGENT):
-        _ClientProjectMixin.__init__(self, project=project)
-        if credentials is None:
-            credentials, _ = google.auth.default()
-
         if read_only and admin:
             raise ValueError('A read-only client cannot also perform'
                              'administrative actions.')
 
-        scopes = []
-        if read_only:
-            scopes.append(READ_ONLY_SCOPE)
-        else:
-            scopes.append(DATA_SCOPE)
-
+        # NOTE: We set the scopes **before** calling the parent constructor.
+        #       It **may** use those scopes in ``with_scopes_if_required``.
         self._read_only = bool(read_only)
-
-        if admin:
-            scopes.append(ADMIN_SCOPE)
-
         self._admin = bool(admin)
+        self.SCOPE = self._get_scopes()
 
-        credentials = google.auth.credentials.with_scopes_if_required(
-            credentials, scopes)
-
-        self._credentials = credentials
+        # NOTE: This API has no use for the _http argument, but sending it
+        #       will have no impact since the _http() @property only lazily
+        #       creates a working HTTP object.
+        super(Client, self).__init__(
+            project=project, credentials=credentials, _http=None)
         self.user_agent = user_agent
         self.emulator_host = os.getenv(BIGTABLE_EMULATOR)
 
@@ -244,6 +231,22 @@ def __init__(self, project=None, credentials=None,
             self._operations_stub_internal = _make_operations_stub(self)
             self._table_stub_internal = _make_table_stub(self)
 
+    def _get_scopes(self):
+        """Get the scopes corresponding to admin / read-only state.
+
+        Returns:
+            Tuple[str, ...]: The tuple of scopes.
+        """
+        if self._read_only:
+            scopes = (READ_ONLY_SCOPE,)
+        else:
+            scopes = (DATA_SCOPE,)
+
+        if self._admin:
+            scopes += (ADMIN_SCOPE,)
+
+        return scopes
+
     def copy(self):
         """Make a copy of this client.
 
diff --git a/bigtable/nox.py b/bigtable/nox.py
index b43e196a95ffc..83b56e49d2dfd 100644
--- a/bigtable/nox.py
+++ b/bigtable/nox.py
@@ -37,10 +37,17 @@ def unit_tests(session, python_version):
     session.install('-e', '.')
 
     # Run py.test against the unit tests.
-    session.run('py.test', '--quiet',
-        '--cov=google.cloud.bigtable', '--cov=tests.unit', '--cov-append',
-        '--cov-config=.coveragerc', '--cov-report=', '--cov-fail-under=97',
+    session.run(
+        'py.test',
+        '--quiet',
+        '--cov=google.cloud.bigtable',
+        '--cov=tests.unit',
+        '--cov-append',
+        '--cov-config=.coveragerc',
+        '--cov-report=',
+        '--cov-fail-under=97',
         'tests/unit',
+        *session.posargs
     )
 
 
diff --git a/bigtable/tests/unit/test_client.py b/bigtable/tests/unit/test_client.py
index c3ab8d1ed8887..9e0485a41554c 100644
--- a/bigtable/tests/unit/test_client.py
+++ b/bigtable/tests/unit/test_client.py
@@ -256,170 +256,215 @@ def _get_target_class():
     def _make_one(self, *args, **kwargs):
         return self._get_target_class()(*args, **kwargs)
 
-    def _make_oneWithMocks(self, *args, **kwargs):
-        from google.cloud._testing import _Monkey
-        from google.cloud.bigtable import client as MUT
-
-        mock_make_data_stub = _MakeStubMock()
-        mock_make_instance_stub = _MakeStubMock()
-        mock_make_operations_stub = _MakeStubMock()
-        mock_make_table_stub = _MakeStubMock()
-        with _Monkey(MUT, _make_data_stub=mock_make_data_stub,
-                     _make_instance_stub=mock_make_instance_stub,
-                     _make_operations_stub=mock_make_operations_stub,
-                     _make_table_stub=mock_make_table_stub):
-            return self._make_one(*args, **kwargs)
-
-    def _constructor_test_helper(self, expected_scopes, creds,
-                                 read_only=False, admin=False,
-                                 user_agent=None, expected_creds=None):
-        from google.cloud._testing import _Monkey
-        from google.cloud.bigtable import client as MUT
-
-        user_agent = user_agent or MUT.DEFAULT_USER_AGENT
-
-        mock_make_data_stub = _MakeStubMock()
-        mock_make_instance_stub = _MakeStubMock()
-        mock_make_operations_stub = _MakeStubMock()
-        mock_make_table_stub = _MakeStubMock()
-        with _Monkey(MUT, _make_data_stub=mock_make_data_stub,
-                     _make_instance_stub=mock_make_instance_stub,
-                     _make_operations_stub=mock_make_operations_stub,
-                     _make_table_stub=mock_make_table_stub):
-            client = self._make_one(project=self.PROJECT, credentials=creds,
-                                    read_only=read_only, admin=admin,
-                                    user_agent=user_agent)
-
-        # Verify the mocks.
-        self.assertEqual(mock_make_data_stub.calls, [client])
-        if admin:
-            self.assertSequenceEqual(mock_make_instance_stub.calls, [client])
-            self.assertSequenceEqual(mock_make_operations_stub.calls, [client])
-            self.assertSequenceEqual(mock_make_table_stub.calls, [client])
-        else:
-            self.assertSequenceEqual(mock_make_instance_stub.calls, [])
-            self.assertSequenceEqual(mock_make_operations_stub.calls, [])
-            self.assertSequenceEqual(mock_make_table_stub.calls, [])
-
-        expected_creds = expected_creds or creds.with_scopes.return_value
-        self.assertIs(client._credentials, expected_creds)
+    @mock.patch('google.cloud.bigtable.client._make_table_stub')
+    @mock.patch('google.cloud.bigtable.client._make_operations_stub')
+    @mock.patch('google.cloud.bigtable.client._make_instance_stub')
+    @mock.patch('google.cloud.bigtable.client._make_data_stub')
+    def _make_one_with_mocks(
+            self, _make_data_stub, _make_instance_stub,
+            _make_operations_stub, _make_table_stub,
+            *args, **kwargs):
+        return self._make_one(*args, **kwargs)
+
+    @mock.patch('google.cloud.bigtable.client._make_table_stub')
+    @mock.patch('google.cloud.bigtable.client._make_operations_stub')
+    @mock.patch('google.cloud.bigtable.client._make_instance_stub')
+    @mock.patch('google.cloud.bigtable.client._make_data_stub')
+    def test_constructor_default_scopes(
+            self, _make_data_stub, _make_instance_stub,
+            _make_operations_stub, _make_table_stub):
+        from google.cloud.bigtable.client import DATA_SCOPE
 
-        if expected_scopes is not None:
-            creds.with_scopes.assert_called_once_with(expected_scopes)
+        expected_scopes = (DATA_SCOPE,)
+        credentials = _make_credentials()
+        custom_user_agent = 'custom-application'
+        client = self._make_one(
+            project=self.PROJECT, credentials=credentials,
+            user_agent=custom_user_agent)
 
         self.assertEqual(client.project, self.PROJECT)
-        self.assertEqual(client.user_agent, user_agent)
-        # Check gRPC stubs (or mocks of them) are set
-        self.assertIs(client._data_stub, mock_make_data_stub.result)
-        if admin:
-            self.assertIs(client._instance_stub_internal,
-                          mock_make_instance_stub.result)
-            self.assertIs(client._operations_stub_internal,
-                          mock_make_operations_stub.result)
-            self.assertIs(client._table_stub_internal,
-                          mock_make_table_stub.result)
-        else:
-            self.assertIsNone(client._instance_stub_internal)
-            self.assertIsNone(client._operations_stub_internal)
-            self.assertIsNone(client._table_stub_internal)
-
-    def test_constructor_default_scopes(self):
-        from google.cloud.bigtable import client as MUT
-
-        expected_scopes = [MUT.DATA_SCOPE]
-        creds = _make_credentials()
-        self._constructor_test_helper(expected_scopes, creds)
-
-    def test_constructor_custom_user_agent(self):
-        from google.cloud.bigtable import client as MUT
-
-        CUSTOM_USER_AGENT = 'custom-application'
-        expected_scopes = [MUT.DATA_SCOPE]
-        creds = _make_credentials()
-        self._constructor_test_helper(expected_scopes, creds,
-                                      user_agent=CUSTOM_USER_AGENT)
-
-    def test_constructor_with_admin(self):
-        from google.cloud.bigtable import client as MUT
-
-        expected_scopes = [MUT.DATA_SCOPE, MUT.ADMIN_SCOPE]
-        creds = _make_credentials()
-        self._constructor_test_helper(expected_scopes, creds, admin=True)
+        self.assertIs(
+            client._credentials, credentials.with_scopes.return_value)
+        self.assertIsNone(client._http_internal)
+        self.assertFalse(client._read_only)
+        self.assertFalse(client._admin)
+        self.assertEqual(client.SCOPE, expected_scopes)
+        self.assertEqual(client.user_agent, custom_user_agent)
+        self.assertIsNone(client.emulator_host)
+        self.assertIs(client._data_stub, _make_data_stub.return_value)
+        self.assertIsNone(client._instance_stub_internal)
+        self.assertIsNone(client._operations_stub_internal)
+        self.assertIsNone(client._table_stub_internal)
+
+        # Check mocks.
+        credentials.with_scopes.assert_called_once_with(expected_scopes)
+        _make_data_stub.assert_called_once_with(client)
+        _make_instance_stub.assert_not_called()
+        _make_operations_stub.assert_not_called()
+        _make_table_stub.assert_not_called()
+
+    @mock.patch('google.cloud.bigtable.client._make_table_stub')
+    @mock.patch('google.cloud.bigtable.client._make_operations_stub')
+    @mock.patch('google.cloud.bigtable.client._make_instance_stub')
+    @mock.patch('google.cloud.bigtable.client._make_data_stub')
+    def test_constructor_with_admin(
+            self, _make_data_stub, _make_instance_stub,
+            _make_operations_stub, _make_table_stub):
+        from google.cloud._http import DEFAULT_USER_AGENT
+        from google.cloud.bigtable.client import ADMIN_SCOPE
+        from google.cloud.bigtable.client import DATA_SCOPE
 
-    def test_constructor_with_read_only(self):
-        from google.cloud.bigtable import client as MUT
+        expected_scopes = (DATA_SCOPE, ADMIN_SCOPE)
+        credentials = _make_credentials()
+        client = self._make_one(
+            project=self.PROJECT, credentials=credentials, admin=True)
 
-        expected_scopes = [MUT.READ_ONLY_SCOPE]
-        creds = _make_credentials()
-        self._constructor_test_helper(expected_scopes, creds, read_only=True)
+        self.assertEqual(client.project, self.PROJECT)
+        self.assertIs(
+            client._credentials, credentials.with_scopes.return_value)
+        self.assertIsNone(client._http_internal)
+        self.assertFalse(client._read_only)
+        self.assertTrue(client._admin)
+        self.assertEqual(client.SCOPE, expected_scopes)
+        self.assertEqual(client.user_agent, DEFAULT_USER_AGENT)
+        self.assertIsNone(client.emulator_host)
+        self.assertIs(client._data_stub, _make_data_stub.return_value)
+        self.assertIs(
+            client._instance_stub_internal, _make_instance_stub.return_value)
+        self.assertIs(
+            client._operations_stub_internal,
+            _make_operations_stub.return_value)
+        self.assertIs(
+            client._table_stub_internal, _make_table_stub.return_value)
+
+        # Check mocks.
+        credentials.with_scopes.assert_called_once_with(expected_scopes)
+        _make_data_stub.assert_called_once_with(client)
+        _make_instance_stub.assert_called_once_with(client)
+        _make_operations_stub.assert_called_once_with(client)
+        _make_table_stub.assert_called_once_with(client)
 
     def test_constructor_both_admin_and_read_only(self):
-        creds = _make_credentials()
+        credentials = _make_credentials()
         with self.assertRaises(ValueError):
-            self._constructor_test_helper([], creds, admin=True,
-                                          read_only=True)
+            self._make_one(
+                project=self.PROJECT, credentials=credentials,
+                admin=True, read_only=True)
 
-    def test_constructor_implicit_credentials(self):
+    def test__get_scopes_default(self):
         from google.cloud.bigtable.client import DATA_SCOPE
 
-        creds = _make_credentials()
-        expected_scopes = [DATA_SCOPE]
+        client = self._make_one(
+            project=self.PROJECT, credentials=_make_credentials())
+        self.assertEqual(client._get_scopes(), (DATA_SCOPE,))
 
-        patch = mock.patch(
-            'google.auth.default', return_value=(creds, None))
-        with patch as default:
-            self._constructor_test_helper(
-                None, None,
-                expected_creds=creds.with_scopes.return_value)
+    def test__get_scopes_admin(self):
+        from google.cloud.bigtable.client import ADMIN_SCOPE
+        from google.cloud.bigtable.client import DATA_SCOPE
 
-        default.assert_called_once_with()
-        creds.with_scopes.assert_called_once_with(expected_scopes)
+        client = self._make_one(
+            project=self.PROJECT, credentials=_make_credentials(),
+            admin=True)
+        expected_scopes = (DATA_SCOPE, ADMIN_SCOPE)
+        self.assertEqual(client._get_scopes(), expected_scopes)
+
+    def test__get_scopes_read_only(self):
+        from google.cloud.bigtable.client import READ_ONLY_SCOPE
+
+        client = self._make_one(
+            project=self.PROJECT, credentials=_make_credentials(),
+            read_only=True)
+        self.assertEqual(client._get_scopes(), (READ_ONLY_SCOPE,))
+
+    def _copy_helper_check_stubs(self, client, new_client):
+        if client._admin:
+            # Check the instance stub.
+            self.assertIs(
+                client._instance_stub_internal, mock.sentinel.inst_stub1)
+            self.assertIs(
+                new_client._instance_stub_internal, mock.sentinel.inst_stub2)
+            self.assertIsNot(
+                new_client._instance_stub_internal,
+                client._instance_stub_internal)
+            # Check the operations stub.
+            self.assertIs(
+                client._operations_stub_internal, mock.sentinel.ops_stub1)
+            self.assertIs(
+                new_client._operations_stub_internal, mock.sentinel.ops_stub2)
+            self.assertIsNot(
+                new_client._operations_stub_internal,
+                client._operations_stub_internal)
+            # Check the table stub.
+            self.assertIs(
+                client._table_stub_internal, mock.sentinel.table_stub1)
+            self.assertIs(
+                new_client._table_stub_internal, mock.sentinel.table_stub2)
+            self.assertIsNot(
+                new_client._table_stub_internal, client._table_stub_internal)
+        else:
+            # Check the instance stub.
+            self.assertIsNone(client._instance_stub_internal)
+            self.assertIsNone(new_client._instance_stub_internal)
+            # Check the operations stub.
+            self.assertIsNone(client._operations_stub_internal)
+            self.assertIsNone(new_client._operations_stub_internal)
+            # Check the table stub.
+            self.assertIsNone(client._table_stub_internal)
+            self.assertIsNone(new_client._table_stub_internal)
+
+    @mock.patch(
+        'google.cloud.bigtable.client._make_table_stub',
+        side_effect=[mock.sentinel.table_stub1, mock.sentinel.table_stub2],
+    )
+    @mock.patch(
+        'google.cloud.bigtable.client._make_operations_stub',
+        side_effect=[mock.sentinel.ops_stub1, mock.sentinel.ops_stub2],
+    )
+    @mock.patch(
+        'google.cloud.bigtable.client._make_instance_stub',
+        side_effect=[mock.sentinel.inst_stub1, mock.sentinel.inst_stub2],
+    )
+    @mock.patch(
+        'google.cloud.bigtable.client._make_data_stub',
+        side_effect=[mock.sentinel.data_stub1, mock.sentinel.data_stub2],
+    )
+    def _copy_test_helper(
+            self, _make_data_stub, _make_instance_stub,
+            _make_operations_stub, _make_table_stub, **kwargs):
+        credentials = _make_credentials()
+        # Make sure it "already" is scoped.
+        credentials.requires_scopes = False
 
-    def test_constructor_credentials_wo_create_scoped(self):
-        creds = _make_credentials()
-        expected_scopes = None
-        self._constructor_test_helper(expected_scopes, creds)
+        client = self._make_one(
+            project=self.PROJECT, credentials=credentials, **kwargs)
+        self.assertIs(client._credentials, credentials)
 
-    def _copy_test_helper(self, read_only=False, admin=False):
-        from google.cloud._testing import _Monkey
-        from google.cloud.bigtable import client as MUT
-
-        credentials = _make_credentials()
-        client = self._make_oneWithMocks(
-            project=self.PROJECT,
-            credentials=credentials,
-            read_only=read_only,
-            admin=admin,
-            user_agent=self.USER_AGENT)
-        # Put some fake stubs in place so that we can verify they don't
-        # get copied. In the admin=False case, only the data stub will
-        # not be None, so we over-ride all the internal values.
-        client._data_stub = object()
-        client._instance_stub_internal = object()
-        client._operations_stub_internal = object()
-        client._table_stub_internal = object()
-
-        mock_make_data_stub = _MakeStubMock()
-        mock_make_instance_stub = _MakeStubMock()
-        mock_make_operations_stub = _MakeStubMock()
-        mock_make_table_stub = _MakeStubMock()
-        with _Monkey(MUT, _make_data_stub=mock_make_data_stub,
-                     _make_instance_stub=mock_make_instance_stub,
-                     _make_operations_stub=mock_make_operations_stub,
-                     _make_table_stub=mock_make_table_stub):
-            new_client = client.copy()
+        new_client = client.copy()
         self.assertEqual(new_client._admin, client._admin)
         self.assertEqual(new_client._credentials, client._credentials)
         self.assertEqual(new_client.project, client.project)
         self.assertEqual(new_client.user_agent, client.user_agent)
         # Make sure stubs are not preserved.
-        self.assertNotEqual(new_client._data_stub, client._data_stub)
-        self.assertNotEqual(new_client._instance_stub_internal,
-                            client._instance_stub_internal)
-        self.assertNotEqual(new_client._operations_stub_internal,
-                            client._operations_stub_internal)
-        self.assertNotEqual(new_client._table_stub_internal,
-                            client._table_stub_internal)
+        self.assertIs(client._data_stub, mock.sentinel.data_stub1)
+        self.assertIs(new_client._data_stub, mock.sentinel.data_stub2)
+        self.assertIsNot(new_client._data_stub, client._data_stub)
+        self._copy_helper_check_stubs(client, new_client)
+
+        # Check mocks.
+        credentials.with_scopes.assert_not_called()
+        stub_calls = [
+            mock.call(client),
+            mock.call(new_client),
+        ]
+        self.assertEqual(_make_data_stub.mock_calls, stub_calls)
+        if client._admin:
+            self.assertEqual(_make_instance_stub.mock_calls, stub_calls)
+            self.assertEqual(_make_operations_stub.mock_calls, stub_calls)
+            self.assertEqual(_make_table_stub.mock_calls, stub_calls)
+        else:
+            _make_instance_stub.assert_not_called()
+            _make_operations_stub.assert_not_called()
+            _make_table_stub.assert_not_called()
 
     def test_copy(self):
         self._copy_test_helper()
@@ -433,61 +478,61 @@ def test_copy_read_only(self):
     def test_credentials_getter(self):
         credentials = _make_credentials()
         project = 'PROJECT'
-        client = self._make_oneWithMocks(project=project,
-                                         credentials=credentials)
+        client = self._make_one_with_mocks(
+            project=project, credentials=credentials)
         self.assertIs(client.credentials, credentials.with_scopes.return_value)
 
     def test_project_name_property(self):
         credentials = _make_credentials()
         project = 'PROJECT'
-        client = self._make_oneWithMocks(project=project,
-                                         credentials=credentials)
+        client = self._make_one_with_mocks(
+            project=project, credentials=credentials)
         project_name = 'projects/' + project
         self.assertEqual(client.project_name, project_name)
 
     def test_instance_stub_getter(self):
         credentials = _make_credentials()
         project = 'PROJECT'
-        client = self._make_oneWithMocks(project=project,
-                                         credentials=credentials, admin=True)
+        client = self._make_one_with_mocks(
+            project=project, credentials=credentials, admin=True)
         self.assertIs(client._instance_stub, client._instance_stub_internal)
 
     def test_instance_stub_non_admin_failure(self):
         credentials = _make_credentials()
         project = 'PROJECT'
-        client = self._make_oneWithMocks(project=project,
-                                         credentials=credentials, admin=False)
+        client = self._make_one_with_mocks(
+            project=project, credentials=credentials, admin=False)
         with self.assertRaises(ValueError):
             getattr(client, '_instance_stub')
 
     def test_operations_stub_getter(self):
         credentials = _make_credentials()
         project = 'PROJECT'
-        client = self._make_oneWithMocks(project=project,
-                                         credentials=credentials, admin=True)
+        client = self._make_one_with_mocks(
+            project=project, credentials=credentials, admin=True)
         self.assertIs(client._operations_stub,
                       client._operations_stub_internal)
 
     def test_operations_stub_non_admin_failure(self):
         credentials = _make_credentials()
         project = 'PROJECT'
-        client = self._make_oneWithMocks(project=project,
-                                         credentials=credentials, admin=False)
+        client = self._make_one_with_mocks(
+            project=project, credentials=credentials, admin=False)
         with self.assertRaises(ValueError):
             getattr(client, '_operations_stub')
 
     def test_table_stub_getter(self):
         credentials = _make_credentials()
         project = 'PROJECT'
-        client = self._make_oneWithMocks(project=project,
-                                         credentials=credentials, admin=True)
+        client = self._make_one_with_mocks(
+            project=project, credentials=credentials, admin=True)
         self.assertIs(client._table_stub, client._table_stub_internal)
 
     def test_table_stub_non_admin_failure(self):
         credentials = _make_credentials()
         project = 'PROJECT'
-        client = self._make_oneWithMocks(project=project,
-                                         credentials=credentials, admin=False)
+        client = self._make_one_with_mocks(
+            project=project, credentials=credentials, admin=False)
         with self.assertRaises(ValueError):
             getattr(client, '_table_stub')
 
@@ -501,8 +546,8 @@ def test_instance_factory_defaults(self):
         INSTANCE_ID = 'instance-id'
         DISPLAY_NAME = 'display-name'
         credentials = _make_credentials()
-        client = self._make_oneWithMocks(project=PROJECT,
-                                         credentials=credentials)
+        client = self._make_one_with_mocks(
+            project=PROJECT, credentials=credentials)
 
         instance = client.instance(INSTANCE_ID, display_name=DISPLAY_NAME)
 
@@ -523,8 +568,8 @@ def test_instance_factory_w_explicit_serve_nodes(self):
         LOCATION_ID = 'locname'
         SERVE_NODES = 5
         credentials = _make_credentials()
-        client = self._make_oneWithMocks(project=PROJECT,
-                                         credentials=credentials)
+        client = self._make_one_with_mocks(
+            project=PROJECT, credentials=credentials)
 
         instance = client.instance(
             INSTANCE_ID, display_name=DISPLAY_NAME,
@@ -554,7 +599,7 @@ def test_list_instances(self):
             'projects/' + self.PROJECT + '/instances/' + INSTANCE_ID2)
 
         credentials = _make_credentials()
-        client = self._make_oneWithMocks(
+        client = self._make_one_with_mocks(
             project=self.PROJECT,
             credentials=credentials,
             admin=True,
@@ -609,14 +654,3 @@ def __init__(self, credentials, user_agent, emulator_host=None):
         self.credentials = credentials
         self.user_agent = user_agent
         self.emulator_host = emulator_host
-
-
-class _MakeStubMock(object):
-
-    def __init__(self):
-        self.result = object()
-        self.calls = []
-
-    def __call__(self, client):
-        self.calls.append(client)
-        return self.result
diff --git a/spanner/google/cloud/spanner/client.py b/spanner/google/cloud/spanner/client.py
index b701b017abb03..6274d28d9e184 100644
--- a/spanner/google/cloud/spanner/client.py
+++ b/spanner/google/cloud/spanner/client.py
@@ -24,8 +24,6 @@
   :class:`~google.cloud.spanner.database.Database`
 """
 
-import google.auth
-import google.auth.credentials
 from google.gax import INITIAL_PAGE
 # pylint: disable=line-too-long
 from google.cloud.gapic.spanner_admin_database.v1.database_admin_client import (  # noqa
@@ -35,8 +33,7 @@
 # pylint: enable=line-too-long
 
 from google.cloud._http import DEFAULT_USER_AGENT
-from google.cloud.client import _ClientFactoryMixin
-from google.cloud.client import _ClientProjectMixin
+from google.cloud.client import ClientWithProject
 from google.cloud.iterator import GAXIterator
 from google.cloud.spanner import __version__
 from google.cloud.spanner._helpers import _options_with_prefix
@@ -73,13 +70,13 @@ def from_pb(cls, config_pb):
         return cls(config_pb.name, config_pb.display_name)
 
 
-class Client(_ClientFactoryMixin, _ClientProjectMixin):
+class Client(ClientWithProject):
     """Client for interacting with Cloud Spanner API.
 
     .. note::
 
         Since the Cloud Spanner API requires the gRPC transport, no
-        ``http`` argument is accepted by this class.
+        ``_http`` argument is accepted by this class.
 
     :type project: :class:`str` or :func:`unicode <unicode>`
     :param project: (Optional) The ID of the project which owns the
@@ -104,21 +101,16 @@ class Client(_ClientFactoryMixin, _ClientProjectMixin):
     _database_admin_api = None
     _SET_PROJECT = True  # Used by from_service_account_json()
 
+    SCOPE = (SPANNER_ADMIN_SCOPE,)
+    """The scopes required for Google Cloud Spanner."""
+
     def __init__(self, project=None, credentials=None,
                  user_agent=DEFAULT_USER_AGENT):
-
-        _ClientProjectMixin.__init__(self, project=project)
-        if credentials is None:
-            credentials, _ = google.auth.default()
-
-        scopes = [
-            SPANNER_ADMIN_SCOPE,
-        ]
-
-        credentials = google.auth.credentials.with_scopes_if_required(
-            credentials, scopes)
-
-        self._credentials = credentials
+        # NOTE: This API has no use for the _http argument, but sending it
+        #       will have no impact since the _http() @property only lazily
+        #       creates a working HTTP object.
+        super(Client, self).__init__(
+            project=project, credentials=credentials, _http=None)
         self.user_agent = user_agent
 
     @property
@@ -181,19 +173,20 @@ def copy(self):
         :rtype: :class:`.Client`
         :returns: A copy of the current client.
         """
-        credentials = self._credentials
-        copied_creds = credentials.create_scoped(credentials.scopes)
         return self.__class__(
-            self.project,
-            copied_creds,
-            self.user_agent,
+            project=self.project,
+            credentials=self._credentials,
+            user_agent=self.user_agent,
         )
 
     def list_instance_configs(self, page_size=None, page_token=None):
         """List available instance configurations for the client's project.
 
-        See
-        https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.InstanceAdmin.ListInstanceConfigs
+        .. _RPC docs: https://cloud.google.com/spanner/docs/reference/rpc/\
+                      google.spanner.admin.instance.v1#google.spanner.admin.\
+                      instance.v1.InstanceAdmin.ListInstanceConfigs
+
+        See `RPC docs`_.
 
         :type page_size: int
         :param page_size: (Optional) Maximum number of results to return.
diff --git a/spanner/nox.py b/spanner/nox.py
index 980bff46c85d2..bdb2b4e4cbb6c 100644
--- a/spanner/nox.py
+++ b/spanner/nox.py
@@ -38,10 +38,17 @@ def unit_tests(session, python_version):
     session.install('-e', '.')
 
     # Run py.test against the unit tests.
-    session.run('py.test', '--quiet',
-        '--cov=google.cloud.spanner', '--cov=tests.unit', '--cov-append',
-        '--cov-config=.coveragerc', '--cov-report=', '--cov-fail-under=97',
+    session.run(
+        'py.test',
+        '--quiet',
+        '--cov=google.cloud.spanner',
+        '--cov=tests.unit',
+        '--cov-append',
+        '--cov-config=.coveragerc',
+        '--cov-report=',
+        '--cov-fail-under=97',
         'tests/unit',
+        *session.posargs
     )
 
 
diff --git a/spanner/tests/unit/test_client.py b/spanner/tests/unit/test_client.py
index e5e90fd6b7ab1..28eee9b78f56f 100644
--- a/spanner/tests/unit/test_client.py
+++ b/spanner/tests/unit/test_client.py
@@ -15,6 +15,7 @@
 import unittest
 
 import mock
+import six
 
 
 def _make_credentials():
@@ -40,13 +41,13 @@ class TestClient(unittest.TestCase):
     TIMEOUT_SECONDS = 80
     USER_AGENT = 'you-sir-age-int'
 
-    def _getTargetClass(self):
+    def _get_target_class(self):
         from google.cloud.spanner.client import Client
 
         return Client
 
     def _make_one(self, *args, **kwargs):
-        return self._getTargetClass()(*args, **kwargs)
+        return self._get_target_class()(*args, **kwargs)
 
     def _constructor_test_helper(self, expected_scopes, creds,
                                  user_agent=None,
@@ -70,9 +71,9 @@ def _constructor_test_helper(self, expected_scopes, creds,
     def test_constructor_default_scopes(self):
         from google.cloud.spanner import client as MUT
 
-        expected_scopes = [
+        expected_scopes = (
             MUT.SPANNER_ADMIN_SCOPE,
-        ]
+        )
         creds = _make_credentials()
         self._constructor_test_helper(expected_scopes, creds)
 
@@ -80,9 +81,9 @@ def test_constructor_custom_user_agent_and_timeout(self):
         from google.cloud.spanner import client as MUT
 
         CUSTOM_USER_AGENT = 'custom-application'
-        expected_scopes = [
+        expected_scopes = (
             MUT.SPANNER_ADMIN_SCOPE,
-        ]
+        )
         creds = _make_credentials()
         self._constructor_test_helper(expected_scopes, creds,
                                       user_agent=CUSTOM_USER_AGENT)
@@ -186,24 +187,27 @@ def __init__(self, *args, **kwargs):
         self.assertIs(api.kwargs['credentials'], client.credentials)
 
     def test_copy(self):
-        credentials = _Credentials('value')
+        credentials = _make_credentials()
+        # Make sure it "already" is scoped.
+        credentials.requires_scopes = False
+
         client = self._make_one(
             project=self.PROJECT,
             credentials=credentials,
             user_agent=self.USER_AGENT)
 
         new_client = client.copy()
-        self.assertEqual(new_client._credentials, client._credentials)
+        self.assertIs(new_client._credentials, client._credentials)
         self.assertEqual(new_client.project, client.project)
         self.assertEqual(new_client.user_agent, client.user_agent)
 
     def test_credentials_property(self):
-        credentials = _Credentials()
+        credentials = _make_credentials()
         client = self._make_one(project=self.PROJECT, credentials=credentials)
-        self.assertIs(client.credentials, credentials)
+        self.assertIs(client.credentials, credentials.with_scopes.return_value)
 
     def test_project_name_property(self):
-        credentials = _Credentials()
+        credentials = _make_credentials()
         client = self._make_one(project=self.PROJECT, credentials=credentials)
         project_name = 'projects/' + self.PROJECT
         self.assertEqual(client.project_name, project_name)
@@ -213,7 +217,7 @@ def test_list_instance_configs_wo_paging(self):
         from google.gax import INITIAL_PAGE
         from google.cloud.spanner.client import InstanceConfig
 
-        credentials = _Credentials()
+        credentials = _make_credentials()
         client = self._make_one(project=self.PROJECT, credentials=credentials)
         client.connection = object()
         api = client._instance_admin_api = _FauxInstanceAdminAPI()
@@ -240,14 +244,13 @@ def test_list_instance_configs_wo_paging(self):
             [('google-cloud-resource-prefix', client.project_name)])
 
     def test_list_instance_configs_w_paging(self):
-        import six
         from google.cloud._testing import _GAXPageIterator
         from google.cloud.spanner.client import InstanceConfig
 
         SIZE = 15
         TOKEN_RETURNED = 'TOKEN_RETURNED'
         TOKEN_PASSED = 'TOKEN_PASSED'
-        credentials = _Credentials()
+        credentials = _make_credentials()
         client = self._make_one(project=self.PROJECT, credentials=credentials)
         client.connection = object()
         api = client._instance_admin_api = _FauxInstanceAdminAPI()
@@ -280,7 +283,7 @@ def test_instance_factory_defaults(self):
         from google.cloud.spanner.instance import DEFAULT_NODE_COUNT
         from google.cloud.spanner.instance import Instance
 
-        credentials = _Credentials()
+        credentials = _make_credentials()
         client = self._make_one(project=self.PROJECT, credentials=credentials)
 
         instance = client.instance(self.INSTANCE_ID)
@@ -295,7 +298,7 @@ def test_instance_factory_defaults(self):
     def test_instance_factory_explicit(self):
         from google.cloud.spanner.instance import Instance
 
-        credentials = _Credentials()
+        credentials = _make_credentials()
         client = self._make_one(project=self.PROJECT, credentials=credentials)
 
         instance = client.instance(self.INSTANCE_ID, self.CONFIGURATION_NAME,
@@ -314,7 +317,7 @@ def test_list_instances_wo_paging(self):
         from google.gax import INITIAL_PAGE
         from google.cloud.spanner.instance import Instance
 
-        credentials = _Credentials()
+        credentials = _make_credentials()
         client = self._make_one(project=self.PROJECT, credentials=credentials)
         client.connection = object()
         api = client._instance_admin_api = _FauxInstanceAdminAPI()
@@ -346,14 +349,13 @@ def test_list_instances_wo_paging(self):
             [('google-cloud-resource-prefix', client.project_name)])
 
     def test_list_instances_w_paging(self):
-        import six
         from google.cloud._testing import _GAXPageIterator
         from google.cloud.spanner.instance import Instance
 
         SIZE = 15
         TOKEN_RETURNED = 'TOKEN_RETURNED'
         TOKEN_PASSED = 'TOKEN_PASSED'
-        credentials = _Credentials()
+        credentials = _make_credentials()
         client = self._make_one(project=self.PROJECT, credentials=credentials)
         client.connection = object()
         api = client._instance_admin_api = _FauxInstanceAdminAPI()
@@ -389,22 +391,6 @@ def test_list_instances_w_paging(self):
             [('google-cloud-resource-prefix', client.project_name)])
 
 
-class _Credentials(object):
-
-    scopes = None
-
-    def __init__(self, access_token=None):
-        self._access_token = access_token
-        self._tokens = []
-
-    def create_scoped(self, scope):
-        self.scopes = scope
-        return self
-
-    def __eq__(self, other):
-        return self._access_token == other._access_token
-
-
 class _FauxInstanceAdminAPI(object):
 
     def list_instance_configs(self, name, page_size, options):

From e273319dfff93228889024f6194da48616a20e21 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Wed, 26 Jul 2017 18:00:47 -0400
Subject: [PATCH 125/211] Implement multi-use snapshots (#3615)

---
 spanner/google/cloud/spanner/database.py    |  70 +--
 spanner/google/cloud/spanner/session.py     |  31 +-
 spanner/google/cloud/spanner/snapshot.py    |  85 +++-
 spanner/google/cloud/spanner/streamed.py    |  12 +-
 spanner/google/cloud/spanner/transaction.py |  21 +-
 spanner/tests/system/test_system.py         |  72 ++-
 spanner/tests/unit/test_database.py         | 177 +------
 spanner/tests/unit/test_session.py          |  17 +-
 spanner/tests/unit/test_snapshot.py         | 287 ++++++++++-
 spanner/tests/unit/test_streamed.py         | 526 +++++++++++---------
 spanner/tests/unit/test_transaction.py      |  35 +-
 11 files changed, 803 insertions(+), 530 deletions(-)

diff --git a/spanner/google/cloud/spanner/database.py b/spanner/google/cloud/spanner/database.py
index a449f304bf79e..8df06812949de 100644
--- a/spanner/google/cloud/spanner/database.py
+++ b/spanner/google/cloud/spanner/database.py
@@ -380,8 +380,7 @@ def batch(self):
         """
         return BatchCheckout(self)
 
-    def snapshot(self, read_timestamp=None, min_read_timestamp=None,
-                 max_staleness=None, exact_staleness=None):
+    def snapshot(self, **kw):
         """Return an object which wraps a snapshot.
 
         The wrapper *must* be used as a context manager, with the snapshot
@@ -390,38 +389,15 @@ def snapshot(self, read_timestamp=None, min_read_timestamp=None,
         See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.TransactionOptions.ReadOnly
 
-        If no options are passed, reads will use the ``strong`` model, reading
-        at a timestamp where all previously committed transactions are visible.
-
-        :type read_timestamp: :class:`datetime.datetime`
-        :param read_timestamp: Execute all reads at the given timestamp.
-
-        :type min_read_timestamp: :class:`datetime.datetime`
-        :param min_read_timestamp: Execute all reads at a
-                                   timestamp >= ``min_read_timestamp``.
-
-        :type max_staleness: :class:`datetime.timedelta`
-        :param max_staleness: Read data at a
-                              timestamp >= NOW - ``max_staleness`` seconds.
-
-        :type exact_staleness: :class:`datetime.timedelta`
-        :param exact_staleness: Execute all reads at a timestamp that is
-                                ``exact_staleness`` old.
-
-        :rtype: :class:`~google.cloud.spanner.snapshot.Snapshot`
-        :returns: a snapshot bound to this session
-        :raises: :exc:`ValueError` if the session has not yet been created.
+        :type kw: dict
+        :param kw:
+            Passed through to
+            :class:`~google.cloud.spanner.snapshot.Snapshot` constructor.
 
         :rtype: :class:`~google.cloud.spanner.database.SnapshotCheckout`
         :returns: new wrapper
         """
-        return SnapshotCheckout(
-            self,
-            read_timestamp=read_timestamp,
-            min_read_timestamp=min_read_timestamp,
-            max_staleness=max_staleness,
-            exact_staleness=exact_staleness,
-        )
+        return SnapshotCheckout(self, **kw)
 
 
 class BatchCheckout(object):
@@ -467,40 +443,20 @@ class SnapshotCheckout(object):
     :type database: :class:`~google.cloud.spannder.database.Database`
     :param database: database to use
 
-    :type read_timestamp: :class:`datetime.datetime`
-    :param read_timestamp: Execute all reads at the given timestamp.
-
-    :type min_read_timestamp: :class:`datetime.datetime`
-    :param min_read_timestamp: Execute all reads at a
-                               timestamp >= ``min_read_timestamp``.
-
-    :type max_staleness: :class:`datetime.timedelta`
-    :param max_staleness: Read data at a
-                          timestamp >= NOW - ``max_staleness`` seconds.
-
-    :type exact_staleness: :class:`datetime.timedelta`
-    :param exact_staleness: Execute all reads at a timestamp that is
-                            ``exact_staleness`` old.
+    :type kw: dict
+    :param kw:
+        Passed through to
+        :class:`~google.cloud.spanner.snapshot.Snapshot` constructor.
     """
-    def __init__(self, database, read_timestamp=None, min_read_timestamp=None,
-                 max_staleness=None, exact_staleness=None):
+    def __init__(self, database, **kw):
         self._database = database
         self._session = None
-        self._read_timestamp = read_timestamp
-        self._min_read_timestamp = min_read_timestamp
-        self._max_staleness = max_staleness
-        self._exact_staleness = exact_staleness
+        self._kw = kw
 
     def __enter__(self):
         """Begin ``with`` block."""
         session = self._session = self._database._pool.get()
-        return Snapshot(
-            session,
-            read_timestamp=self._read_timestamp,
-            min_read_timestamp=self._min_read_timestamp,
-            max_staleness=self._max_staleness,
-            exact_staleness=self._exact_staleness,
-        )
+        return Snapshot(session, **self._kw)
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         """End ``with`` block."""
diff --git a/spanner/google/cloud/spanner/session.py b/spanner/google/cloud/spanner/session.py
index f25abdd6261a2..19ff60de4e1bc 100644
--- a/spanner/google/cloud/spanner/session.py
+++ b/spanner/google/cloud/spanner/session.py
@@ -139,30 +139,15 @@ def delete(self):
                 raise NotFound(self.name)
             raise
 
-    def snapshot(self, read_timestamp=None, min_read_timestamp=None,
-                 max_staleness=None, exact_staleness=None):
+    def snapshot(self, **kw):
         """Create a snapshot to perform a set of reads with shared staleness.
 
         See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.TransactionOptions.ReadOnly
 
-        If no options are passed, reads will use the ``strong`` model, reading
-        at a timestamp where all previously committed transactions are visible.
-
-        :type read_timestamp: :class:`datetime.datetime`
-        :param read_timestamp: Execute all reads at the given timestamp.
-
-        :type min_read_timestamp: :class:`datetime.datetime`
-        :param min_read_timestamp: Execute all reads at a
-                                   timestamp >= ``min_read_timestamp``.
-
-        :type max_staleness: :class:`datetime.timedelta`
-        :param max_staleness: Read data at a
-                              timestamp >= NOW - ``max_staleness`` seconds.
-
-        :type exact_staleness: :class:`datetime.timedelta`
-        :param exact_staleness: Execute all reads at a timestamp that is
-                                ``exact_staleness`` old.
+        :type kw: dict
+        :param kw: Passed through to
+                   :class:`~google.cloud.spanner.snapshot.Snapshot` ctor.
 
         :rtype: :class:`~google.cloud.spanner.snapshot.Snapshot`
         :returns: a snapshot bound to this session
@@ -171,11 +156,7 @@ def snapshot(self, read_timestamp=None, min_read_timestamp=None,
         if self._session_id is None:
             raise ValueError("Session has not been created.")
 
-        return Snapshot(self,
-                        read_timestamp=read_timestamp,
-                        min_read_timestamp=min_read_timestamp,
-                        max_staleness=max_staleness,
-                        exact_staleness=exact_staleness)
+        return Snapshot(self, **kw)
 
     def read(self, table, columns, keyset, index='', limit=0,
              resume_token=b''):
@@ -292,7 +273,7 @@ def run_in_transaction(self, func, *args, **kw):
                 txn = self.transaction()
             else:
                 txn = self._transaction
-            if txn._id is None:
+            if txn._transaction_id is None:
                 txn.begin()
             try:
                 func(txn, *args, **kw)
diff --git a/spanner/google/cloud/spanner/snapshot.py b/spanner/google/cloud/spanner/snapshot.py
index 05fcba63f322e..e0da23f3acd9a 100644
--- a/spanner/google/cloud/spanner/snapshot.py
+++ b/spanner/google/cloud/spanner/snapshot.py
@@ -34,6 +34,10 @@ class _SnapshotBase(_SessionWrapper):
     :type session: :class:`~google.cloud.spanner.session.Session`
     :param session: the session used to perform the commit
     """
+    _multi_use = False
+    _transaction_id = None
+    _read_request_count = 0
+
     def _make_txn_selector(self):  # pylint: disable=redundant-returns-doc
         """Helper for :meth:`read` / :meth:`execute_sql`.
 
@@ -70,7 +74,15 @@ def read(self, table, columns, keyset, index='', limit=0,
 
         :rtype: :class:`~google.cloud.spanner.streamed.StreamedResultSet`
         :returns: a result set instance which can be used to consume rows.
+        :raises: ValueError for reuse of single-use snapshots, or if a
+                 transaction ID is pending for multiple-use snapshots.
         """
+        if self._read_request_count > 0:
+            if not self._multi_use:
+                raise ValueError("Cannot re-use single-use snapshot.")
+            if self._transaction_id is None:
+                raise ValueError("Transaction ID pending.")
+
         database = self._session._database
         api = database.spanner_api
         options = _options_with_prefix(database.name)
@@ -81,7 +93,12 @@ def read(self, table, columns, keyset, index='', limit=0,
             transaction=transaction, index=index, limit=limit,
             resume_token=resume_token, options=options)
 
-        return StreamedResultSet(iterator)
+        self._read_request_count += 1
+
+        if self._multi_use:
+            return StreamedResultSet(iterator, source=self)
+        else:
+            return StreamedResultSet(iterator)
 
     def execute_sql(self, sql, params=None, param_types=None, query_mode=None,
                     resume_token=b''):
@@ -109,7 +126,15 @@ def execute_sql(self, sql, params=None, param_types=None, query_mode=None,
 
         :rtype: :class:`~google.cloud.spanner.streamed.StreamedResultSet`
         :returns: a result set instance which can be used to consume rows.
+        :raises: ValueError for reuse of single-use snapshots, or if a
+                 transaction ID is pending for multiple-use snapshots.
         """
+        if self._read_request_count > 0:
+            if not self._multi_use:
+                raise ValueError("Cannot re-use single-use snapshot.")
+            if self._transaction_id is None:
+                raise ValueError("Transaction ID pending.")
+
         if params is not None:
             if param_types is None:
                 raise ValueError(
@@ -128,7 +153,12 @@ def execute_sql(self, sql, params=None, param_types=None, query_mode=None,
             transaction=transaction, params=params_pb, param_types=param_types,
             query_mode=query_mode, resume_token=resume_token, options=options)
 
-        return StreamedResultSet(iterator)
+        self._read_request_count += 1
+
+        if self._multi_use:
+            return StreamedResultSet(iterator, source=self)
+        else:
+            return StreamedResultSet(iterator)
 
 
 class Snapshot(_SnapshotBase):
@@ -157,9 +187,16 @@ class Snapshot(_SnapshotBase):
     :type exact_staleness: :class:`datetime.timedelta`
     :param exact_staleness: Execute all reads at a timestamp that is
                             ``exact_staleness`` old.
+
+    :type multi_use: :class:`bool`
+    :param multi_use: If true, multipl :meth:`read` / :meth:`execute_sql`
+                      calls can be performed with the snapshot in the
+                      context of a read-only transaction, used to ensure
+                      isolation / consistency. Incompatible with
+                      ``max_staleness`` and ``min_read_timestamp``.
     """
     def __init__(self, session, read_timestamp=None, min_read_timestamp=None,
-                 max_staleness=None, exact_staleness=None):
+                 max_staleness=None, exact_staleness=None, multi_use=False):
         super(Snapshot, self).__init__(session)
         opts = [
             read_timestamp, min_read_timestamp, max_staleness, exact_staleness]
@@ -168,14 +205,24 @@ def __init__(self, session, read_timestamp=None, min_read_timestamp=None,
         if len(flagged) > 1:
             raise ValueError("Supply zero or one options.")
 
+        if multi_use:
+            if min_read_timestamp is not None or max_staleness is not None:
+                raise ValueError(
+                    "'multi_use' is incompatible with "
+                    "'min_read_timestamp' / 'max_staleness'")
+
         self._strong = len(flagged) == 0
         self._read_timestamp = read_timestamp
         self._min_read_timestamp = min_read_timestamp
         self._max_staleness = max_staleness
         self._exact_staleness = exact_staleness
+        self._multi_use = multi_use
 
     def _make_txn_selector(self):
         """Helper for :meth:`read`."""
+        if self._transaction_id is not None:
+            return TransactionSelector(id=self._transaction_id)
+
         if self._read_timestamp:
             key = 'read_timestamp'
             value = _datetime_to_pb_timestamp(self._read_timestamp)
@@ -194,4 +241,34 @@ def _make_txn_selector(self):
 
         options = TransactionOptions(
             read_only=TransactionOptions.ReadOnly(**{key: value}))
-        return TransactionSelector(single_use=options)
+
+        if self._multi_use:
+            return TransactionSelector(begin=options)
+        else:
+            return TransactionSelector(single_use=options)
+
+    def begin(self):
+        """Begin a transaction on the database.
+
+        :rtype: bytes
+        :returns: the ID for the newly-begun transaction.
+        :raises: ValueError if the transaction is already begun, committed,
+                 or rolled back.
+        """
+        if not self._multi_use:
+            raise ValueError("Cannot call 'begin' single-use snapshots")
+
+        if self._transaction_id is not None:
+            raise ValueError("Read-only transaction already begun")
+
+        if self._read_request_count > 0:
+            raise ValueError("Read-only transaction already pending")
+
+        database = self._session._database
+        api = database.spanner_api
+        options = _options_with_prefix(database.name)
+        txn_selector = self._make_txn_selector()
+        response = api.begin_transaction(
+            self._session.name, txn_selector.begin, options=options)
+        self._transaction_id = response.id
+        return self._transaction_id
diff --git a/spanner/google/cloud/spanner/streamed.py b/spanner/google/cloud/spanner/streamed.py
index 19333844b1c1a..7aa0ca43156ec 100644
--- a/spanner/google/cloud/spanner/streamed.py
+++ b/spanner/google/cloud/spanner/streamed.py
@@ -32,8 +32,11 @@ class StreamedResultSet(object):
         Iterator yielding
         :class:`google.cloud.proto.spanner.v1.result_set_pb2.PartialResultSet`
         instances.
+
+    :type source: :class:`~google.cloud.spanner.snapshot.Snapshot`
+    :param source: Snapshot from which the result set was fetched.
     """
-    def __init__(self, response_iterator):
+    def __init__(self, response_iterator, source=None):
         self._response_iterator = response_iterator
         self._rows = []             # Fully-processed rows
         self._counter = 0           # Counter for processed responses
@@ -42,6 +45,7 @@ def __init__(self, response_iterator):
         self._resume_token = None   # To resume from last received PRS
         self._current_row = []      # Accumulated values for incomplete row
         self._pending_chunk = None  # Incomplete value
+        self._source = source       # Source snapshot
 
     @property
     def rows(self):
@@ -130,7 +134,11 @@ def consume_next(self):
         self._resume_token = response.resume_token
 
         if self._metadata is None:  # first response
-            self._metadata = response.metadata
+            metadata = self._metadata = response.metadata
+
+            source = self._source
+            if source is not None and source._transaction_id is None:
+                source._transaction_id = metadata.transaction.id
 
         if response.HasField('stats'):  # last response
             self._stats = response.stats
diff --git a/spanner/google/cloud/spanner/transaction.py b/spanner/google/cloud/spanner/transaction.py
index 7c0272d411324..598fb0c304078 100644
--- a/spanner/google/cloud/spanner/transaction.py
+++ b/spanner/google/cloud/spanner/transaction.py
@@ -27,11 +27,8 @@ class Transaction(_SnapshotBase, _BatchBase):
     """Implement read-write transaction semantics for a session."""
     committed = None
     """Timestamp at which the transaction was successfully committed."""
-
-    def __init__(self, session):
-        super(Transaction, self).__init__(session)
-        self._id = None
-        self._rolled_back = False
+    _rolled_back = False
+    _multi_use = True
 
     def _check_state(self):
         """Helper for :meth:`commit` et al.
@@ -39,7 +36,7 @@ def _check_state(self):
         :raises: :exc:`ValueError` if the object's state is invalid for making
                  API requests.
         """
-        if self._id is None:
+        if self._transaction_id is None:
             raise ValueError("Transaction is not begun")
 
         if self.committed is not None:
@@ -56,7 +53,7 @@ def _make_txn_selector(self):
         :returns: a selector configured for read-write transaction semantics.
         """
         self._check_state()
-        return TransactionSelector(id=self._id)
+        return TransactionSelector(id=self._transaction_id)
 
     def begin(self):
         """Begin a transaction on the database.
@@ -66,7 +63,7 @@ def begin(self):
         :raises: ValueError if the transaction is already begun, committed,
                  or rolled back.
         """
-        if self._id is not None:
+        if self._transaction_id is not None:
             raise ValueError("Transaction already begun")
 
         if self.committed is not None:
@@ -82,8 +79,8 @@ def begin(self):
             read_write=TransactionOptions.ReadWrite())
         response = api.begin_transaction(
             self._session.name, txn_options, options=options)
-        self._id = response.id
-        return self._id
+        self._transaction_id = response.id
+        return self._transaction_id
 
     def rollback(self):
         """Roll back a transaction on the database."""
@@ -91,7 +88,7 @@ def rollback(self):
         database = self._session._database
         api = database.spanner_api
         options = _options_with_prefix(database.name)
-        api.rollback(self._session.name, self._id, options=options)
+        api.rollback(self._session.name, self._transaction_id, options=options)
         self._rolled_back = True
         del self._session._transaction
 
@@ -112,7 +109,7 @@ def commit(self):
         options = _options_with_prefix(database.name)
         response = api.commit(
             self._session.name, self._mutations,
-            transaction_id=self._id, options=options)
+            transaction_id=self._transaction_id, options=options)
         self.committed = _pb_timestamp_to_datetime(
             response.commit_timestamp)
         del self._session._transaction
diff --git a/spanner/tests/system/test_system.py b/spanner/tests/system/test_system.py
index b2f83ce9fa1de..f5d15d715ed51 100644
--- a/spanner/tests/system/test_system.py
+++ b/spanner/tests/system/test_system.py
@@ -18,6 +18,7 @@
 import os
 import struct
 import threading
+import time
 import unittest
 
 from google.cloud.proto.spanner.v1.type_pb2 import ARRAY
@@ -687,6 +688,56 @@ def test_snapshot_read_w_various_staleness(self):
         rows = list(strong.read(self.TABLE, self.COLUMNS, self.ALL))
         self._check_row_data(rows, all_data_rows)
 
+    def test_multiuse_snapshot_read_isolation_strong(self):
+        ROW_COUNT = 40
+        session, committed = self._set_up_table(ROW_COUNT)
+        all_data_rows = list(self._row_data(ROW_COUNT))
+        strong = session.snapshot(multi_use=True)
+
+        before = list(strong.read(self.TABLE, self.COLUMNS, self.ALL))
+        self._check_row_data(before, all_data_rows)
+
+        with self._db.batch() as batch:
+            batch.delete(self.TABLE, self.ALL)
+
+        after = list(strong.read(self.TABLE, self.COLUMNS, self.ALL))
+        self._check_row_data(after, all_data_rows)
+
+    def test_multiuse_snapshot_read_isolation_read_timestamp(self):
+        ROW_COUNT = 40
+        session, committed = self._set_up_table(ROW_COUNT)
+        all_data_rows = list(self._row_data(ROW_COUNT))
+        read_ts = session.snapshot(read_timestamp=committed, multi_use=True)
+
+        before = list(read_ts.read(self.TABLE, self.COLUMNS, self.ALL))
+        self._check_row_data(before, all_data_rows)
+
+        with self._db.batch() as batch:
+            batch.delete(self.TABLE, self.ALL)
+
+        after = list(read_ts.read(self.TABLE, self.COLUMNS, self.ALL))
+        self._check_row_data(after, all_data_rows)
+
+    def test_multiuse_snapshot_read_isolation_exact_staleness(self):
+        ROW_COUNT = 40
+
+        session, committed = self._set_up_table(ROW_COUNT)
+        all_data_rows = list(self._row_data(ROW_COUNT))
+
+        time.sleep(1)
+        delta = datetime.timedelta(microseconds=1000)
+
+        exact = session.snapshot(exact_staleness=delta, multi_use=True)
+
+        before = list(exact.read(self.TABLE, self.COLUMNS, self.ALL))
+        self._check_row_data(before, all_data_rows)
+
+        with self._db.batch() as batch:
+            batch.delete(self.TABLE, self.ALL)
+
+        after = list(exact.read(self.TABLE, self.COLUMNS, self.ALL))
+        self._check_row_data(after, all_data_rows)
+
     def test_read_w_manual_consume(self):
         ROW_COUNT = 4000
         session, committed = self._set_up_table(ROW_COUNT)
@@ -778,7 +829,7 @@ def test_read_w_ranges(self):
         START = 1000
         END = 2000
         session, committed = self._set_up_table(ROW_COUNT)
-        snapshot = session.snapshot(read_timestamp=committed)
+        snapshot = session.snapshot(read_timestamp=committed, multi_use=True)
         all_data_rows = list(self._row_data(ROW_COUNT))
 
         closed_closed = KeyRange(start_closed=[START], end_closed=[END])
@@ -836,6 +887,22 @@ def _check_sql_results(self, snapshot, sql, params, param_types, expected):
             sql, params=params, param_types=param_types))
         self._check_row_data(rows, expected=expected)
 
+    def test_multiuse_snapshot_execute_sql_isolation_strong(self):
+        ROW_COUNT = 40
+        SQL = 'SELECT * FROM {}'.format(self.TABLE)
+        session, committed = self._set_up_table(ROW_COUNT)
+        all_data_rows = list(self._row_data(ROW_COUNT))
+        strong = session.snapshot(multi_use=True)
+
+        before = list(strong.execute_sql(SQL))
+        self._check_row_data(before, all_data_rows)
+
+        with self._db.batch() as batch:
+            batch.delete(self.TABLE, self.ALL)
+
+        after = list(strong.execute_sql(SQL))
+        self._check_row_data(after, all_data_rows)
+
     def test_execute_sql_returning_array_of_struct(self):
         SQL = (
             "SELECT ARRAY(SELECT AS STRUCT C1, C2 "
@@ -868,7 +935,8 @@ def test_execute_sql_w_query_param(self):
                 self.ALL_TYPES_COLUMNS,
                 self.ALL_TYPES_ROWDATA)
 
-        snapshot = session.snapshot(read_timestamp=batch.committed)
+        snapshot = session.snapshot(
+            read_timestamp=batch.committed, multi_use=True)
 
         # Cannot equality-test array values.  See below for a test w/
         # array of IDs.
diff --git a/spanner/tests/unit/test_database.py b/spanner/tests/unit/test_database.py
index 6216d8a348fd9..aa1643ed75824 100644
--- a/spanner/tests/unit/test_database.py
+++ b/spanner/tests/unit/test_database.py
@@ -682,12 +682,9 @@ def test_snapshot_defaults(self):
         checkout = database.snapshot()
         self.assertIsInstance(checkout, SnapshotCheckout)
         self.assertIs(checkout._database, database)
-        self.assertIsNone(checkout._read_timestamp)
-        self.assertIsNone(checkout._min_read_timestamp)
-        self.assertIsNone(checkout._max_staleness)
-        self.assertIsNone(checkout._exact_staleness)
+        self.assertEqual(checkout._kw, {})
 
-    def test_snapshot_w_read_timestamp(self):
+    def test_snapshot_w_read_timestamp_and_multi_use(self):
         import datetime
         from google.cloud._helpers import UTC
         from google.cloud.spanner.database import SnapshotCheckout
@@ -700,78 +697,12 @@ def test_snapshot_w_read_timestamp(self):
         pool.put(session)
         database = self._make_one(self.DATABASE_ID, instance, pool=pool)
 
-        checkout = database.snapshot(read_timestamp=now)
+        checkout = database.snapshot(read_timestamp=now, multi_use=True)
 
         self.assertIsInstance(checkout, SnapshotCheckout)
         self.assertIs(checkout._database, database)
-        self.assertEqual(checkout._read_timestamp, now)
-        self.assertIsNone(checkout._min_read_timestamp)
-        self.assertIsNone(checkout._max_staleness)
-        self.assertIsNone(checkout._exact_staleness)
-
-    def test_snapshot_w_min_read_timestamp(self):
-        import datetime
-        from google.cloud._helpers import UTC
-        from google.cloud.spanner.database import SnapshotCheckout
-
-        now = datetime.datetime.utcnow().replace(tzinfo=UTC)
-        client = _Client()
-        instance = _Instance(self.INSTANCE_NAME, client=client)
-        pool = _Pool()
-        session = _Session()
-        pool.put(session)
-        database = self._make_one(self.DATABASE_ID, instance, pool=pool)
-
-        checkout = database.snapshot(min_read_timestamp=now)
-
-        self.assertIsInstance(checkout, SnapshotCheckout)
-        self.assertIs(checkout._database, database)
-        self.assertIsNone(checkout._read_timestamp)
-        self.assertEqual(checkout._min_read_timestamp, now)
-        self.assertIsNone(checkout._max_staleness)
-        self.assertIsNone(checkout._exact_staleness)
-
-    def test_snapshot_w_max_staleness(self):
-        import datetime
-        from google.cloud.spanner.database import SnapshotCheckout
-
-        staleness = datetime.timedelta(seconds=1, microseconds=234567)
-        client = _Client()
-        instance = _Instance(self.INSTANCE_NAME, client=client)
-        pool = _Pool()
-        session = _Session()
-        pool.put(session)
-        database = self._make_one(self.DATABASE_ID, instance, pool=pool)
-
-        checkout = database.snapshot(max_staleness=staleness)
-
-        self.assertIsInstance(checkout, SnapshotCheckout)
-        self.assertIs(checkout._database, database)
-        self.assertIsNone(checkout._read_timestamp)
-        self.assertIsNone(checkout._min_read_timestamp)
-        self.assertEqual(checkout._max_staleness, staleness)
-        self.assertIsNone(checkout._exact_staleness)
-
-    def test_snapshot_w_exact_staleness(self):
-        import datetime
-        from google.cloud.spanner.database import SnapshotCheckout
-
-        staleness = datetime.timedelta(seconds=1, microseconds=234567)
-        client = _Client()
-        instance = _Instance(self.INSTANCE_NAME, client=client)
-        pool = _Pool()
-        session = _Session()
-        pool.put(session)
-        database = self._make_one(self.DATABASE_ID, instance, pool=pool)
-
-        checkout = database.snapshot(exact_staleness=staleness)
-
-        self.assertIsInstance(checkout, SnapshotCheckout)
-        self.assertIs(checkout._database, database)
-        self.assertIsNone(checkout._read_timestamp)
-        self.assertIsNone(checkout._min_read_timestamp)
-        self.assertIsNone(checkout._max_staleness)
-        self.assertEqual(checkout._exact_staleness, staleness)
+        self.assertEqual(
+            checkout._kw, {'read_timestamp': now, 'multi_use': True})
 
 
 class TestBatchCheckout(_BaseTest):
@@ -862,20 +793,18 @@ def test_ctor_defaults(self):
 
         checkout = self._make_one(database)
         self.assertIs(checkout._database, database)
-        self.assertIsNone(checkout._read_timestamp)
-        self.assertIsNone(checkout._min_read_timestamp)
-        self.assertIsNone(checkout._max_staleness)
-        self.assertIsNone(checkout._exact_staleness)
+        self.assertEqual(checkout._kw, {})
 
         with checkout as snapshot:
             self.assertIsNone(pool._session)
             self.assertIsInstance(snapshot, Snapshot)
             self.assertIs(snapshot._session, session)
             self.assertTrue(snapshot._strong)
+            self.assertFalse(snapshot._multi_use)
 
         self.assertIs(pool._session, session)
 
-    def test_ctor_w_read_timestamp(self):
+    def test_ctor_w_read_timestamp_and_multi_use(self):
         import datetime
         from google.cloud._helpers import UTC
         from google.cloud.spanner.snapshot import Snapshot
@@ -886,99 +815,17 @@ def test_ctor_w_read_timestamp(self):
         pool = database._pool = _Pool()
         pool.put(session)
 
-        checkout = self._make_one(database, read_timestamp=now)
+        checkout = self._make_one(database, read_timestamp=now, multi_use=True)
         self.assertIs(checkout._database, database)
-        self.assertEqual(checkout._read_timestamp, now)
-        self.assertIsNone(checkout._min_read_timestamp)
-        self.assertIsNone(checkout._max_staleness)
-        self.assertIsNone(checkout._exact_staleness)
+        self.assertEqual(checkout._kw,
+                         {'read_timestamp': now, 'multi_use': True})
 
         with checkout as snapshot:
             self.assertIsNone(pool._session)
             self.assertIsInstance(snapshot, Snapshot)
             self.assertIs(snapshot._session, session)
-            self.assertFalse(snapshot._strong)
             self.assertEqual(snapshot._read_timestamp, now)
-
-        self.assertIs(pool._session, session)
-
-    def test_ctor_w_min_read_timestamp(self):
-        import datetime
-        from google.cloud._helpers import UTC
-        from google.cloud.spanner.snapshot import Snapshot
-
-        now = datetime.datetime.utcnow().replace(tzinfo=UTC)
-        database = _Database(self.DATABASE_NAME)
-        session = _Session(database)
-        pool = database._pool = _Pool()
-        pool.put(session)
-
-        checkout = self._make_one(database, min_read_timestamp=now)
-        self.assertIs(checkout._database, database)
-        self.assertIsNone(checkout._read_timestamp)
-        self.assertEqual(checkout._min_read_timestamp, now)
-        self.assertIsNone(checkout._max_staleness)
-        self.assertIsNone(checkout._exact_staleness)
-
-        with checkout as snapshot:
-            self.assertIsNone(pool._session)
-            self.assertIsInstance(snapshot, Snapshot)
-            self.assertIs(snapshot._session, session)
-            self.assertFalse(snapshot._strong)
-            self.assertEqual(snapshot._min_read_timestamp, now)
-
-        self.assertIs(pool._session, session)
-
-    def test_ctor_w_max_staleness(self):
-        import datetime
-        from google.cloud.spanner.snapshot import Snapshot
-
-        staleness = datetime.timedelta(seconds=1, microseconds=234567)
-        database = _Database(self.DATABASE_NAME)
-        session = _Session(database)
-        pool = database._pool = _Pool()
-        pool.put(session)
-
-        checkout = self._make_one(database, max_staleness=staleness)
-        self.assertIs(checkout._database, database)
-        self.assertIsNone(checkout._read_timestamp)
-        self.assertIsNone(checkout._min_read_timestamp)
-        self.assertEqual(checkout._max_staleness, staleness)
-        self.assertIsNone(checkout._exact_staleness)
-
-        with checkout as snapshot:
-            self.assertIsNone(pool._session)
-            self.assertIsInstance(snapshot, Snapshot)
-            self.assertIs(snapshot._session, session)
-            self.assertFalse(snapshot._strong)
-            self.assertEqual(snapshot._max_staleness, staleness)
-
-        self.assertIs(pool._session, session)
-
-    def test_ctor_w_exact_staleness(self):
-        import datetime
-        from google.cloud.spanner.snapshot import Snapshot
-
-        staleness = datetime.timedelta(seconds=1, microseconds=234567)
-        database = _Database(self.DATABASE_NAME)
-        session = _Session(database)
-        pool = database._pool = _Pool()
-        pool.put(session)
-
-        checkout = self._make_one(database, exact_staleness=staleness)
-
-        self.assertIs(checkout._database, database)
-        self.assertIsNone(checkout._read_timestamp)
-        self.assertIsNone(checkout._min_read_timestamp)
-        self.assertIsNone(checkout._max_staleness)
-        self.assertEqual(checkout._exact_staleness, staleness)
-
-        with checkout as snapshot:
-            self.assertIsNone(pool._session)
-            self.assertIsInstance(snapshot, Snapshot)
-            self.assertIs(snapshot._session, session)
-            self.assertFalse(snapshot._strong)
-            self.assertEqual(snapshot._exact_staleness, staleness)
+            self.assertTrue(snapshot._multi_use)
 
         self.assertIs(pool._session, session)
 
diff --git a/spanner/tests/unit/test_session.py b/spanner/tests/unit/test_session.py
index ce9f81eccc7a5..100555c8e49f8 100644
--- a/spanner/tests/unit/test_session.py
+++ b/spanner/tests/unit/test_session.py
@@ -225,6 +225,21 @@ def test_snapshot_created(self):
         self.assertIsInstance(snapshot, Snapshot)
         self.assertIs(snapshot._session, session)
         self.assertTrue(snapshot._strong)
+        self.assertFalse(snapshot._multi_use)
+
+    def test_snapshot_created_w_multi_use(self):
+        from google.cloud.spanner.snapshot import Snapshot
+
+        database = _Database(self.DATABASE_NAME)
+        session = self._make_one(database)
+        session._session_id = 'DEADBEEF'  # emulate 'session.create()'
+
+        snapshot = session.snapshot(multi_use=True)
+
+        self.assertIsInstance(snapshot, Snapshot)
+        self.assertTrue(snapshot._session is session)
+        self.assertTrue(snapshot._strong)
+        self.assertTrue(snapshot._multi_use)
 
     def test_read_not_created(self):
         from google.cloud.spanner.keyset import KeySet
@@ -403,7 +418,7 @@ def test_retry_transaction_w_commit_error_txn_already_begun(self):
         session = self._make_one(database)
         session._session_id = 'DEADBEEF'
         begun_txn = session._transaction = Transaction(session)
-        begun_txn._id = b'FACEDACE'
+        begun_txn._transaction_id = b'FACEDACE'
 
         called_with = []
 
diff --git a/spanner/tests/unit/test_snapshot.py b/spanner/tests/unit/test_snapshot.py
index c5213dbd6cdad..4717a14c2f24c 100644
--- a/spanner/tests/unit/test_snapshot.py
+++ b/spanner/tests/unit/test_snapshot.py
@@ -53,12 +53,19 @@ def _makeDerived(self, session):
 
         class _Derived(self._getTargetClass()):
 
+            _transaction_id = None
+            _multi_use = False
+
             def _make_txn_selector(self):
                 from google.cloud.proto.spanner.v1.transaction_pb2 import (
                     TransactionOptions, TransactionSelector)
 
+                if self._transaction_id:
+                    return TransactionSelector(id=self._transaction_id)
                 options = TransactionOptions(
                     read_only=TransactionOptions.ReadOnly(strong=True))
+                if self._multi_use:
+                    return TransactionSelector(begin=options)
                 return TransactionSelector(single_use=options)
 
         return _Derived(session)
@@ -105,7 +112,7 @@ def test_read_grpc_error(self):
         self.assertEqual(options.kwargs['metadata'],
                          [('google-cloud-resource-prefix', database.name)])
 
-    def test_read_normal(self):
+    def _read_helper(self, multi_use, first=True, count=0):
         from google.protobuf.struct_pb2 import Struct
         from google.cloud.proto.spanner.v1.result_set_pb2 import (
             PartialResultSet, ResultSetMetadata, ResultSetStats)
@@ -116,6 +123,7 @@ def test_read_normal(self):
         from google.cloud.spanner.keyset import KeySet
         from google.cloud.spanner._helpers import _make_value_pb
 
+        TXN_ID = b'DEADBEEF'
         VALUES = [
             [u'bharney', 31],
             [u'phred', 32],
@@ -147,11 +155,22 @@ def test_read_normal(self):
             _streaming_read_response=_MockCancellableIterator(*result_sets))
         session = _Session(database)
         derived = self._makeDerived(session)
+        derived._multi_use = multi_use
+        derived._read_request_count = count
+        if not first:
+            derived._transaction_id = TXN_ID
 
         result_set = derived.read(
             TABLE_NAME, COLUMNS, KEYSET,
             index=INDEX, limit=LIMIT, resume_token=TOKEN)
 
+        self.assertEqual(derived._read_request_count, count + 1)
+
+        if multi_use:
+            self.assertIs(result_set._source, derived)
+        else:
+            self.assertIsNone(result_set._source)
+
         result_set.consume_all()
         self.assertEqual(list(result_set.rows), VALUES)
         self.assertEqual(result_set.metadata, metadata_pb)
@@ -165,13 +184,39 @@ def test_read_normal(self):
         self.assertEqual(columns, COLUMNS)
         self.assertEqual(key_set, KEYSET.to_pb())
         self.assertIsInstance(transaction, TransactionSelector)
-        self.assertTrue(transaction.single_use.read_only.strong)
+        if multi_use:
+            if first:
+                self.assertTrue(transaction.begin.read_only.strong)
+            else:
+                self.assertEqual(transaction.id, TXN_ID)
+        else:
+            self.assertTrue(transaction.single_use.read_only.strong)
         self.assertEqual(index, INDEX)
         self.assertEqual(limit, LIMIT)
         self.assertEqual(resume_token, TOKEN)
         self.assertEqual(options.kwargs['metadata'],
                          [('google-cloud-resource-prefix', database.name)])
 
+    def test_read_wo_multi_use(self):
+        self._read_helper(multi_use=False)
+
+    def test_read_wo_multi_use_w_read_request_count_gt_0(self):
+        with self.assertRaises(ValueError):
+            self._read_helper(multi_use=False, count=1)
+
+    def test_read_w_multi_use_wo_first(self):
+        self._read_helper(multi_use=True, first=False)
+
+    def test_read_w_multi_use_wo_first_w_count_gt_0(self):
+        self._read_helper(multi_use=True, first=False, count=1)
+
+    def test_read_w_multi_use_w_first(self):
+        self._read_helper(multi_use=True, first=True)
+
+    def test_read_w_multi_use_w_first_w_count_gt_0(self):
+        with self.assertRaises(ValueError):
+            self._read_helper(multi_use=True, first=True, count=1)
+
     def test_execute_sql_grpc_error(self):
         from google.cloud.proto.spanner.v1.transaction_pb2 import (
             TransactionSelector)
@@ -208,7 +253,7 @@ def test_execute_sql_w_params_wo_param_types(self):
         with self.assertRaises(ValueError):
             derived.execute_sql(SQL_QUERY_WITH_PARAM, PARAMS)
 
-    def test_execute_sql_normal(self):
+    def _execute_sql_helper(self, multi_use, first=True, count=0):
         from google.protobuf.struct_pb2 import Struct
         from google.cloud.proto.spanner.v1.result_set_pb2 import (
             PartialResultSet, ResultSetMetadata, ResultSetStats)
@@ -218,6 +263,7 @@ def test_execute_sql_normal(self):
         from google.cloud.proto.spanner.v1.type_pb2 import STRING, INT64
         from google.cloud.spanner._helpers import _make_value_pb
 
+        TXN_ID = b'DEADBEEF'
         VALUES = [
             [u'bharney', u'rhubbyl', 31],
             [u'phred', u'phlyntstone', 32],
@@ -248,11 +294,22 @@ def test_execute_sql_normal(self):
             _execute_streaming_sql_response=iterator)
         session = _Session(database)
         derived = self._makeDerived(session)
+        derived._multi_use = multi_use
+        derived._read_request_count = count
+        if not first:
+            derived._transaction_id = TXN_ID
 
         result_set = derived.execute_sql(
             SQL_QUERY_WITH_PARAM, PARAMS, PARAM_TYPES,
             query_mode=MODE, resume_token=TOKEN)
 
+        self.assertEqual(derived._read_request_count, count + 1)
+
+        if multi_use:
+            self.assertIs(result_set._source, derived)
+        else:
+            self.assertIsNone(result_set._source)
+
         result_set.consume_all()
         self.assertEqual(list(result_set.rows), VALUES)
         self.assertEqual(result_set.metadata, metadata_pb)
@@ -264,7 +321,13 @@ def test_execute_sql_normal(self):
         self.assertEqual(r_session, self.SESSION_NAME)
         self.assertEqual(sql, SQL_QUERY_WITH_PARAM)
         self.assertIsInstance(transaction, TransactionSelector)
-        self.assertTrue(transaction.single_use.read_only.strong)
+        if multi_use:
+            if first:
+                self.assertTrue(transaction.begin.read_only.strong)
+            else:
+                self.assertEqual(transaction.id, TXN_ID)
+        else:
+            self.assertTrue(transaction.single_use.read_only.strong)
         expected_params = Struct(fields={
             key: _make_value_pb(value) for (key, value) in PARAMS.items()})
         self.assertEqual(params, expected_params)
@@ -274,6 +337,26 @@ def test_execute_sql_normal(self):
         self.assertEqual(options.kwargs['metadata'],
                          [('google-cloud-resource-prefix', database.name)])
 
+    def test_execute_sql_wo_multi_use(self):
+        self._execute_sql_helper(multi_use=False)
+
+    def test_execute_sql_wo_multi_use_w_read_request_count_gt_0(self):
+        with self.assertRaises(ValueError):
+            self._execute_sql_helper(multi_use=False, count=1)
+
+    def test_execute_sql_w_multi_use_wo_first(self):
+        self._execute_sql_helper(multi_use=True, first=False)
+
+    def test_execute_sql_w_multi_use_wo_first_w_count_gt_0(self):
+        self._execute_sql_helper(multi_use=True, first=False, count=1)
+
+    def test_execute_sql_w_multi_use_w_first(self):
+        self._execute_sql_helper(multi_use=True, first=True)
+
+    def test_execute_sql_w_multi_use_w_first_w_count_gt_0(self):
+        with self.assertRaises(ValueError):
+            self._execute_sql_helper(multi_use=True, first=True, count=1)
+
 
 class _MockCancellableIterator(object):
 
@@ -298,6 +381,7 @@ class TestSnapshot(unittest.TestCase):
     DATABASE_NAME = INSTANCE_NAME + '/databases/' + DATABASE_ID
     SESSION_ID = 'session-id'
     SESSION_NAME = DATABASE_NAME + '/sessions/' + SESSION_ID
+    TRANSACTION_ID = b'DEADBEEF'
 
     def _getTargetClass(self):
         from google.cloud.spanner.snapshot import Snapshot
@@ -326,6 +410,7 @@ def test_ctor_defaults(self):
         self.assertIsNone(snapshot._min_read_timestamp)
         self.assertIsNone(snapshot._max_staleness)
         self.assertIsNone(snapshot._exact_staleness)
+        self.assertFalse(snapshot._multi_use)
 
     def test_ctor_w_multiple_options(self):
         timestamp = self._makeTimestamp()
@@ -346,6 +431,7 @@ def test_ctor_w_read_timestamp(self):
         self.assertIsNone(snapshot._min_read_timestamp)
         self.assertIsNone(snapshot._max_staleness)
         self.assertIsNone(snapshot._exact_staleness)
+        self.assertFalse(snapshot._multi_use)
 
     def test_ctor_w_min_read_timestamp(self):
         timestamp = self._makeTimestamp()
@@ -357,6 +443,7 @@ def test_ctor_w_min_read_timestamp(self):
         self.assertEqual(snapshot._min_read_timestamp, timestamp)
         self.assertIsNone(snapshot._max_staleness)
         self.assertIsNone(snapshot._exact_staleness)
+        self.assertFalse(snapshot._multi_use)
 
     def test_ctor_w_max_staleness(self):
         duration = self._makeDuration()
@@ -368,6 +455,7 @@ def test_ctor_w_max_staleness(self):
         self.assertIsNone(snapshot._min_read_timestamp)
         self.assertEqual(snapshot._max_staleness, duration)
         self.assertIsNone(snapshot._exact_staleness)
+        self.assertFalse(snapshot._multi_use)
 
     def test_ctor_w_exact_staleness(self):
         duration = self._makeDuration()
@@ -379,6 +467,66 @@ def test_ctor_w_exact_staleness(self):
         self.assertIsNone(snapshot._min_read_timestamp)
         self.assertIsNone(snapshot._max_staleness)
         self.assertEqual(snapshot._exact_staleness, duration)
+        self.assertFalse(snapshot._multi_use)
+
+    def test_ctor_w_multi_use(self):
+        session = _Session()
+        snapshot = self._make_one(session, multi_use=True)
+        self.assertTrue(snapshot._session is session)
+        self.assertTrue(snapshot._strong)
+        self.assertIsNone(snapshot._read_timestamp)
+        self.assertIsNone(snapshot._min_read_timestamp)
+        self.assertIsNone(snapshot._max_staleness)
+        self.assertIsNone(snapshot._exact_staleness)
+        self.assertTrue(snapshot._multi_use)
+
+    def test_ctor_w_multi_use_and_read_timestamp(self):
+        timestamp = self._makeTimestamp()
+        session = _Session()
+        snapshot = self._make_one(
+            session, read_timestamp=timestamp, multi_use=True)
+        self.assertTrue(snapshot._session is session)
+        self.assertFalse(snapshot._strong)
+        self.assertEqual(snapshot._read_timestamp, timestamp)
+        self.assertIsNone(snapshot._min_read_timestamp)
+        self.assertIsNone(snapshot._max_staleness)
+        self.assertIsNone(snapshot._exact_staleness)
+        self.assertTrue(snapshot._multi_use)
+
+    def test_ctor_w_multi_use_and_min_read_timestamp(self):
+        timestamp = self._makeTimestamp()
+        session = _Session()
+
+        with self.assertRaises(ValueError):
+            self._make_one(
+                session, min_read_timestamp=timestamp, multi_use=True)
+
+    def test_ctor_w_multi_use_and_max_staleness(self):
+        duration = self._makeDuration()
+        session = _Session()
+
+        with self.assertRaises(ValueError):
+            self._make_one(session, max_staleness=duration, multi_use=True)
+
+    def test_ctor_w_multi_use_and_exact_staleness(self):
+        duration = self._makeDuration()
+        session = _Session()
+        snapshot = self._make_one(
+            session, exact_staleness=duration, multi_use=True)
+        self.assertTrue(snapshot._session is session)
+        self.assertFalse(snapshot._strong)
+        self.assertIsNone(snapshot._read_timestamp)
+        self.assertIsNone(snapshot._min_read_timestamp)
+        self.assertIsNone(snapshot._max_staleness)
+        self.assertEqual(snapshot._exact_staleness, duration)
+        self.assertTrue(snapshot._multi_use)
+
+    def test__make_txn_selector_w_transaction_id(self):
+        session = _Session()
+        snapshot = self._make_one(session)
+        snapshot._transaction_id = self.TRANSACTION_ID
+        selector = snapshot._make_txn_selector()
+        self.assertEqual(selector.id, self.TRANSACTION_ID)
 
     def test__make_txn_selector_strong(self):
         session = _Session()
@@ -429,6 +577,127 @@ def test__make_txn_selector_w_exact_staleness(self):
         self.assertEqual(options.read_only.exact_staleness.seconds, 3)
         self.assertEqual(options.read_only.exact_staleness.nanos, 123456000)
 
+    def test__make_txn_selector_strong_w_multi_use(self):
+        session = _Session()
+        snapshot = self._make_one(session, multi_use=True)
+        selector = snapshot._make_txn_selector()
+        options = selector.begin
+        self.assertTrue(options.read_only.strong)
+
+    def test__make_txn_selector_w_read_timestamp_w_multi_use(self):
+        from google.cloud._helpers import _pb_timestamp_to_datetime
+
+        timestamp = self._makeTimestamp()
+        session = _Session()
+        snapshot = self._make_one(
+            session, read_timestamp=timestamp, multi_use=True)
+        selector = snapshot._make_txn_selector()
+        options = selector.begin
+        self.assertEqual(
+            _pb_timestamp_to_datetime(options.read_only.read_timestamp),
+            timestamp)
+
+    def test__make_txn_selector_w_exact_staleness_w_multi_use(self):
+        duration = self._makeDuration(seconds=3, microseconds=123456)
+        session = _Session()
+        snapshot = self._make_one(
+            session, exact_staleness=duration, multi_use=True)
+        selector = snapshot._make_txn_selector()
+        options = selector.begin
+        self.assertEqual(options.read_only.exact_staleness.seconds, 3)
+        self.assertEqual(options.read_only.exact_staleness.nanos, 123456000)
+
+    def test_begin_wo_multi_use(self):
+        session = _Session()
+        snapshot = self._make_one(session)
+        with self.assertRaises(ValueError):
+            snapshot.begin()
+
+    def test_begin_w_read_request_count_gt_0(self):
+        session = _Session()
+        snapshot = self._make_one(session, multi_use=True)
+        snapshot._read_request_count = 1
+        with self.assertRaises(ValueError):
+            snapshot.begin()
+
+    def test_begin_w_existing_txn_id(self):
+        session = _Session()
+        snapshot = self._make_one(session, multi_use=True)
+        snapshot._transaction_id = self.TRANSACTION_ID
+        with self.assertRaises(ValueError):
+            snapshot.begin()
+
+    def test_begin_w_gax_error(self):
+        from google.gax.errors import GaxError
+        from google.cloud._helpers import _pb_timestamp_to_datetime
+
+        database = _Database()
+        api = database.spanner_api = _FauxSpannerAPI(
+            _random_gax_error=True)
+        timestamp = self._makeTimestamp()
+        session = _Session(database)
+        snapshot = self._make_one(
+            session, read_timestamp=timestamp, multi_use=True)
+
+        with self.assertRaises(GaxError):
+            snapshot.begin()
+
+        session_id, txn_options, options = api._begun
+        self.assertEqual(session_id, session.name)
+        self.assertEqual(
+            _pb_timestamp_to_datetime(txn_options.read_only.read_timestamp),
+            timestamp)
+        self.assertEqual(options.kwargs['metadata'],
+                         [('google-cloud-resource-prefix', database.name)])
+
+    def test_begin_ok_exact_staleness(self):
+        from google.cloud.proto.spanner.v1.transaction_pb2 import (
+            Transaction as TransactionPB)
+
+        transaction_pb = TransactionPB(id=self.TRANSACTION_ID)
+        database = _Database()
+        api = database.spanner_api = _FauxSpannerAPI(
+            _begin_transaction_response=transaction_pb)
+        duration = self._makeDuration(seconds=3, microseconds=123456)
+        session = _Session(database)
+        snapshot = self._make_one(
+            session, exact_staleness=duration, multi_use=True)
+
+        txn_id = snapshot.begin()
+
+        self.assertEqual(txn_id, self.TRANSACTION_ID)
+        self.assertEqual(snapshot._transaction_id, self.TRANSACTION_ID)
+
+        session_id, txn_options, options = api._begun
+        self.assertEqual(session_id, session.name)
+        read_only = txn_options.read_only
+        self.assertEqual(read_only.exact_staleness.seconds, 3)
+        self.assertEqual(read_only.exact_staleness.nanos, 123456000)
+        self.assertEqual(options.kwargs['metadata'],
+                         [('google-cloud-resource-prefix', database.name)])
+
+    def test_begin_ok_exact_strong(self):
+        from google.cloud.proto.spanner.v1.transaction_pb2 import (
+            Transaction as TransactionPB)
+
+        transaction_pb = TransactionPB(id=self.TRANSACTION_ID)
+        database = _Database()
+        api = database.spanner_api = _FauxSpannerAPI(
+            _begin_transaction_response=transaction_pb)
+        session = _Session(database)
+        snapshot = self._make_one(session, multi_use=True)
+
+        txn_id = snapshot.begin()
+
+        self.assertEqual(txn_id, self.TRANSACTION_ID)
+        self.assertEqual(snapshot._transaction_id, self.TRANSACTION_ID)
+
+        session_id, txn_options, options = api._begun
+        self.assertEqual(session_id, session.name)
+        self.assertTrue(txn_options.read_only.strong)
+        self.assertEqual(options.kwargs['metadata'],
+                         [('google-cloud-resource-prefix', database.name)])
+
 
 class _Session(object):
 
@@ -443,7 +712,15 @@ class _Database(object):
 
 class _FauxSpannerAPI(_GAXBaseAPI):
 
-    _read_with = None
+    _read_with = _begin = None
+
+    def begin_transaction(self, session, options_, options=None):
+        from google.gax.errors import GaxError
+
+        self._begun = (session, options_, options)
+        if self._random_gax_error:
+            raise GaxError('error')
+        return self._begin_transaction_response
 
     # pylint: disable=too-many-arguments
     def streaming_read(self, session, table, columns, key_set,
diff --git a/spanner/tests/unit/test_streamed.py b/spanner/tests/unit/test_streamed.py
index edcace273f660..2e31f4dfad2cf 100644
--- a/spanner/tests/unit/test_streamed.py
+++ b/spanner/tests/unit/test_streamed.py
@@ -15,6 +15,8 @@
 
 import unittest
 
+import mock
+
 
 class TestStreamedResultSet(unittest.TestCase):
 
@@ -30,6 +32,18 @@ def test_ctor_defaults(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         self.assertIs(streamed._response_iterator, iterator)
+        self.assertIsNone(streamed._source)
+        self.assertEqual(streamed.rows, [])
+        self.assertIsNone(streamed.metadata)
+        self.assertIsNone(streamed.stats)
+        self.assertIsNone(streamed.resume_token)
+
+    def test_ctor_w_source(self):
+        iterator = _MockCancellableIterator()
+        source = object()
+        streamed = self._make_one(iterator, source=source)
+        self.assertIs(streamed._response_iterator, iterator)
+        self.assertIs(streamed._source, source)
         self.assertEqual(streamed.rows, [])
         self.assertIsNone(streamed.metadata)
         self.assertIsNone(streamed.stats)
@@ -42,14 +56,14 @@ def test_fields_unset(self):
             _ = streamed.fields
 
     @staticmethod
-    def _makeScalarField(name, type_):
+    def _make_scalar_field(name, type_):
         from google.cloud.proto.spanner.v1.type_pb2 import StructType
         from google.cloud.proto.spanner.v1.type_pb2 import Type
 
         return StructType.Field(name=name, type=Type(code=type_))
 
     @staticmethod
-    def _makeArrayField(name, element_type_code=None, element_type=None):
+    def _make_array_field(name, element_type_code=None, element_type=None):
         from google.cloud.proto.spanner.v1.type_pb2 import StructType
         from google.cloud.proto.spanner.v1.type_pb2 import Type
 
@@ -60,7 +74,7 @@ def _makeArrayField(name, element_type_code=None, element_type=None):
         return StructType.Field(name=name, type=array_type)
 
     @staticmethod
-    def _makeStructType(struct_type_fields):
+    def _make_struct_type(struct_type_fields):
         from google.cloud.proto.spanner.v1.type_pb2 import StructType
         from google.cloud.proto.spanner.v1.type_pb2 import Type
 
@@ -72,13 +86,13 @@ def _makeStructType(struct_type_fields):
         return Type(code='STRUCT', struct_type=struct_type)
 
     @staticmethod
-    def _makeValue(value):
+    def _make_value(value):
         from google.cloud.spanner._helpers import _make_value_pb
 
         return _make_value_pb(value)
 
     @staticmethod
-    def _makeListValue(values=(), value_pbs=None):
+    def _make_list_value(values=(), value_pbs=None):
         from google.protobuf.struct_pb2 import ListValue
         from google.protobuf.struct_pb2 import Value
         from google.cloud.spanner._helpers import _make_list_value_pb
@@ -87,15 +101,52 @@ def _makeListValue(values=(), value_pbs=None):
             return Value(list_value=ListValue(values=value_pbs))
         return Value(list_value=_make_list_value_pb(values))
 
+    @staticmethod
+    def _make_result_set_metadata(fields=(), transaction_id=None):
+        from google.cloud.proto.spanner.v1.result_set_pb2 import (
+            ResultSetMetadata)
+        metadata = ResultSetMetadata()
+        for field in fields:
+            metadata.row_type.fields.add().CopyFrom(field)
+        if transaction_id is not None:
+            metadata.transaction.id = transaction_id
+        return metadata
+
+    @staticmethod
+    def _make_result_set_stats(query_plan=None, **kw):
+        from google.cloud.proto.spanner.v1.result_set_pb2 import (
+            ResultSetStats)
+        from google.protobuf.struct_pb2 import Struct
+        from google.cloud.spanner._helpers import _make_value_pb
+
+        query_stats = Struct(fields={
+            key: _make_value_pb(value) for key, value in kw.items()})
+        return ResultSetStats(
+            query_plan=query_plan,
+            query_stats=query_stats,
+        )
+
+    @staticmethod
+    def _make_partial_result_set(
+            values, metadata=None, stats=None, chunked_value=False):
+        from google.cloud.proto.spanner.v1.result_set_pb2 import (
+            PartialResultSet)
+        return PartialResultSet(
+            values=values,
+            metadata=metadata,
+            stats=stats,
+            chunked_value=chunked_value,
+        )
+
     def test_properties_set(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
         ]
-        metadata = streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        stats = streamed._stats = _ResultSetStatsPB()
+        metadata = streamed._metadata = self._make_result_set_metadata(FIELDS)
+        stats = streamed._stats = self._make_result_set_stats()
         self.assertEqual(list(streamed.fields), FIELDS)
         self.assertIs(streamed.metadata, metadata)
         self.assertIs(streamed.stats, stats)
@@ -106,11 +157,11 @@ def test__merge_chunk_bool(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('registered_voter', 'BOOL'),
+            self._make_scalar_field('registered_voter', 'BOOL'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        streamed._pending_chunk = self._makeValue(True)
-        chunk = self._makeValue(False)
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        streamed._pending_chunk = self._make_value(True)
+        chunk = self._make_value(False)
 
         with self.assertRaises(Unmergeable):
             streamed._merge_chunk(chunk)
@@ -119,11 +170,11 @@ def test__merge_chunk_int64(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('age', 'INT64'),
+            self._make_scalar_field('age', 'INT64'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        streamed._pending_chunk = self._makeValue(42)
-        chunk = self._makeValue(13)
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        streamed._pending_chunk = self._make_value(42)
+        chunk = self._make_value(13)
 
         merged = streamed._merge_chunk(chunk)
         self.assertEqual(merged.string_value, '4213')
@@ -133,11 +184,11 @@ def test__merge_chunk_float64_nan_string(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('weight', 'FLOAT64'),
+            self._make_scalar_field('weight', 'FLOAT64'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        streamed._pending_chunk = self._makeValue(u'Na')
-        chunk = self._makeValue(u'N')
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        streamed._pending_chunk = self._make_value(u'Na')
+        chunk = self._make_value(u'N')
 
         merged = streamed._merge_chunk(chunk)
         self.assertEqual(merged.string_value, u'NaN')
@@ -146,11 +197,11 @@ def test__merge_chunk_float64_w_empty(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('weight', 'FLOAT64'),
+            self._make_scalar_field('weight', 'FLOAT64'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        streamed._pending_chunk = self._makeValue(3.14159)
-        chunk = self._makeValue('')
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        streamed._pending_chunk = self._make_value(3.14159)
+        chunk = self._make_value('')
 
         merged = streamed._merge_chunk(chunk)
         self.assertEqual(merged.number_value, 3.14159)
@@ -161,11 +212,11 @@ def test__merge_chunk_float64_w_float64(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('weight', 'FLOAT64'),
+            self._make_scalar_field('weight', 'FLOAT64'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        streamed._pending_chunk = self._makeValue(3.14159)
-        chunk = self._makeValue(2.71828)
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        streamed._pending_chunk = self._make_value(3.14159)
+        chunk = self._make_value(2.71828)
 
         with self.assertRaises(Unmergeable):
             streamed._merge_chunk(chunk)
@@ -174,11 +225,11 @@ def test__merge_chunk_string(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('name', 'STRING'),
+            self._make_scalar_field('name', 'STRING'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        streamed._pending_chunk = self._makeValue(u'phred')
-        chunk = self._makeValue(u'wylma')
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        streamed._pending_chunk = self._make_value(u'phred')
+        chunk = self._make_value(u'wylma')
 
         merged = streamed._merge_chunk(chunk)
 
@@ -189,11 +240,11 @@ def test__merge_chunk_string_w_bytes(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('image', 'BYTES'),
+            self._make_scalar_field('image', 'BYTES'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        streamed._pending_chunk = self._makeValue(u'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA\n')
-        chunk = self._makeValue(u'B3RJTUUH4QQGFwsBTL3HMwAAABJpVFh0Q29tbWVudAAAAAAAU0FNUExFMG3E+AAAAApJREFUCNdj\nYAAAAAIAAeIhvDMAAAAASUVORK5CYII=\n')
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        streamed._pending_chunk = self._make_value(u'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA\n')
+        chunk = self._make_value(u'B3RJTUUH4QQGFwsBTL3HMwAAABJpVFh0Q29tbWVudAAAAAAAU0FNUExFMG3E+AAAAApJREFUCNdj\nYAAAAAIAAeIhvDMAAAAASUVORK5CYII=\n')
 
         merged = streamed._merge_chunk(chunk)
 
@@ -204,15 +255,15 @@ def test__merge_chunk_array_of_bool(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeArrayField('name', element_type_code='BOOL'),
+            self._make_array_field('name', element_type_code='BOOL'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        streamed._pending_chunk = self._makeListValue([True, True])
-        chunk = self._makeListValue([False, False, False])
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        streamed._pending_chunk = self._make_list_value([True, True])
+        chunk = self._make_list_value([False, False, False])
 
         merged = streamed._merge_chunk(chunk)
 
-        expected = self._makeListValue([True, True, False, False, False])
+        expected = self._make_list_value([True, True, False, False, False])
         self.assertEqual(merged, expected)
         self.assertIsNone(streamed._pending_chunk)
 
@@ -220,15 +271,15 @@ def test__merge_chunk_array_of_int(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeArrayField('name', element_type_code='INT64'),
+            self._make_array_field('name', element_type_code='INT64'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        streamed._pending_chunk = self._makeListValue([0, 1, 2])
-        chunk = self._makeListValue([3, 4, 5])
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        streamed._pending_chunk = self._make_list_value([0, 1, 2])
+        chunk = self._make_list_value([3, 4, 5])
 
         merged = streamed._merge_chunk(chunk)
 
-        expected = self._makeListValue([0, 1, 23, 4, 5])
+        expected = self._make_list_value([0, 1, 23, 4, 5])
         self.assertEqual(merged, expected)
         self.assertIsNone(streamed._pending_chunk)
 
@@ -242,15 +293,15 @@ def test__merge_chunk_array_of_float(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeArrayField('name', element_type_code='FLOAT64'),
+            self._make_array_field('name', element_type_code='FLOAT64'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        streamed._pending_chunk = self._makeListValue([PI, SQRT_2])
-        chunk = self._makeListValue(['', EULER, LOG_10])
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        streamed._pending_chunk = self._make_list_value([PI, SQRT_2])
+        chunk = self._make_list_value(['', EULER, LOG_10])
 
         merged = streamed._merge_chunk(chunk)
 
-        expected = self._makeListValue([PI, SQRT_2, EULER, LOG_10])
+        expected = self._make_list_value([PI, SQRT_2, EULER, LOG_10])
         self.assertEqual(merged, expected)
         self.assertIsNone(streamed._pending_chunk)
 
@@ -258,15 +309,15 @@ def test__merge_chunk_array_of_string(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeArrayField('name', element_type_code='STRING'),
+            self._make_array_field('name', element_type_code='STRING'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        streamed._pending_chunk = self._makeListValue([u'A', u'B', u'C'])
-        chunk = self._makeListValue([None, u'D', u'E'])
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        streamed._pending_chunk = self._make_list_value([u'A', u'B', u'C'])
+        chunk = self._make_list_value([None, u'D', u'E'])
 
         merged = streamed._merge_chunk(chunk)
 
-        expected = self._makeListValue([u'A', u'B', u'C', None, u'D', u'E'])
+        expected = self._make_list_value([u'A', u'B', u'C', None, u'D', u'E'])
         self.assertEqual(merged, expected)
         self.assertIsNone(streamed._pending_chunk)
 
@@ -274,15 +325,15 @@ def test__merge_chunk_array_of_string_with_null(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeArrayField('name', element_type_code='STRING'),
+            self._make_array_field('name', element_type_code='STRING'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        streamed._pending_chunk = self._makeListValue([u'A', u'B', u'C'])
-        chunk = self._makeListValue([u'D', u'E'])
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        streamed._pending_chunk = self._make_list_value([u'A', u'B', u'C'])
+        chunk = self._make_list_value([u'D', u'E'])
 
         merged = streamed._merge_chunk(chunk)
 
-        expected = self._makeListValue([u'A', u'B', u'CD', u'E'])
+        expected = self._make_list_value([u'A', u'B', u'CD', u'E'])
         self.assertEqual(merged, expected)
         self.assertIsNone(streamed._pending_chunk)
 
@@ -298,22 +349,22 @@ def test__merge_chunk_array_of_array_of_int(self):
         FIELDS = [
             StructType.Field(name='loloi', type=array_type)
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        streamed._pending_chunk = self._makeListValue(value_pbs=[
-            self._makeListValue([0, 1]),
-            self._makeListValue([2]),
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        streamed._pending_chunk = self._make_list_value(value_pbs=[
+            self._make_list_value([0, 1]),
+            self._make_list_value([2]),
         ])
-        chunk = self._makeListValue(value_pbs=[
-            self._makeListValue([3]),
-            self._makeListValue([4, 5]),
+        chunk = self._make_list_value(value_pbs=[
+            self._make_list_value([3]),
+            self._make_list_value([4, 5]),
         ])
 
         merged = streamed._merge_chunk(chunk)
 
-        expected = self._makeListValue(value_pbs=[
-            self._makeListValue([0, 1]),
-            self._makeListValue([23]),
-            self._makeListValue([4, 5]),
+        expected = self._make_list_value(value_pbs=[
+            self._make_list_value([0, 1]),
+            self._make_list_value([23]),
+            self._make_list_value([4, 5]),
         ])
         self.assertEqual(merged, expected)
         self.assertIsNone(streamed._pending_chunk)
@@ -330,22 +381,22 @@ def test__merge_chunk_array_of_array_of_string(self):
         FIELDS = [
             StructType.Field(name='lolos', type=array_type)
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        streamed._pending_chunk = self._makeListValue(value_pbs=[
-            self._makeListValue([u'A', u'B']),
-            self._makeListValue([u'C']),
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        streamed._pending_chunk = self._make_list_value(value_pbs=[
+            self._make_list_value([u'A', u'B']),
+            self._make_list_value([u'C']),
         ])
-        chunk = self._makeListValue(value_pbs=[
-            self._makeListValue([u'D']),
-            self._makeListValue([u'E', u'F']),
+        chunk = self._make_list_value(value_pbs=[
+            self._make_list_value([u'D']),
+            self._make_list_value([u'E', u'F']),
         ])
 
         merged = streamed._merge_chunk(chunk)
 
-        expected = self._makeListValue(value_pbs=[
-            self._makeListValue([u'A', u'B']),
-            self._makeListValue([u'CD']),
-            self._makeListValue([u'E', u'F']),
+        expected = self._make_list_value(value_pbs=[
+            self._make_list_value([u'A', u'B']),
+            self._make_list_value([u'CD']),
+            self._make_list_value([u'E', u'F']),
         ])
         self.assertEqual(merged, expected)
         self.assertIsNone(streamed._pending_chunk)
@@ -353,47 +404,47 @@ def test__merge_chunk_array_of_array_of_string(self):
     def test__merge_chunk_array_of_struct(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
-        struct_type = self._makeStructType([
+        struct_type = self._make_struct_type([
             ('name', 'STRING'),
             ('age', 'INT64'),
         ])
         FIELDS = [
-            self._makeArrayField('test', element_type=struct_type),
+            self._make_array_field('test', element_type=struct_type),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        partial = self._makeListValue([u'Phred '])
-        streamed._pending_chunk = self._makeListValue(value_pbs=[partial])
-        rest = self._makeListValue([u'Phlyntstone', 31])
-        chunk = self._makeListValue(value_pbs=[rest])
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        partial = self._make_list_value([u'Phred '])
+        streamed._pending_chunk = self._make_list_value(value_pbs=[partial])
+        rest = self._make_list_value([u'Phlyntstone', 31])
+        chunk = self._make_list_value(value_pbs=[rest])
 
         merged = streamed._merge_chunk(chunk)
 
-        struct = self._makeListValue([u'Phred Phlyntstone', 31])
-        expected = self._makeListValue(value_pbs=[struct])
+        struct = self._make_list_value([u'Phred Phlyntstone', 31])
+        expected = self._make_list_value(value_pbs=[struct])
         self.assertEqual(merged, expected)
         self.assertIsNone(streamed._pending_chunk)
 
     def test__merge_chunk_array_of_struct_unmergeable(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
-        struct_type = self._makeStructType([
+        struct_type = self._make_struct_type([
             ('name', 'STRING'),
             ('registered', 'BOOL'),
             ('voted', 'BOOL'),
         ])
         FIELDS = [
-            self._makeArrayField('test', element_type=struct_type),
+            self._make_array_field('test', element_type=struct_type),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        partial = self._makeListValue([u'Phred Phlyntstone', True])
-        streamed._pending_chunk = self._makeListValue(value_pbs=[partial])
-        rest = self._makeListValue([True])
-        chunk = self._makeListValue(value_pbs=[rest])
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        partial = self._make_list_value([u'Phred Phlyntstone', True])
+        streamed._pending_chunk = self._make_list_value(value_pbs=[partial])
+        rest = self._make_list_value([True])
+        chunk = self._make_list_value(value_pbs=[rest])
 
         merged = streamed._merge_chunk(chunk)
 
-        struct = self._makeListValue([u'Phred Phlyntstone', True, True])
-        expected = self._makeListValue(value_pbs=[struct])
+        struct = self._make_list_value([u'Phred Phlyntstone', True, True])
+        expected = self._make_list_value(value_pbs=[struct])
         self.assertEqual(merged, expected)
         self.assertIsNone(streamed._pending_chunk)
 
@@ -401,11 +452,11 @@ def test_merge_values_empty_and_empty(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
         streamed._current_row = []
         streamed._merge_values([])
         self.assertEqual(streamed.rows, [])
@@ -415,13 +466,13 @@ def test_merge_values_empty_and_partial(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
         BARE = [u'Phred Phlyntstone', 42]
-        VALUES = [self._makeValue(bare) for bare in BARE]
+        VALUES = [self._make_value(bare) for bare in BARE]
         streamed._current_row = []
         streamed._merge_values(VALUES)
         self.assertEqual(streamed.rows, [])
@@ -431,13 +482,13 @@ def test_merge_values_empty_and_filled(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
         BARE = [u'Phred Phlyntstone', 42, True]
-        VALUES = [self._makeValue(bare) for bare in BARE]
+        VALUES = [self._make_value(bare) for bare in BARE]
         streamed._current_row = []
         streamed._merge_values(VALUES)
         self.assertEqual(streamed.rows, [BARE])
@@ -447,17 +498,17 @@ def test_merge_values_empty_and_filled_plus(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
         BARE = [
             u'Phred Phlyntstone', 42, True,
             u'Bharney Rhubble', 39, True,
             u'Wylma Phlyntstone',
         ]
-        VALUES = [self._makeValue(bare) for bare in BARE]
+        VALUES = [self._make_value(bare) for bare in BARE]
         streamed._current_row = []
         streamed._merge_values(VALUES)
         self.assertEqual(streamed.rows, [BARE[0:3], BARE[3:6]])
@@ -467,11 +518,11 @@ def test_merge_values_partial_and_empty(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
         BEFORE = [
             u'Phred Phlyntstone'
         ]
@@ -484,15 +535,15 @@ def test_merge_values_partial_and_partial(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
         BEFORE = [u'Phred Phlyntstone']
         streamed._current_row[:] = BEFORE
         MERGED = [42]
-        TO_MERGE = [self._makeValue(item) for item in MERGED]
+        TO_MERGE = [self._make_value(item) for item in MERGED]
         streamed._merge_values(TO_MERGE)
         self.assertEqual(streamed.rows, [])
         self.assertEqual(streamed._current_row, BEFORE + MERGED)
@@ -501,17 +552,17 @@ def test_merge_values_partial_and_filled(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
         BEFORE = [
             u'Phred Phlyntstone'
         ]
         streamed._current_row[:] = BEFORE
         MERGED = [42, True]
-        TO_MERGE = [self._makeValue(item) for item in MERGED]
+        TO_MERGE = [self._make_value(item) for item in MERGED]
         streamed._merge_values(TO_MERGE)
         self.assertEqual(streamed.rows, [BEFORE + MERGED])
         self.assertEqual(streamed._current_row, [])
@@ -520,13 +571,13 @@ def test_merge_values_partial_and_filled_plus(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
         BEFORE = [
-            self._makeValue(u'Phred Phlyntstone')
+            self._make_value(u'Phred Phlyntstone')
         ]
         streamed._current_row[:] = BEFORE
         MERGED = [
@@ -534,7 +585,7 @@ def test_merge_values_partial_and_filled_plus(self):
             u'Bharney Rhubble', 39, True,
             u'Wylma Phlyntstone',
         ]
-        TO_MERGE = [self._makeValue(item) for item in MERGED]
+        TO_MERGE = [self._make_value(item) for item in MERGED]
         VALUES = BEFORE + MERGED
         streamed._merge_values(TO_MERGE)
         self.assertEqual(streamed.rows, [VALUES[0:3], VALUES[3:6]])
@@ -547,36 +598,62 @@ def test_consume_next_empty(self):
             streamed.consume_next()
 
     def test_consume_next_first_set_partial(self):
+        TXN_ID = b'DEADBEEF'
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
-        metadata = _ResultSetMetadataPB(FIELDS)
+        metadata = self._make_result_set_metadata(
+            FIELDS, transaction_id=TXN_ID)
         BARE = [u'Phred Phlyntstone', 42]
-        VALUES = [self._makeValue(bare) for bare in BARE]
-        result_set = _PartialResultSetPB(VALUES, metadata=metadata)
+        VALUES = [self._make_value(bare) for bare in BARE]
+        result_set = self._make_partial_result_set(VALUES, metadata=metadata)
         iterator = _MockCancellableIterator(result_set)
-        streamed = self._make_one(iterator)
+        source = mock.Mock(_transaction_id=None, spec=['_transaction_id'])
+        streamed = self._make_one(iterator, source=source)
         streamed.consume_next()
         self.assertEqual(streamed.rows, [])
         self.assertEqual(streamed._current_row, BARE)
-        self.assertIs(streamed.metadata, metadata)
+        self.assertEqual(streamed.metadata, metadata)
+        self.assertEqual(streamed.resume_token, result_set.resume_token)
+        self.assertEqual(source._transaction_id, TXN_ID)
+
+    def test_consume_next_first_set_partial_existing_txn_id(self):
+        TXN_ID = b'DEADBEEF'
+        FIELDS = [
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
+        ]
+        metadata = self._make_result_set_metadata(
+            FIELDS, transaction_id=b'')
+        BARE = [u'Phred Phlyntstone', 42]
+        VALUES = [self._make_value(bare) for bare in BARE]
+        result_set = self._make_partial_result_set(VALUES, metadata=metadata)
+        iterator = _MockCancellableIterator(result_set)
+        source = mock.Mock(_transaction_id=TXN_ID, spec=['_transaction_id'])
+        streamed = self._make_one(iterator, source=source)
+        streamed.consume_next()
+        self.assertEqual(streamed.rows, [])
+        self.assertEqual(streamed._current_row, BARE)
+        self.assertEqual(streamed.metadata, metadata)
         self.assertEqual(streamed.resume_token, result_set.resume_token)
+        self.assertEqual(source._transaction_id, TXN_ID)
 
     def test_consume_next_w_partial_result(self):
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
         VALUES = [
-            self._makeValue(u'Phred '),
+            self._make_value(u'Phred '),
         ]
-        result_set = _PartialResultSetPB(VALUES, chunked_value=True)
+        result_set = self._make_partial_result_set(VALUES, chunked_value=True)
         iterator = _MockCancellableIterator(result_set)
         streamed = self._make_one(iterator)
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
         streamed.consume_next()
         self.assertEqual(streamed.rows, [])
         self.assertEqual(streamed._current_row, [])
@@ -585,21 +662,21 @@ def test_consume_next_w_partial_result(self):
 
     def test_consume_next_w_pending_chunk(self):
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
         BARE = [
             u'Phlyntstone', 42, True,
             u'Bharney Rhubble', 39, True,
             u'Wylma Phlyntstone',
         ]
-        VALUES = [self._makeValue(bare) for bare in BARE]
-        result_set = _PartialResultSetPB(VALUES)
+        VALUES = [self._make_value(bare) for bare in BARE]
+        result_set = self._make_partial_result_set(VALUES)
         iterator = _MockCancellableIterator(result_set)
         streamed = self._make_one(iterator)
-        streamed._metadata = _ResultSetMetadataPB(FIELDS)
-        streamed._pending_chunk = self._makeValue(u'Phred ')
+        streamed._metadata = self._make_result_set_metadata(FIELDS)
+        streamed._pending_chunk = self._make_value(u'Phred ')
         streamed.consume_next()
         self.assertEqual(streamed.rows, [
             [u'Phred Phlyntstone', BARE[1], BARE[2]],
@@ -611,26 +688,26 @@ def test_consume_next_w_pending_chunk(self):
 
     def test_consume_next_last_set(self):
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
-        metadata = _ResultSetMetadataPB(FIELDS)
-        stats = _ResultSetStatsPB(
+        metadata = self._make_result_set_metadata(FIELDS)
+        stats = self._make_result_set_stats(
             rows_returned="1",
             elapsed_time="1.23 secs",
-            cpu_tme="0.98 secs",
+            cpu_time="0.98 secs",
         )
         BARE = [u'Phred Phlyntstone', 42, True]
-        VALUES = [self._makeValue(bare) for bare in BARE]
-        result_set = _PartialResultSetPB(VALUES, stats=stats)
+        VALUES = [self._make_value(bare) for bare in BARE]
+        result_set = self._make_partial_result_set(VALUES, stats=stats)
         iterator = _MockCancellableIterator(result_set)
         streamed = self._make_one(iterator)
         streamed._metadata = metadata
         streamed.consume_next()
         self.assertEqual(streamed.rows, [BARE])
         self.assertEqual(streamed._current_row, [])
-        self.assertIs(streamed._stats, stats)
+        self.assertEqual(streamed._stats, stats)
         self.assertEqual(streamed.resume_token, result_set.resume_token)
 
     def test_consume_all_empty(self):
@@ -640,36 +717,37 @@ def test_consume_all_empty(self):
 
     def test_consume_all_one_result_set_partial(self):
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
-        metadata = _ResultSetMetadataPB(FIELDS)
+        metadata = self._make_result_set_metadata(FIELDS)
         BARE = [u'Phred Phlyntstone', 42]
-        VALUES = [self._makeValue(bare) for bare in BARE]
-        result_set = _PartialResultSetPB(VALUES, metadata=metadata)
+        VALUES = [self._make_value(bare) for bare in BARE]
+        result_set = self._make_partial_result_set(VALUES, metadata=metadata)
         iterator = _MockCancellableIterator(result_set)
         streamed = self._make_one(iterator)
         streamed.consume_all()
         self.assertEqual(streamed.rows, [])
         self.assertEqual(streamed._current_row, BARE)
-        self.assertIs(streamed.metadata, metadata)
+        self.assertEqual(streamed.metadata, metadata)
 
     def test_consume_all_multiple_result_sets_filled(self):
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
-        metadata = _ResultSetMetadataPB(FIELDS)
+        metadata = self._make_result_set_metadata(FIELDS)
         BARE = [
             u'Phred Phlyntstone', 42, True,
             u'Bharney Rhubble', 39, True,
             u'Wylma Phlyntstone', 41, True,
         ]
-        VALUES = [self._makeValue(bare) for bare in BARE]
-        result_set1 = _PartialResultSetPB(VALUES[:4], metadata=metadata)
-        result_set2 = _PartialResultSetPB(VALUES[4:])
+        VALUES = [self._make_value(bare) for bare in BARE]
+        result_set1 = self._make_partial_result_set(
+            VALUES[:4], metadata=metadata)
+        result_set2 = self._make_partial_result_set(VALUES[4:])
         iterator = _MockCancellableIterator(result_set1, result_set2)
         streamed = self._make_one(iterator)
         streamed.consume_all()
@@ -689,37 +767,38 @@ def test___iter___empty(self):
 
     def test___iter___one_result_set_partial(self):
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
-        metadata = _ResultSetMetadataPB(FIELDS)
+        metadata = self._make_result_set_metadata(FIELDS)
         BARE = [u'Phred Phlyntstone', 42]
-        VALUES = [self._makeValue(bare) for bare in BARE]
-        result_set = _PartialResultSetPB(VALUES, metadata=metadata)
+        VALUES = [self._make_value(bare) for bare in BARE]
+        result_set = self._make_partial_result_set(VALUES, metadata=metadata)
         iterator = _MockCancellableIterator(result_set)
         streamed = self._make_one(iterator)
         found = list(streamed)
         self.assertEqual(found, [])
         self.assertEqual(streamed.rows, [])
         self.assertEqual(streamed._current_row, BARE)
-        self.assertIs(streamed.metadata, metadata)
+        self.assertEqual(streamed.metadata, metadata)
 
     def test___iter___multiple_result_sets_filled(self):
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
-        metadata = _ResultSetMetadataPB(FIELDS)
+        metadata = self._make_result_set_metadata(FIELDS)
         BARE = [
             u'Phred Phlyntstone', 42, True,
             u'Bharney Rhubble', 39, True,
             u'Wylma Phlyntstone', 41, True,
         ]
-        VALUES = [self._makeValue(bare) for bare in BARE]
-        result_set1 = _PartialResultSetPB(VALUES[:4], metadata=metadata)
-        result_set2 = _PartialResultSetPB(VALUES[4:])
+        VALUES = [self._make_value(bare) for bare in BARE]
+        result_set1 = self._make_partial_result_set(
+            VALUES[:4], metadata=metadata)
+        result_set2 = self._make_partial_result_set(VALUES[4:])
         iterator = _MockCancellableIterator(result_set1, result_set2)
         streamed = self._make_one(iterator)
         found = list(streamed)
@@ -734,11 +813,11 @@ def test___iter___multiple_result_sets_filled(self):
 
     def test___iter___w_existing_rows_read(self):
         FIELDS = [
-            self._makeScalarField('full_name', 'STRING'),
-            self._makeScalarField('age', 'INT64'),
-            self._makeScalarField('married', 'BOOL'),
+            self._make_scalar_field('full_name', 'STRING'),
+            self._make_scalar_field('age', 'INT64'),
+            self._make_scalar_field('married', 'BOOL'),
         ]
-        metadata = _ResultSetMetadataPB(FIELDS)
+        metadata = self._make_result_set_metadata(FIELDS)
         ALREADY = [
             [u'Pebbylz Phlyntstone', 4, False],
             [u'Dino Rhubble', 4, False],
@@ -748,9 +827,10 @@ def test___iter___w_existing_rows_read(self):
             u'Bharney Rhubble', 39, True,
             u'Wylma Phlyntstone', 41, True,
         ]
-        VALUES = [self._makeValue(bare) for bare in BARE]
-        result_set1 = _PartialResultSetPB(VALUES[:4], metadata=metadata)
-        result_set2 = _PartialResultSetPB(VALUES[4:])
+        VALUES = [self._make_value(bare) for bare in BARE]
+        result_set1 = self._make_partial_result_set(
+            VALUES[:4], metadata=metadata)
+        result_set2 = self._make_partial_result_set(VALUES[4:])
         iterator = _MockCancellableIterator(result_set1, result_set2)
         streamed = self._make_one(iterator)
         streamed._rows[:] = ALREADY
@@ -779,40 +859,6 @@ def __next__(self):  # pragma: NO COVER Py3k
         return self.next()
 
 
-class _ResultSetMetadataPB(object):
-
-    def __init__(self, fields):
-        from google.cloud.proto.spanner.v1.type_pb2 import StructType
-
-        self.row_type = StructType(fields=fields)
-
-
-class _ResultSetStatsPB(object):
-
-    def __init__(self, query_plan=None, **query_stats):
-        from google.protobuf.struct_pb2 import Struct
-        from google.cloud.spanner._helpers import _make_value_pb
-
-        self.query_plan = query_plan
-        self.query_stats = Struct(fields={
-            key: _make_value_pb(value) for key, value in query_stats.items()})
-
-
-class _PartialResultSetPB(object):
-
-    resume_token = b'DEADBEEF'
-
-    def __init__(self, values, metadata=None, stats=None, chunked_value=False):
-        self.values = values
-        self.metadata = metadata
-        self.stats = stats
-        self.chunked_value = chunked_value
-
-    def HasField(self, name):
-        assert name == 'stats'
-        return self.stats is not None
-
-
 class TestStreamedResultSet_JSON_acceptance_tests(unittest.TestCase):
 
     _json_tests = None
diff --git a/spanner/tests/unit/test_transaction.py b/spanner/tests/unit/test_transaction.py
index 973aeedb179da..9bb36d1f5435e 100644
--- a/spanner/tests/unit/test_transaction.py
+++ b/spanner/tests/unit/test_transaction.py
@@ -51,9 +51,10 @@ def test_ctor_defaults(self):
         session = _Session()
         transaction = self._make_one(session)
         self.assertIs(transaction._session, session)
-        self.assertIsNone(transaction._id)
+        self.assertIsNone(transaction._transaction_id)
         self.assertIsNone(transaction.committed)
-        self.assertEqual(transaction._rolled_back, False)
+        self.assertFalse(transaction._rolled_back)
+        self.assertTrue(transaction._multi_use)
 
     def test__check_state_not_begun(self):
         session = _Session()
@@ -64,7 +65,7 @@ def test__check_state_not_begun(self):
     def test__check_state_already_committed(self):
         session = _Session()
         transaction = self._make_one(session)
-        transaction._id = b'DEADBEEF'
+        transaction._transaction_id = self.TRANSACTION_ID
         transaction.committed = object()
         with self.assertRaises(ValueError):
             transaction._check_state()
@@ -72,7 +73,7 @@ def test__check_state_already_committed(self):
     def test__check_state_already_rolled_back(self):
         session = _Session()
         transaction = self._make_one(session)
-        transaction._id = b'DEADBEEF'
+        transaction._transaction_id = self.TRANSACTION_ID
         transaction._rolled_back = True
         with self.assertRaises(ValueError):
             transaction._check_state()
@@ -80,20 +81,20 @@ def test__check_state_already_rolled_back(self):
     def test__check_state_ok(self):
         session = _Session()
         transaction = self._make_one(session)
-        transaction._id = b'DEADBEEF'
+        transaction._transaction_id = self.TRANSACTION_ID
         transaction._check_state()  # does not raise
 
     def test__make_txn_selector(self):
         session = _Session()
         transaction = self._make_one(session)
-        transaction._id = self.TRANSACTION_ID
+        transaction._transaction_id = self.TRANSACTION_ID
         selector = transaction._make_txn_selector()
         self.assertEqual(selector.id, self.TRANSACTION_ID)
 
     def test_begin_already_begun(self):
         session = _Session()
         transaction = self._make_one(session)
-        transaction._id = self.TRANSACTION_ID
+        transaction._transaction_id = self.TRANSACTION_ID
         with self.assertRaises(ValueError):
             transaction.begin()
 
@@ -143,7 +144,7 @@ def test_begin_ok(self):
         txn_id = transaction.begin()
 
         self.assertEqual(txn_id, self.TRANSACTION_ID)
-        self.assertEqual(transaction._id, self.TRANSACTION_ID)
+        self.assertEqual(transaction._transaction_id, self.TRANSACTION_ID)
 
         session_id, txn_options, options = api._begun
         self.assertEqual(session_id, session.name)
@@ -160,7 +161,7 @@ def test_rollback_not_begun(self):
     def test_rollback_already_committed(self):
         session = _Session()
         transaction = self._make_one(session)
-        transaction._id = self.TRANSACTION_ID
+        transaction._transaction_id = self.TRANSACTION_ID
         transaction.committed = object()
         with self.assertRaises(ValueError):
             transaction.rollback()
@@ -168,7 +169,7 @@ def test_rollback_already_committed(self):
     def test_rollback_already_rolled_back(self):
         session = _Session()
         transaction = self._make_one(session)
-        transaction._id = self.TRANSACTION_ID
+        transaction._transaction_id = self.TRANSACTION_ID
         transaction._rolled_back = True
         with self.assertRaises(ValueError):
             transaction.rollback()
@@ -181,7 +182,7 @@ def test_rollback_w_gax_error(self):
             _random_gax_error=True)
         session = _Session(database)
         transaction = self._make_one(session)
-        transaction._id = self.TRANSACTION_ID
+        transaction._transaction_id = self.TRANSACTION_ID
         transaction.insert(TABLE_NAME, COLUMNS, VALUES)
 
         with self.assertRaises(GaxError):
@@ -204,7 +205,7 @@ def test_rollback_ok(self):
             _rollback_response=empty_pb)
         session = _Session(database)
         transaction = self._make_one(session)
-        transaction._id = self.TRANSACTION_ID
+        transaction._transaction_id = self.TRANSACTION_ID
         transaction.replace(TABLE_NAME, COLUMNS, VALUES)
 
         transaction.rollback()
@@ -227,7 +228,7 @@ def test_commit_not_begun(self):
     def test_commit_already_committed(self):
         session = _Session()
         transaction = self._make_one(session)
-        transaction._id = self.TRANSACTION_ID
+        transaction._transaction_id = self.TRANSACTION_ID
         transaction.committed = object()
         with self.assertRaises(ValueError):
             transaction.commit()
@@ -235,7 +236,7 @@ def test_commit_already_committed(self):
     def test_commit_already_rolled_back(self):
         session = _Session()
         transaction = self._make_one(session)
-        transaction._id = self.TRANSACTION_ID
+        transaction._transaction_id = self.TRANSACTION_ID
         transaction._rolled_back = True
         with self.assertRaises(ValueError):
             transaction.commit()
@@ -243,7 +244,7 @@ def test_commit_already_rolled_back(self):
     def test_commit_no_mutations(self):
         session = _Session()
         transaction = self._make_one(session)
-        transaction._id = self.TRANSACTION_ID
+        transaction._transaction_id = self.TRANSACTION_ID
         with self.assertRaises(ValueError):
             transaction.commit()
 
@@ -255,7 +256,7 @@ def test_commit_w_gax_error(self):
             _random_gax_error=True)
         session = _Session(database)
         transaction = self._make_one(session)
-        transaction._id = self.TRANSACTION_ID
+        transaction._transaction_id = self.TRANSACTION_ID
         transaction.replace(TABLE_NAME, COLUMNS, VALUES)
 
         with self.assertRaises(GaxError):
@@ -287,7 +288,7 @@ def test_commit_ok(self):
             _commit_response=response)
         session = _Session(database)
         transaction = self._make_one(session)
-        transaction._id = self.TRANSACTION_ID
+        transaction._transaction_id = self.TRANSACTION_ID
         transaction.delete(TABLE_NAME, keyset)
 
         transaction.commit()

From 7ff10beee7f012560f5e3a13aaa49ba6464a7b62 Mon Sep 17 00:00:00 2001
From: Angela Li <yanhuil@google.com>
Date: Thu, 27 Jul 2017 07:15:36 -0700
Subject: [PATCH 126/211] Add trace docs to main docs index (#3683)

---
 docs/index.rst          |  1 +
 docs/trace/apis.rst     |  5 +++--
 docs/trace/starting.rst | 25 ++++++++++++++++++++-----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index ee47a2ac378f7..b9fdb6bc20a2f 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -17,6 +17,7 @@
   monitoring/usage
   logging/usage
   storage/client
+  trace/index
   translate/usage
   vision/index
 
diff --git a/docs/trace/apis.rst b/docs/trace/apis.rst
index 80a8d50c0c60a..03c170783e066 100644
--- a/docs/trace/apis.rst
+++ b/docs/trace/apis.rst
@@ -5,7 +5,8 @@ APIs
 ----
 
 .. autosummary::
-   :toctree:
+
+.. :toctree::
 
    google.cloud.gapic.trace.v1.trace_service_client
 
@@ -14,6 +15,6 @@ API types
 ~~~~~~~~~
 
 .. autosummary::
-   :toctree:
+.. :toctree::
 
    google.cloud.gapic.trace.v1.enums
diff --git a/docs/trace/starting.rst b/docs/trace/starting.rst
index 245fcfd68a875..0fbd7c1080484 100644
--- a/docs/trace/starting.rst
+++ b/docs/trace/starting.rst
@@ -1,7 +1,7 @@
 Getting started
 ===============
 
-gapic-google-cloud-trace-v1 will allow you to connect to the `Stackdriver Trace API`_ and access all its methods. In order to achieve this, you need to set up authentication as well as install the library locally.
+google-cloud-trace will allow you to connect to the `Stackdriver Trace API`_ and access all its methods. In order to achieve this, you need to set up authentication as well as install the library locally.
 
 .. _`Stackdriver Trace API`: https://developers.google.com/apis-explorer/?hl=en_US#p/cloudtrace/v1/
 
@@ -29,7 +29,7 @@ Mac/Linux
     pip install virtualenv
     virtualenv <your-env>
     source <your-env>/bin/activate
-    <your-env>/bin/pip install gapic-google-cloud-trace-v1
+    <your-env>/bin/pip install google-cloud-trace
 
 Windows
 ~~~~~~~
@@ -39,7 +39,7 @@ Windows
     pip install virtualenv
     virtualenv <your-env>
     <your-env>\Scripts\activate
-    <your-env>\Scripts\pip.exe install gapic-google-cloud-trace-v1
+    <your-env>\Scripts\pip.exe install google-cloud-trace
 
 
 Using the API
@@ -74,5 +74,20 @@ At this point you are all set to continue.
 Examples
 ~~~~~~~~
 
-To see example usage, please read through the :doc:`API reference </apis>`.  The
-documentation for each API method includes simple examples.
+.. code-block:: python
+
+  from google.cloud.trace import client
+
+  client = client.Client(project_id='your_project_id')
+
+  # Patch traces, traces should be a dict
+  client.patch_traces(traces=traces)
+
+  # Get trace
+  client.get_trace(trace_id='your_trace_id')
+
+  # List traces
+  traces = client.list_traces()
+
+  for trace in traces:
+      print(trace)

From 3144f100cf9b38853776880a516ef5f65e4dd6da Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Thu, 27 Jul 2017 08:14:45 -0700
Subject: [PATCH 127/211] Fix translate docs build. (#3688)

---
 docs/translate/client.rst | 2 +-
 nox.py                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/translate/client.rst b/docs/translate/client.rst
index 9f6aa5e1ece93..fbd7a4a18aebd 100644
--- a/docs/translate/client.rst
+++ b/docs/translate/client.rst
@@ -1,7 +1,7 @@
 Translation Client
 ==================
 
-.. automodule:: google.cloud.translate.client
+.. automodule:: google.cloud.translate_v2.client
   :members:
   :undoc-members:
   :show-inheritance:
diff --git a/nox.py b/nox.py
index 25db4c616c4f6..bf4a5d57d6c11 100644
--- a/nox.py
+++ b/nox.py
@@ -30,13 +30,13 @@ def docs(session):
     # Install Sphinx and also all of the google-cloud-* packages.
     session.chdir(os.path.realpath(os.path.dirname(__file__)))
     session.install('Sphinx >= 1.6.2', 'sphinx_rtd_theme')
+    session.install('.')
     session.install(
         'core/', 'bigquery/', 'bigtable/', 'datastore/', 'dns/', 'language/',
         'logging/', 'error_reporting/', 'monitoring/', 'pubsub/',
         'resource_manager/', 'runtimeconfig/', 'spanner/', 'speech/',
         'storage/', 'trace/', 'translate/', 'vision/',
     )
-    session.install('-e', '.')
 
     # Build the docs!
     session.run('bash', './test_utils/scripts/update_docs.sh')

From 440b21443d0b6c70e6bd3a0cefbc77f782e351e2 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Wed, 26 Jul 2017 16:03:01 -0400
Subject: [PATCH 128/211] Prep langauge-0.26.0 release.

---
 language/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/language/setup.py b/language/setup.py
index 16ee4d5603ad6..9fb14be942fdf 100644
--- a/language/setup.py
+++ b/language/setup.py
@@ -61,7 +61,7 @@
 
 setup(
     name='google-cloud-language',
-    version='0.25.0',
+    version='0.26.0',
     description='Python Client for Google Cloud Natural Language',
     long_description=README,
     namespace_packages=[

From 09a476a36eb063682aa14d875d1d920d900ac601 Mon Sep 17 00:00:00 2001
From: Misha Brukman <mbrukman@google.com>
Date: Thu, 27 Jul 2017 11:41:10 -0400
Subject: [PATCH 129/211] Alphabetize products for easier visual scanning.
 (#3682)

This change also brings "Cloud Bigtable" together with "Cloud Bigtable -
HappyBase" and adds "Google" prefix to "Cloud Spanner" for consistency with
other products.
---
 README.rst | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.rst b/README.rst
index 3de445aba7622..008b9cad6454d 100644
--- a/README.rst
+++ b/README.rst
@@ -18,9 +18,9 @@ Google Cloud Python Client
 The following client libraries have **GA** support:
 
 -  `Google Cloud Datastore`_ (`Datastore README`_)
--  `Stackdriver Logging`_ (`Logging README`_)
 -  `Google Cloud Storage`_ (`Storage README`_)
 -  `Google Cloud Translation`_ (`Translation README`_)
+-  `Stackdriver Logging`_ (`Logging README`_)
 
 **GA** (general availability) indicates that the client library for a
 particular service is stable, and that the code surface will not change in
@@ -32,9 +32,9 @@ priority.
 The following client libraries have **beta** support:
 
 -  `Google BigQuery`_ (`BigQuery README`_)
--  `Google Cloud Vision`_ (`Vision README`_)
 -  `Google Cloud Natural Language`_ (`Natural Language README`_)
 -  `Google Cloud Video Intelligence`_ (`Video Intelligence README`_)
+-  `Google Cloud Vision`_ (`Vision README`_)
 
 **Beta** indicates that the client library for a particular service is
 mostly stable and is being prepared for release. Issues and requests
@@ -43,16 +43,16 @@ against beta libraries are addressed with a higher priority.
 This client library has **alpha** support for the following Google
 Cloud Platform services:
 
--  `Google Cloud Pub/Sub`_ (`Pub/Sub README`_)
--  `Google Cloud Resource Manager`_ (`Resource Manager README`_)
--  `Stackdriver Monitoring`_ (`Monitoring README`_)
 -  `Google Cloud Bigtable`_ (`Bigtable README`_)
--  `Google Cloud DNS`_ (`DNS README`_)
--  `Stackdriver Error Reporting`_ (`Error Reporting README`_)
--  `Google Cloud Speech`_ (`Speech README`_)
 -  `Google Cloud Bigtable - HappyBase`_ (`HappyBase README`_)
+-  `Google Cloud DNS`_ (`DNS README`_)
+-  `Google Cloud Pub/Sub`_ (`Pub/Sub README`_)
+-  `Google Cloud Resource Manager`_ (`Resource Manager README`_)
 -  `Google Cloud Runtime Configuration`_ (`Runtime Config README`_)
--  `Cloud Spanner`_ (`Cloud Spanner README`_)
+-  `Google Cloud Spanner`_ (`Spanner README`_)
+-  `Google Cloud Speech`_ (`Speech README`_)
+-  `Stackdriver Error Reporting`_ (`Error Reporting README`_)
+-  `Stackdriver Monitoring`_ (`Monitoring README`_)
 
 **Alpha** indicates that the client library for a particular service is
 still a work-in-progress and is more likely to get backwards-incompatible
@@ -90,8 +90,8 @@ updates. See `versioning`_ for more details.
 .. _HappyBase README: https://github.com/GoogleCloudPlatform/google-cloud-python-happybase
 .. _Google Cloud Runtime Configuration: https://cloud.google.com/deployment-manager/runtime-configurator/
 .. _Runtime Config README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/runtimeconfig
-.. _Cloud Spanner: https://pypi.python.org/pypi/google-cloud-spanner
-.. _Cloud Spanner README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/spanner
+.. _Google Cloud Spanner: https://pypi.python.org/pypi/google-cloud-spanner
+.. _Spanner README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/spanner
 .. _Google Cloud Video Intelligence: https://pypi.python.org/pypi/google-cloud-videointelligence
 .. _Video Intelligence README: https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master/videointelligence
 .. _versioning: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/CONTRIBUTING.rst#versioning

From 7d1161f70744c0dbbe67a3f472ea95667eaafe50 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Thu, 27 Jul 2017 11:21:30 -0700
Subject: [PATCH 130/211] Remove httplib2, replace with Requests (#3674)

* Core: remove httplib2, replace with Requests

Additionally remove make_exception in favor of from_http_status and from_http_response.

* Datastore: replace httplib2 with Requests

* DNS: replace httplib2 with Requests

* Error Reporting: replace httplib2 with requests

* Language: replace httplib2 with Requests

* Logging: replace httplib2 with requests

* Monitoring: replace httplib2 with Requests

* Pubsub: replace httplib2 with Requests

* Resource Manager: replace httplib2 with Requests

* Runtimeconfig: replace httplib2 with Requests

* Speech: replace httplib2 with Requests

* Storage: replace httplib2 with Requests

* BigQuery: replace httplib2 with Requests

* Translate: replace httplib2 with Requests

* Vision: replace httplib2 with Requests
---
 bigquery/google/cloud/bigquery/client.py      |   4 +-
 bigquery/google/cloud/bigquery/dataset.py     |   2 +-
 bigquery/google/cloud/bigquery/job.py         |  14 +-
 bigquery/google/cloud/bigquery/query.py       |   2 +-
 bigquery/google/cloud/bigquery/table.py       |  29 +-
 bigquery/tests/unit/test__http.py             |  14 +-
 bigquery/tests/unit/test_job.py               |   2 +-
 bigquery/tests/unit/test_table.py             |  10 +-
 core/google/cloud/_helpers.py                 |   5 +-
 core/google/cloud/_http.py                    |  54 +--
 core/google/cloud/client.py                   |  32 +-
 core/google/cloud/exceptions.py               |  82 ++--
 core/setup.py                                 |   3 +-
 core/tests/unit/test__http.py                 | 327 +++++--------
 core/tests/unit/test_client.py                |  12 +-
 core/tests/unit/test_exceptions.py            | 233 ++++-----
 datastore/google/cloud/datastore/_http.py     |  21 +-
 datastore/google/cloud/datastore/client.py    |   4 +-
 datastore/tests/system/test_system.py         |   4 +-
 datastore/tests/unit/test__http.py            | 248 +++++-----
 dns/google/cloud/dns/client.py                |   4 +-
 dns/google/cloud/dns/zone.py                  |   2 +-
 dns/tests/unit/test__http.py                  |  19 +-
 docs/conf.py                                  |   5 +-
 docs/core/auth.rst                            |  49 --
 .../google/cloud/error_reporting/_logging.py  |   6 +-
 .../google/cloud/error_reporting/client.py    |   6 +-
 language/google/cloud/language/client.py      |   4 +-
 language/tests/unit/test__http.py             |  15 +-
 logging/google/cloud/logging/client.py        |   4 +-
 logging/tests/unit/test__http.py              |  15 +-
 logging/tests/unit/test_client.py             |  12 +-
 monitoring/google/cloud/monitoring/client.py  |   4 +-
 monitoring/tests/unit/test__http.py           |  15 +-
 pubsub/google/cloud/pubsub/client.py          |   4 +-
 pubsub/tests/system.py                        |   8 +-
 pubsub/tests/unit/test__http.py               |  15 +-
 .../google/cloud/resource_manager/client.py   |   4 +-
 resource_manager/tests/unit/test__http.py     |  15 +-
 .../google/cloud/runtimeconfig/client.py      |   4 +-
 .../google/cloud/runtimeconfig/config.py      |   2 +-
 runtimeconfig/tests/unit/test__http.py        |  15 +-
 speech/google/cloud/speech/client.py          |   4 +-
 speech/tests/unit/test__http.py               |  18 +-
 storage/google/cloud/storage/batch.py         |  90 ++--
 storage/google/cloud/storage/blob.py          |  15 +-
 storage/google/cloud/storage/client.py        |   4 +-
 storage/tests/system.py                       |  17 +-
 storage/tests/unit/test__http.py              |  15 +-
 storage/tests/unit/test_batch.py              | 448 +++++++++---------
 storage/tests/unit/test_blob.py               |  52 +-
 storage/tests/unit/test_client.py             | 221 ++++-----
 translate/google/cloud/translate_v2/client.py |   4 +-
 translate/tests/unit/test__http.py            |  15 +-
 vision/google/cloud/vision/client.py          |   4 +-
 vision/tests/unit/test__http.py               |  15 +-
 56 files changed, 1050 insertions(+), 1201 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/client.py b/bigquery/google/cloud/bigquery/client.py
index 5f0101f35de53..f36d80978efdb 100644
--- a/bigquery/google/cloud/bigquery/client.py
+++ b/bigquery/google/cloud/bigquery/client.py
@@ -64,10 +64,10 @@ class Client(ClientWithProject):
                         passed), falls back to the default inferred from the
                         environment.
 
-    :type _http: :class:`~httplib2.Http`
+    :type _http: :class:`~requests.Session`
     :param _http: (Optional) HTTP object to make requests. Can be any object
                   that defines ``request()`` with the same interface as
-                  :meth:`~httplib2.Http.request`. If not passed, an
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/bigquery/google/cloud/bigquery/dataset.py b/bigquery/google/cloud/bigquery/dataset.py
index bce74ca9f3664..8fb986cb848db 100644
--- a/bigquery/google/cloud/bigquery/dataset.py
+++ b/bigquery/google/cloud/bigquery/dataset.py
@@ -364,7 +364,7 @@ def _parse_access_grants(access):
     def _set_properties(self, api_response):
         """Update properties from resource in body of ``api_response``
 
-        :type api_response: httplib2.Response
+        :type api_response: dict
         :param api_response: response returned from an API call.
         """
         self._properties.clear()
diff --git a/bigquery/google/cloud/bigquery/job.py b/bigquery/google/cloud/bigquery/job.py
index ef5353f9ff14a..c2d1feee7120e 100644
--- a/bigquery/google/cloud/bigquery/job.py
+++ b/bigquery/google/cloud/bigquery/job.py
@@ -14,7 +14,6 @@
 
 """Define API Jobs."""
 
-import collections
 import threading
 
 import six
@@ -58,8 +57,6 @@
     'tableUnavailable': http_client.BAD_REQUEST,
 }
 
-_FakeResponse = collections.namedtuple('_FakeResponse', ['status'])
-
 
 def _error_result_to_exception(error_result):
     """Maps BigQuery error reasons to an exception.
@@ -79,13 +76,8 @@ def _error_result_to_exception(error_result):
     reason = error_result.get('reason')
     status_code = _ERROR_REASON_TO_EXCEPTION.get(
         reason, http_client.INTERNAL_SERVER_ERROR)
-    # make_exception expects an httplib2 response object.
-    fake_response = _FakeResponse(status=status_code)
-    return exceptions.make_exception(
-        fake_response,
-        error_result.get('message', ''),
-        error_info=error_result,
-        use_json=False)
+    return exceptions.from_http_status(
+        status_code, error_result.get('message', ''), errors=[error_result])
 
 
 class Compression(_EnumProperty):
@@ -307,7 +299,7 @@ def _scrub_local_properties(self, cleaned):
     def _set_properties(self, api_response):
         """Update properties from resource in body of ``api_response``
 
-        :type api_response: httplib2.Response
+        :type api_response: dict
         :param api_response: response returned from an API call
         """
         cleaned = api_response.copy()
diff --git a/bigquery/google/cloud/bigquery/query.py b/bigquery/google/cloud/bigquery/query.py
index d596deadfb405..502953b2c828d 100644
--- a/bigquery/google/cloud/bigquery/query.py
+++ b/bigquery/google/cloud/bigquery/query.py
@@ -310,7 +310,7 @@ def schema(self):
     def _set_properties(self, api_response):
         """Update properties from resource in body of ``api_response``
 
-        :type api_response: httplib2.Response
+        :type api_response: dict
         :param api_response: response returned from an API call
         """
         self._properties.clear()
diff --git a/bigquery/google/cloud/bigquery/table.py b/bigquery/google/cloud/bigquery/table.py
index f7752bb8fc364..c32832a926ced 100644
--- a/bigquery/google/cloud/bigquery/table.py
+++ b/bigquery/google/cloud/bigquery/table.py
@@ -17,7 +17,6 @@
 import datetime
 import os
 
-import httplib2
 import six
 
 import google.auth.transport.requests
@@ -25,10 +24,9 @@
 from google.resumable_media.requests import MultipartUpload
 from google.resumable_media.requests import ResumableUpload
 
+from google.cloud import exceptions
 from google.cloud._helpers import _datetime_from_microseconds
 from google.cloud._helpers import _millis_from_datetime
-from google.cloud.exceptions import NotFound
-from google.cloud.exceptions import make_exception
 from google.cloud.iterator import HTTPIterator
 from google.cloud.bigquery.schema import SchemaField
 from google.cloud.bigquery._helpers import _item_to_row
@@ -474,7 +472,7 @@ def _require_client(self, client):
     def _set_properties(self, api_response):
         """Update properties from resource in body of ``api_response``
 
-        :type api_response: httplib2.Response
+        :type api_response: dict
         :param api_response: response returned from an API call
         """
         self._properties.clear()
@@ -563,7 +561,7 @@ def exists(self, client=None):
         try:
             client._connection.api_request(method='GET', path=self.path,
                                            query_params={'fields': 'id'})
-        except NotFound:
+        except exceptions.NotFound:
             return False
         else:
             return True
@@ -1113,7 +1111,7 @@ def upload_from_file(self,
                 client, file_obj, metadata, size, num_retries)
             return client.job_from_resource(created_json)
         except resumable_media.InvalidResponse as exc:
-            _raise_from_invalid_response(exc)
+            raise exceptions.from_http_response(exc.response)
     # pylint: enable=too-many-arguments,too-many-locals
 
 
@@ -1298,22 +1296,3 @@ def _get_upload_metadata(source_format, schema, dataset, name):
             'load': load_config,
         },
     }
-
-
-def _raise_from_invalid_response(error, error_info=None):
-    """Re-wrap and raise an ``InvalidResponse`` exception.
-
-    :type error: :exc:`google.resumable_media.InvalidResponse`
-    :param error: A caught exception from the ``google-resumable-media``
-                  library.
-
-    :type error_info: str
-    :param error_info: (Optional) Extra information about the failed request.
-
-    :raises: :class:`~google.cloud.exceptions.GoogleCloudError` corresponding
-             to the failed status code
-    """
-    response = error.response
-    faux_response = httplib2.Response({'status': response.status_code})
-    raise make_exception(faux_response, response.content,
-                         error_info=error_info, use_json=False)
diff --git a/bigquery/tests/unit/test__http.py b/bigquery/tests/unit/test__http.py
index 9972e9859313f..b8af254d3614c 100644
--- a/bigquery/tests/unit/test__http.py
+++ b/bigquery/tests/unit/test__http.py
@@ -15,6 +15,7 @@
 import unittest
 
 import mock
+import requests
 
 
 class TestConnection(unittest.TestCase):
@@ -55,10 +56,12 @@ def test_extra_headers(self):
         from google.cloud import _http as base_http
         from google.cloud.bigquery import _http as MUT
 
-        http = mock.Mock(spec=['request'])
-        response = mock.Mock(status=200, spec=['status'])
+        http = mock.create_autospec(requests.Session, instance=True)
+        response = requests.Response()
+        response.status_code = 200
         data = b'brent-spiner'
-        http.request.return_value = response, data
+        response._content = data
+        http.request.return_value = response
         client = mock.Mock(_http=http, spec=['_http'])
 
         conn = self._make_one(client)
@@ -68,15 +71,14 @@ def test_extra_headers(self):
         self.assertEqual(result, data)
 
         expected_headers = {
-            'Content-Length': str(len(req_data)),
             'Accept-Encoding': 'gzip',
             base_http.CLIENT_INFO_HEADER: MUT._CLIENT_INFO,
             'User-Agent': conn.USER_AGENT,
         }
         expected_uri = conn.build_api_url('/rainbow')
         http.request.assert_called_once_with(
-            body=req_data,
+            data=req_data,
             headers=expected_headers,
             method='GET',
-            uri=expected_uri,
+            url=expected_uri,
         )
diff --git a/bigquery/tests/unit/test_job.py b/bigquery/tests/unit/test_job.py
index fcb518d9c502f..d2ec7027d5e66 100644
--- a/bigquery/tests/unit/test_job.py
+++ b/bigquery/tests/unit/test_job.py
@@ -31,7 +31,7 @@ def test_simple(self):
         exception = self._call_fut(error_result)
         self.assertEqual(exception.code, http_client.BAD_REQUEST)
         self.assertTrue(exception.message.startswith('bad request'))
-        self.assertIn("'reason': 'invalid'", exception.message)
+        self.assertIn(error_result, exception.errors)
 
     def test_missing_reason(self):
         error_result = {}
diff --git a/bigquery/tests/unit/test_table.py b/bigquery/tests/unit/test_table.py
index 502c0495f9c9d..eebb40a2e7361 100644
--- a/bigquery/tests/unit/test_table.py
+++ b/bigquery/tests/unit/test_table.py
@@ -1744,9 +1744,11 @@ def _make_table():
     def _make_response(status_code, content='', headers={}):
         """Make a mock HTTP response."""
         import requests
-        response = mock.create_autospec(requests.Response, instance=True)
-        response.content = content.encode('utf-8')
-        response.headers = headers
+        response = requests.Response()
+        response.request = requests.Request(
+            'POST', 'http://example.com').prepare()
+        response._content = content.encode('utf-8')
+        response.headers.update(headers)
         response.status_code = status_code
         return response
 
@@ -1921,7 +1923,7 @@ def test_upload_from_file_failure(self):
             table.upload_from_file(
                 file_obj, source_format='CSV', rewind=True)
 
-        assert exc_info.value.message == response.content.decode('utf-8')
+        assert response.text in exc_info.value.message
         assert exc_info.value.errors == []
 
     def test_upload_from_file_bad_mode(self):
diff --git a/core/google/cloud/_helpers.py b/core/google/cloud/_helpers.py
index fdb22ecdf09c4..83f6db3a20fcd 100644
--- a/core/google/cloud/_helpers.py
+++ b/core/google/cloud/_helpers.py
@@ -25,12 +25,11 @@
 import re
 from threading import local as Local
 
-import google_auth_httplib2
-import httplib2
 import six
 from six.moves import http_client
 
 import google.auth
+import google.auth.transport.requests
 from google.protobuf import duration_pb2
 from google.protobuf import timestamp_pb2
 
@@ -550,7 +549,7 @@ def make_secure_channel(credentials, user_agent, host, extra_options=()):
     :returns: gRPC secure channel with credentials attached.
     """
     target = '%s:%d' % (host, http_client.HTTPS_PORT)
-    http_request = google_auth_httplib2.Request(http=httplib2.Http())
+    http_request = google.auth.transport.requests.Request()
 
     user_agent_option = ('grpc.primary_user_agent', user_agent)
     options = (user_agent_option,) + extra_options
diff --git a/core/google/cloud/_http.py b/core/google/cloud/_http.py
index b7c17ca91d6da..2a0a24e38006b 100644
--- a/core/google/cloud/_http.py
+++ b/core/google/cloud/_http.py
@@ -18,10 +18,9 @@
 import platform
 
 from pkg_resources import get_distribution
-import six
 from six.moves.urllib.parse import urlencode
 
-from google.cloud.exceptions import make_exception
+from google.cloud import exceptions
 
 
 API_BASE_URL = 'https://www.googleapis.com'
@@ -67,8 +66,9 @@ def credentials(self):
     def http(self):
         """A getter for the HTTP transport used in talking to the API.
 
-        :rtype: :class:`httplib2.Http`
-        :returns: A Http object used to transport data.
+        Returns:
+            google.auth.transport.requests.AuthorizedSession:
+                A :class:`requests.Session` instance.
         """
         return self._client._http
 
@@ -168,23 +168,13 @@ def _make_request(self, method, url, data=None, content_type=None,
             custom behavior, for example, to defer an HTTP request and complete
             initialization of the object at a later time.
 
-        :rtype: tuple of ``response`` (a dictionary of sorts)
-                and ``content`` (a string).
-        :returns: The HTTP response object and the content of the response,
-                  returned by :meth:`_do_request`.
+        :rtype: :class:`requests.Response`
+        :returns: The HTTP response.
         """
         headers = headers or {}
         headers.update(self._EXTRA_HEADERS)
         headers['Accept-Encoding'] = 'gzip'
 
-        if data:
-            content_length = len(str(data))
-        else:
-            content_length = 0
-
-        # NOTE: str is intended, bytes are sufficient for headers.
-        headers['Content-Length'] = str(content_length)
-
         if content_type:
             headers['Content-Type'] = content_type
 
@@ -215,12 +205,11 @@ def _do_request(self, method, url, headers, data,
             (Optional) Unused ``target_object`` here but may be used by a
             superclass.
 
-        :rtype: tuple of ``response`` (a dictionary of sorts)
-                and ``content`` (a string).
-        :returns: The HTTP response object and the content of the response.
+        :rtype: :class:`requests.Response`
+        :returns: The HTTP response.
         """
-        return self.http.request(uri=url, method=method, headers=headers,
-                                 body=data)
+        return self.http.request(
+            url=url, method=method, headers=headers, data=data)
 
     def api_request(self, method, path, query_params=None,
                     data=None, content_type=None, headers=None,
@@ -281,7 +270,7 @@ def api_request(self, method, path, query_params=None,
 
         :raises ~google.cloud.exceptions.GoogleCloudError: if the response code
             is not 200 OK.
-        :raises TypeError: if the response content type is not JSON.
+        :raises ValueError: if the response content type is not JSON.
         :rtype: dict or str
         :returns: The API response payload, either as a raw string or
                   a dictionary if the response is valid JSON.
@@ -296,21 +285,14 @@ def api_request(self, method, path, query_params=None,
             data = json.dumps(data)
             content_type = 'application/json'
 
-        response, content = self._make_request(
+        response = self._make_request(
             method=method, url=url, data=data, content_type=content_type,
             headers=headers, target_object=_target_object)
 
-        if not 200 <= response.status < 300:
-            raise make_exception(response, content,
-                                 error_info=method + ' ' + url)
+        if not 200 <= response.status_code < 300:
+            raise exceptions.from_http_response(response)
 
-        string_or_bytes = (six.binary_type, six.text_type)
-        if content and expect_json and isinstance(content, string_or_bytes):
-            content_type = response.get('content-type', '')
-            if not content_type.startswith('application/json'):
-                raise TypeError('Expected JSON, got %s' % content_type)
-            if isinstance(content, six.binary_type):
-                content = content.decode('utf-8')
-            return json.loads(content)
-
-        return content
+        if expect_json and response.content:
+            return response.json()
+        else:
+            return response.content
diff --git a/core/google/cloud/client.py b/core/google/cloud/client.py
index 468cf9e40a526..7403be71f5215 100644
--- a/core/google/cloud/client.py
+++ b/core/google/cloud/client.py
@@ -18,11 +18,11 @@
 import json
 from pickle import PicklingError
 
-import google_auth_httplib2
 import six
 
 import google.auth
 import google.auth.credentials
+import google.auth.transport.requests
 from google.cloud._helpers import _determine_default_project
 from google.oauth2 import service_account
 
@@ -87,36 +87,23 @@ class Client(_ClientFactoryMixin):
     Stores ``credentials`` and an HTTP object so that subclasses
     can pass them along to a connection class.
 
-    If no value is passed in for ``_http``, a :class:`httplib2.Http` object
+    If no value is passed in for ``_http``, a :class:`requests.Session` object
     will be created and authorized with the ``credentials``. If not, the
     ``credentials`` and ``_http`` need not be related.
 
     Callers and subclasses may seek to use the private key from
     ``credentials`` to sign data.
 
-    A custom (non-``httplib2``) HTTP object must have a ``request`` method
-    which accepts the following arguments:
-
-    * ``uri``
-    * ``method``
-    * ``body``
-    * ``headers``
-
-    In addition, ``redirections`` and ``connection_type`` may be used.
-
-    A custom ``_http`` object will also need to be able to add a bearer token
-    to API requests and handle token refresh on 401 errors.
-
     :type credentials: :class:`~google.auth.credentials.Credentials`
     :param credentials: (Optional) The OAuth2 Credentials to use for this
                         client. If not passed (and if no ``_http`` object is
                         passed), falls back to the default inferred from the
                         environment.
 
-    :type _http: :class:`~httplib2.Http`
+    :type _http: :class:`~requests.Session`
     :param _http: (Optional) HTTP object to make requests. Can be any object
                   that defines ``request()`` with the same interface as
-                  :meth:`~httplib2.Http.request`. If not passed, an
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
@@ -151,12 +138,13 @@ def __getstate__(self):
     def _http(self):
         """Getter for object used for HTTP transport.
 
-        :rtype: :class:`~httplib2.Http`
+        :rtype: :class:`~requests.Session`
         :returns: An HTTP object.
         """
         if self._http_internal is None:
-            self._http_internal = google_auth_httplib2.AuthorizedHttp(
-                self._credentials)
+            self._http_internal = (
+                google.auth.transport.requests.AuthorizedSession(
+                    self._credentials))
         return self._http_internal
 
 
@@ -204,10 +192,10 @@ class ClientWithProject(Client, _ClientProjectMixin):
                         passed), falls back to the default inferred from the
                         environment.
 
-    :type _http: :class:`~httplib2.Http`
+    :type _http: :class:`~requests.Session`
     :param _http: (Optional) HTTP object to make requests. Can be any object
                   that defines ``request()`` with the same interface as
-                  :meth:`~httplib2.Http.request`. If not passed, an
+                  :meth:`~requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/core/google/cloud/exceptions.py b/core/google/cloud/exceptions.py
index e911980c63284..2e7eca3be98dd 100644
--- a/core/google/cloud/exceptions.py
+++ b/core/google/cloud/exceptions.py
@@ -21,7 +21,6 @@
 from __future__ import absolute_import
 
 import copy
-import json
 
 import six
 
@@ -186,56 +185,55 @@ class GatewayTimeout(ServerError):
     code = 504
 
 
-def make_exception(response, content, error_info=None, use_json=True):
-    """Factory:  create exception based on HTTP response code.
+def from_http_status(status_code, message, errors=()):
+    """Create a :class:`GoogleCloudError` from an HTTP status code.
 
-    :type response: :class:`httplib2.Response` or other HTTP response object
-    :param response: A response object that defines a status code as the
-                     status attribute.
+    Args:
+        status_code (int): The HTTP status code.
+        message (str): The exception message.
+        errors (Sequence[Any]): A list of additional error information.
+
+    Returns:
+        GoogleCloudError: An instance of the appropriate subclass of
+            :class:`GoogleCloudError`.
+    """
+    error_class = _HTTP_CODE_TO_EXCEPTION.get(status_code, GoogleCloudError)
+    error = error_class(message, errors)
+
+    if error.code is None:
+        error.code = status_code
+
+    return error
 
-    :type content: str or dictionary
-    :param content: The body of the HTTP error response.
 
-    :type error_info: str
-    :param error_info: Optional string giving extra information about the
-                       failed request.
+def from_http_response(response):
+    """Create a :class:`GoogleCloudError` from a :class:`requests.Response`.
 
-    :type use_json: bool
-    :param use_json: Flag indicating if ``content`` is expected to be JSON.
+    Args:
+        response (requests.Response): The HTTP response.
 
-    :rtype: instance of :class:`GoogleCloudError`, or a concrete subclass.
-    :returns: Exception specific to the error response.
+    Returns:
+        GoogleCloudError: An instance of the appropriate subclass of
+            :class:`GoogleCloudError`, with the message and errors populated
+            from the response.
     """
-    if isinstance(content, six.binary_type):
-        content = content.decode('utf-8')
-
-    if isinstance(content, six.string_types):
-        payload = None
-        if use_json:
-            try:
-                payload = json.loads(content)
-            except ValueError:
-                # Expected JSON but received something else.
-                pass
-        if payload is None:
-            payload = {'error': {'message': content}}
-    else:
-        payload = content
-
-    message = payload.get('error', {}).get('message', '')
+    try:
+        payload = response.json()
+    except ValueError:
+        payload = {'error': {'message': response.text or 'unknown error'}}
+
+    error_message = payload.get('error', {}).get('message', 'unknown error')
     errors = payload.get('error', {}).get('errors', ())
 
-    if error_info is not None:
-        message += ' (%s)' % (error_info,)
+    message = '{method} {url}: {error}'.format(
+        method=response.request.method,
+        url=response.request.url,
+        error=error_message)
 
-    try:
-        klass = _HTTP_CODE_TO_EXCEPTION[response.status]
-    except KeyError:
-        error = GoogleCloudError(message, errors)
-        error.code = response.status
-    else:
-        error = klass(message, errors)
-    return error
+    exception = from_http_status(
+        response.status_code, message, errors=errors)
+    exception.response = response
+    return exception
 
 
 def _walk_subclasses(klass):
diff --git a/core/setup.py b/core/setup.py
index ba84f2347d188..2a221ffe04b9c 100644
--- a/core/setup.py
+++ b/core/setup.py
@@ -51,11 +51,10 @@
 
 
 REQUIREMENTS = [
-    'httplib2 >= 0.9.1',
     'googleapis-common-protos >= 1.3.4',
     'protobuf >= 3.0.0',
     'google-auth >= 0.4.0, < 2.0.0dev',
-    'google-auth-httplib2',
+    'requests >= 2.4.0, < 3.0.0dev',
     'six',
     'tenacity >= 4.0.0, <5.0.0dev'
 ]
diff --git a/core/tests/unit/test__http.py b/core/tests/unit/test__http.py
index 22df115668118..abf630b9a41fa 100644
--- a/core/tests/unit/test__http.py
+++ b/core/tests/unit/test__http.py
@@ -12,9 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import json
 import unittest
 
 import mock
+import requests
+from six.moves import http_client
 
 
 class TestConnection(unittest.TestCase):
@@ -52,7 +55,24 @@ def test_user_agent_format(self):
         self.assertEqual(conn.USER_AGENT, expected_ua)
 
 
+def make_response(status=http_client.OK, content=b'', headers={}):
+    response = requests.Response()
+    response.status_code = status
+    response._content = content
+    response.headers = headers
+    response.request = requests.Request()
+    return response
+
+
+def make_requests_session(responses):
+    session = mock.create_autospec(requests.Session, instance=True)
+    session.request.side_effect = responses
+    return session
+
+
 class TestJSONConnection(unittest.TestCase):
+    JSON_HEADERS = {'content-type': 'application/json'}
+    EMPTY_JSON_RESPONSE = make_response(content=b'{}', headers=JSON_HEADERS)
 
     @staticmethod
     def _get_target_class():
@@ -119,129 +139,123 @@ def test_build_api_url_w_extra_query_params(self):
         self.assertEqual(parms['qux'], ['quux', 'corge'])
 
     def test__make_request_no_data_no_content_type_no_headers(self):
-        http = _Http(
-            {'status': '200', 'content-type': 'text/plain'},
-            b'',
-        )
+        http = make_requests_session([make_response()])
         client = mock.Mock(_http=http, spec=['_http'])
         conn = self._make_one(client)
-        URI = 'http://example.com/test'
-        headers, content = conn._make_request('GET', URI)
-        self.assertEqual(headers['status'], '200')
-        self.assertEqual(headers['content-type'], 'text/plain')
-        self.assertEqual(content, b'')
-        self.assertEqual(http._called_with['method'], 'GET')
-        self.assertEqual(http._called_with['uri'], URI)
-        self.assertIsNone(http._called_with['body'])
+        url = 'http://example.com/test'
+
+        response = conn._make_request('GET', url)
+
+        self.assertEqual(response.status_code, http_client.OK)
+        self.assertEqual(response.content, b'')
+
         expected_headers = {
             'Accept-Encoding': 'gzip',
-            'Content-Length': '0',
             'User-Agent': conn.USER_AGENT,
         }
-        self.assertEqual(http._called_with['headers'], expected_headers)
+        http.request.assert_called_once_with(
+            method='GET', url=url, headers=expected_headers, data=None)
 
     def test__make_request_w_data_no_extra_headers(self):
-        http = _Http(
-            {'status': '200', 'content-type': 'text/plain'},
-            b'',
-        )
+        http = make_requests_session([make_response()])
         client = mock.Mock(_http=http, spec=['_http'])
         conn = self._make_one(client)
-        URI = 'http://example.com/test'
-        conn._make_request('GET', URI, {}, 'application/json')
-        self.assertEqual(http._called_with['method'], 'GET')
-        self.assertEqual(http._called_with['uri'], URI)
-        self.assertEqual(http._called_with['body'], {})
+        url = 'http://example.com/test'
+        data = b'data'
+
+        conn._make_request('GET', url, data, 'application/json')
+
         expected_headers = {
             'Accept-Encoding': 'gzip',
-            'Content-Length': '0',
             'Content-Type': 'application/json',
             'User-Agent': conn.USER_AGENT,
         }
-        self.assertEqual(http._called_with['headers'], expected_headers)
+        http.request.assert_called_once_with(
+            method='GET', url=url, headers=expected_headers, data=data)
 
     def test__make_request_w_extra_headers(self):
-        http = _Http(
-            {'status': '200', 'content-type': 'text/plain'},
-            b'',
-        )
+        http = make_requests_session([make_response()])
         client = mock.Mock(_http=http, spec=['_http'])
         conn = self._make_one(client)
-        URI = 'http://example.com/test'
-        conn._make_request('GET', URI, headers={'X-Foo': 'foo'})
-        self.assertEqual(http._called_with['method'], 'GET')
-        self.assertEqual(http._called_with['uri'], URI)
-        self.assertIsNone(http._called_with['body'])
+
+        url = 'http://example.com/test'
+        conn._make_request('GET', url, headers={'X-Foo': 'foo'})
+
         expected_headers = {
             'Accept-Encoding': 'gzip',
-            'Content-Length': '0',
             'X-Foo': 'foo',
             'User-Agent': conn.USER_AGENT,
         }
-        self.assertEqual(http._called_with['headers'], expected_headers)
+        http.request.assert_called_once_with(
+            method='GET', url=url, headers=expected_headers, data=None)
 
     def test_api_request_defaults(self):
-        http = _Http(
-            {'status': '200', 'content-type': 'application/json'},
-            b'{}',
-        )
+        http = make_requests_session([
+            make_response(content=b'{}', headers=self.JSON_HEADERS)])
         client = mock.Mock(_http=http, spec=['_http'])
         conn = self._make_mock_one(client)
-        PATH = '/path/required'
-        # Intended to emulate self.mock_template
-        URI = '/'.join([
-            conn.API_BASE_URL,
-            'mock',
-            '%s%s' % (conn.API_VERSION, PATH),
-        ])
-        self.assertEqual(conn.api_request('GET', PATH), {})
-        self.assertEqual(http._called_with['method'], 'GET')
-        self.assertEqual(http._called_with['uri'], URI)
-        self.assertIsNone(http._called_with['body'])
+        path = '/path/required'
+
+        self.assertEqual(conn.api_request('GET', path), {})
+
         expected_headers = {
             'Accept-Encoding': 'gzip',
-            'Content-Length': '0',
             'User-Agent': conn.USER_AGENT,
         }
-        self.assertEqual(http._called_with['headers'], expected_headers)
+        expected_url = '{base}/mock/{version}{path}'.format(
+            base=conn.API_BASE_URL,
+            version=conn.API_VERSION,
+            path=path)
+        http.request.assert_called_once_with(
+            method='GET',
+            url=expected_url,
+            headers=expected_headers,
+            data=None)
 
     def test_api_request_w_non_json_response(self):
-        http = _Http(
-            {'status': '200', 'content-type': 'text/plain'},
-            b'CONTENT',
-        )
+        http = make_requests_session([
+            make_response(content=b'content')])
         client = mock.Mock(_http=http, spec=['_http'])
         conn = self._make_mock_one(client)
 
-        self.assertRaises(TypeError, conn.api_request, 'GET', '/')
+        with self.assertRaises(ValueError):
+            conn.api_request('GET', '/')
 
     def test_api_request_wo_json_expected(self):
-        http = _Http(
-            {'status': '200', 'content-type': 'text/plain'},
-            b'CONTENT',
-        )
+        http = make_requests_session([
+            make_response(content=b'content')])
         client = mock.Mock(_http=http, spec=['_http'])
         conn = self._make_mock_one(client)
-        self.assertEqual(conn.api_request('GET', '/', expect_json=False),
-                         b'CONTENT')
+
+        result = conn.api_request('GET', '/', expect_json=False)
+
+        self.assertEqual(result, b'content')
 
     def test_api_request_w_query_params(self):
         from six.moves.urllib.parse import parse_qs
         from six.moves.urllib.parse import urlsplit
 
-        http = _Http(
-            {'status': '200', 'content-type': 'application/json'},
-            b'{}',
-        )
+        http = make_requests_session([self.EMPTY_JSON_RESPONSE])
         client = mock.Mock(_http=http, spec=['_http'])
         conn = self._make_mock_one(client)
-        self.assertEqual(conn.api_request('GET', '/', {
+
+        result = conn.api_request('GET', '/', {
             'foo': 'bar',
             'baz': ['qux', 'quux']
-        }), {})
-        self.assertEqual(http._called_with['method'], 'GET')
-        uri = http._called_with['uri']
-        scheme, netloc, path, qs, _ = urlsplit(uri)
+        })
+
+        self.assertEqual(result, {})
+
+        expected_headers = {
+            'Accept-Encoding': 'gzip',
+            'User-Agent': conn.USER_AGENT,
+        }
+        http.request.assert_called_once_with(
+            method='GET', url=mock.ANY, headers=expected_headers,
+            data=None)
+
+        url = http.request.call_args[1]['url']
+        scheme, netloc, path, qs, _ = urlsplit(url)
         self.assertEqual('%s://%s' % (scheme, netloc), conn.API_BASE_URL)
         # Intended to emulate self.mock_template
         PATH = '/'.join([
@@ -254,175 +268,84 @@ def test_api_request_w_query_params(self):
         parms = dict(parse_qs(qs))
         self.assertEqual(parms['foo'], ['bar'])
         self.assertEqual(parms['baz'], ['qux', 'quux'])
-        self.assertIsNone(http._called_with['body'])
-        expected_headers = {
-            'Accept-Encoding': 'gzip',
-            'Content-Length': '0',
-            'User-Agent': conn.USER_AGENT,
-        }
-        self.assertEqual(http._called_with['headers'], expected_headers)
 
     def test_api_request_w_headers(self):
-        from six.moves.urllib.parse import urlsplit
-
-        http = _Http(
-            {'status': '200', 'content-type': 'application/json'},
-            b'{}',
-        )
+        http = make_requests_session([self.EMPTY_JSON_RESPONSE])
         client = mock.Mock(_http=http, spec=['_http'])
         conn = self._make_mock_one(client)
-        self.assertEqual(
-            conn.api_request('GET', '/', headers={'X-Foo': 'bar'}), {})
-        self.assertEqual(http._called_with['method'], 'GET')
-        uri = http._called_with['uri']
-        scheme, netloc, path, qs, _ = urlsplit(uri)
-        self.assertEqual('%s://%s' % (scheme, netloc), conn.API_BASE_URL)
-        # Intended to emulate self.mock_template
-        PATH = '/'.join([
-            '',
-            'mock',
-            conn.API_VERSION,
-            '',
-        ])
-        self.assertEqual(path, PATH)
-        self.assertEqual(qs, '')
-        self.assertIsNone(http._called_with['body'])
+
+        result = conn.api_request('GET', '/', headers={'X-Foo': 'bar'})
+        self.assertEqual(result, {})
+
         expected_headers = {
             'Accept-Encoding': 'gzip',
-            'Content-Length': '0',
             'User-Agent': conn.USER_AGENT,
             'X-Foo': 'bar',
         }
-        self.assertEqual(http._called_with['headers'], expected_headers)
+        http.request.assert_called_once_with(
+            method='GET', url=mock.ANY, headers=expected_headers,
+            data=None)
 
     def test_api_request_w_extra_headers(self):
-        from six.moves.urllib.parse import urlsplit
-
-        http = _Http(
-            {'status': '200', 'content-type': 'application/json'},
-            b'{}',
-        )
+        http = make_requests_session([self.EMPTY_JSON_RESPONSE])
         client = mock.Mock(_http=http, spec=['_http'])
         conn = self._make_mock_one(client)
         conn._EXTRA_HEADERS = {
             'X-Baz': 'dax-quux',
             'X-Foo': 'not-bar',  # Collision with ``headers``.
         }
-        self.assertEqual(
-            conn.api_request('GET', '/', headers={'X-Foo': 'bar'}), {})
-        self.assertEqual(http._called_with['method'], 'GET')
-        uri = http._called_with['uri']
-        scheme, netloc, path, qs, _ = urlsplit(uri)
-        self.assertEqual('%s://%s' % (scheme, netloc), conn.API_BASE_URL)
-        # Intended to emulate self.mock_template
-        PATH = '/'.join([
-            '',
-            'mock',
-            conn.API_VERSION,
-            '',
-        ])
-        self.assertEqual(path, PATH)
-        self.assertEqual(qs, '')
-        self.assertIsNone(http._called_with['body'])
+
+        result = conn.api_request('GET', '/', headers={'X-Foo': 'bar'})
+
+        self.assertEqual(result, {})
+
         expected_headers = {
             'Accept-Encoding': 'gzip',
-            'Content-Length': '0',
             'User-Agent': conn.USER_AGENT,
             'X-Foo': 'not-bar',  # The one passed-in is overridden.
             'X-Baz': 'dax-quux',
         }
-        self.assertEqual(http._called_with['headers'], expected_headers)
+        http.request.assert_called_once_with(
+            method='GET', url=mock.ANY, headers=expected_headers,
+            data=None)
 
     def test_api_request_w_data(self):
-        import json
-
-        DATA = {'foo': 'bar'}
-        DATAJ = json.dumps(DATA)
-        http = _Http(
-            {'status': '200', 'content-type': 'application/json'},
-            b'{}',
-        )
+        http = make_requests_session([self.EMPTY_JSON_RESPONSE])
         client = mock.Mock(_http=http, spec=['_http'])
         conn = self._make_mock_one(client)
-        # Intended to emulate self.mock_template
-        URI = '/'.join([
-            conn.API_BASE_URL,
-            'mock',
-            conn.API_VERSION,
-            '',
-        ])
-        self.assertEqual(conn.api_request('POST', '/', data=DATA), {})
-        self.assertEqual(http._called_with['method'], 'POST')
-        self.assertEqual(http._called_with['uri'], URI)
-        self.assertEqual(http._called_with['body'], DATAJ)
+
+        data = {'foo': 'bar'}
+        self.assertEqual(conn.api_request('POST', '/', data=data), {})
+
+        expected_data = json.dumps(data)
+
         expected_headers = {
             'Accept-Encoding': 'gzip',
-            'Content-Length': str(len(DATAJ)),
             'Content-Type': 'application/json',
             'User-Agent': conn.USER_AGENT,
         }
-        self.assertEqual(http._called_with['headers'], expected_headers)
+
+        http.request.assert_called_once_with(
+            method='POST', url=mock.ANY, headers=expected_headers,
+            data=expected_data)
 
     def test_api_request_w_404(self):
-        from google.cloud.exceptions import NotFound
+        from google.cloud import exceptions
 
-        http = _Http(
-            {'status': '404', 'content-type': 'text/plain'},
-            b'{}'
-        )
+        http = make_requests_session([make_response(http_client.NOT_FOUND)])
         client = mock.Mock(_http=http, spec=['_http'])
         conn = self._make_mock_one(client)
-        self.assertRaises(NotFound, conn.api_request, 'GET', '/')
 
-    def test_api_request_w_500(self):
-        from google.cloud.exceptions import InternalServerError
+        with self.assertRaises(exceptions.NotFound):
+            conn.api_request('GET', '/')
 
-        http = _Http(
-            {'status': '500', 'content-type': 'text/plain'},
-            b'{}',
-        )
-        client = mock.Mock(_http=http, spec=['_http'])
-        conn = self._make_mock_one(client)
-        self.assertRaises(InternalServerError, conn.api_request, 'GET', '/')
+    def test_api_request_w_500(self):
+        from google.cloud import exceptions
 
-    def test_api_request_non_binary_response(self):
-        http = _Http(
-            {'status': '200', 'content-type': 'application/json'},
-            u'{}',
-        )
+        http = make_requests_session([
+            make_response(http_client.INTERNAL_SERVER_ERROR)])
         client = mock.Mock(_http=http, spec=['_http'])
         conn = self._make_mock_one(client)
 
-        result = conn.api_request('GET', '/')
-        # Intended to emulate self.mock_template
-        URI = '/'.join([
-            conn.API_BASE_URL,
-            'mock',
-            conn.API_VERSION,
-            '',
-        ])
-        self.assertEqual(result, {})
-        self.assertEqual(http._called_with['method'], 'GET')
-        self.assertEqual(http._called_with['uri'], URI)
-        self.assertIsNone(http._called_with['body'])
-        expected_headers = {
-            'Accept-Encoding': 'gzip',
-            'Content-Length': '0',
-            'User-Agent': conn.USER_AGENT,
-        }
-        self.assertEqual(http._called_with['headers'], expected_headers)
-
-
-class _Http(object):
-
-    _called_with = None
-
-    def __init__(self, headers, content):
-        from httplib2 import Response
-
-        self._response = Response(headers)
-        self._content = content
-
-    def request(self, **kw):
-        self._called_with = kw
-        return self._response, self._content
+        with self.assertRaises(exceptions.InternalServerError):
+            conn.api_request('GET', '/')
diff --git a/core/tests/unit/test_client.py b/core/tests/unit/test_client.py
index 25667712c69a9..bed3ebe2c0369 100644
--- a/core/tests/unit/test_client.py
+++ b/core/tests/unit/test_client.py
@@ -132,17 +132,17 @@ def test__http_property_new(self):
         client = self._make_one(credentials=credentials)
         self.assertIsNone(client._http_internal)
 
-        patch = mock.patch('google_auth_httplib2.AuthorizedHttp',
-                           return_value=mock.sentinel.http)
-        with patch as mocked:
+        authorized_session_patch = mock.patch(
+            'google.auth.transport.requests.AuthorizedSession',
+            return_value=mock.sentinel.http)
+        with authorized_session_patch as AuthorizedSession:
             self.assertIs(client._http, mock.sentinel.http)
             # Check the mock.
-            mocked.assert_called_once_with(credentials)
-            self.assertEqual(mocked.call_count, 1)
+            AuthorizedSession.assert_called_once_with(credentials)
             # Make sure the cached value is used on subsequent access.
             self.assertIs(client._http_internal, mock.sentinel.http)
             self.assertIs(client._http, mock.sentinel.http)
-            self.assertEqual(mocked.call_count, 1)
+            self.assertEqual(AuthorizedSession.call_count, 1)
 
 
 class TestClientWithProject(unittest.TestCase):
diff --git a/core/tests/unit/test_exceptions.py b/core/tests/unit/test_exceptions.py
index b3488296eff46..4be2608318250 100644
--- a/core/tests/unit/test_exceptions.py
+++ b/core/tests/unit/test_exceptions.py
@@ -12,139 +12,116 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest
+import json
 
+import requests
+from six.moves import http_client
 
-class Test_GoogleCloudError(unittest.TestCase):
+from google.cloud import exceptions
 
-    @staticmethod
-    def _get_target_class():
-        from google.cloud.exceptions import GoogleCloudError
 
-        return GoogleCloudError
+def test_create_google_cloud_error():
+    exception = exceptions.GoogleCloudError('Testing')
+    exception.code = 600
+    assert str(exception) == '600 Testing'
+    assert exception.message == 'Testing'
+    assert exception.errors == []
 
-    def _make_one(self, message, errors=()):
-        return self._get_target_class()(message, errors=errors)
 
-    def test_ctor_defaults(self):
-        e = self._make_one('Testing')
-        e.code = 600
-        self.assertEqual(str(e), '600 Testing')
-        self.assertEqual(e.message, 'Testing')
-        self.assertEqual(list(e.errors), [])
+def test_create_google_cloud_error_with_args():
+    error = {
+        'domain': 'global',
+        'location': 'test',
+        'locationType': 'testing',
+        'message': 'Testing',
+        'reason': 'test',
+    }
+    exception = exceptions.GoogleCloudError('Testing', [error])
+    exception.code = 600
+    assert str(exception) == '600 Testing'
+    assert exception.message == 'Testing'
+    assert exception.errors == [error]
 
-    def test_ctor_explicit(self):
-        ERROR = {
-            'domain': 'global',
-            'location': 'test',
-            'locationType': 'testing',
-            'message': 'Testing',
-            'reason': 'test',
-        }
-        e = self._make_one('Testing', [ERROR])
-        e.code = 600
-        self.assertEqual(str(e), '600 Testing')
-        self.assertEqual(e.message, 'Testing')
-        self.assertEqual(list(e.errors), [ERROR])
-
-
-class Test_make_exception(unittest.TestCase):
-
-    def _call_fut(self, response, content, error_info=None, use_json=True):
-        from google.cloud.exceptions import make_exception
-
-        return make_exception(response, content, error_info=error_info,
-                              use_json=use_json)
-
-    def test_hit_w_content_as_str(self):
-        from google.cloud.exceptions import NotFound
-
-        response = _Response(404)
-        content = b'{"error": {"message": "Not Found"}}'
-        exception = self._call_fut(response, content)
-        self.assertIsInstance(exception, NotFound)
-        self.assertEqual(exception.message, 'Not Found')
-        self.assertEqual(list(exception.errors), [])
-
-    def test_hit_w_content_as_unicode(self):
-        import six
-        from google.cloud._helpers import _to_bytes
-        from google.cloud.exceptions import NotFound
-
-        error_message = u'That\u2019s not found.'
-        expected = u'404 %s' % (error_message,)
-
-        response = _Response(404)
-        content = u'{"error": {"message": "%s" }}' % (error_message,)
-
-        exception = self._call_fut(response, content)
-        if six.PY2:
-            self.assertEqual(str(exception),
-                             _to_bytes(expected, encoding='utf-8'))
-        else:  # pragma: NO COVER
-            self.assertEqual(str(exception), expected)
-
-        self.assertIsInstance(exception, NotFound)
-        self.assertEqual(exception.message, error_message)
-        self.assertEqual(list(exception.errors), [])
-
-    def test_hit_w_content_as_unicode_as_py3(self):
-        import six
-        from google.cloud._testing import _Monkey
-        from google.cloud.exceptions import NotFound
-
-        error_message = u'That is not found.'
-        expected = u'404 %s' % (error_message,)
-
-        with _Monkey(six, PY2=False):
-            response = _Response(404)
-            content = u'{"error": {"message": "%s" }}' % (error_message,)
-            exception = self._call_fut(response, content)
-
-            self.assertIsInstance(exception, NotFound)
-            self.assertEqual(exception.message, error_message)
-            self.assertEqual(list(exception.errors), [])
-            self.assertEqual(str(exception), expected)
-
-    def test_miss_w_content_as_dict(self):
-        from google.cloud.exceptions import GoogleCloudError
-
-        ERROR = {
-            'domain': 'global',
-            'location': 'test',
-            'locationType': 'testing',
-            'message': 'Testing',
-            'reason': 'test',
+
+def test_from_http_status():
+    message = 'message'
+    exception = exceptions.from_http_status(http_client.NOT_FOUND, message)
+    assert exception.code == http_client.NOT_FOUND
+    assert exception.message == message
+    assert exception.errors == []
+
+
+def test_from_http_status_with_errors():
+    message = 'message'
+    errors = ['1', '2']
+    exception = exceptions.from_http_status(
+        http_client.NOT_FOUND, message, errors=errors)
+
+    assert isinstance(exception, exceptions.NotFound)
+    assert exception.code == http_client.NOT_FOUND
+    assert exception.message == message
+    assert exception.errors == errors
+
+
+def test_from_http_status_unknown_code():
+    message = 'message'
+    status_code = 156
+    exception = exceptions.from_http_status(status_code, message)
+    assert exception.code == status_code
+    assert exception.message == message
+
+
+def make_response(content):
+    response = requests.Response()
+    response._content = content
+    response.status_code = http_client.NOT_FOUND
+    response.request = requests.Request(
+        method='POST', url='https://example.com').prepare()
+    return response
+
+
+def test_from_http_response_no_content():
+    response = make_response(None)
+
+    exception = exceptions.from_http_response(response)
+
+    assert isinstance(exception, exceptions.NotFound)
+    assert exception.code == http_client.NOT_FOUND
+    assert exception.message == 'POST https://example.com/: unknown error'
+    assert exception.response == response
+
+
+def test_from_http_response_text_content():
+    response = make_response(b'message')
+
+    exception = exceptions.from_http_response(response)
+
+    assert isinstance(exception, exceptions.NotFound)
+    assert exception.code == http_client.NOT_FOUND
+    assert exception.message == 'POST https://example.com/: message'
+
+
+def test_from_http_response_json_content():
+    response = make_response(json.dumps({
+        'error': {
+            'message': 'json message',
+            'errors': ['1', '2']
         }
-        response = _Response(600)
-        content = {"error": {"message": "Unknown Error", "errors": [ERROR]}}
-        exception = self._call_fut(response, content)
-        self.assertIsInstance(exception, GoogleCloudError)
-        self.assertEqual(exception.message, 'Unknown Error')
-        self.assertEqual(list(exception.errors), [ERROR])
-
-    def test_html_when_json_expected(self):
-        from google.cloud.exceptions import NotFound
-
-        response = _Response(NotFound.code)
-        content = '<html><body>404 Not Found</body></html>'
-        exception = self._call_fut(response, content, use_json=True)
-        self.assertIsInstance(exception, NotFound)
-        self.assertEqual(exception.message, content)
-        self.assertEqual(list(exception.errors), [])
-
-    def test_without_use_json(self):
-        from google.cloud.exceptions import TooManyRequests
-
-        content = u'error-content'
-        response = _Response(TooManyRequests.code)
-        exception = self._call_fut(response, content, use_json=False)
-
-        self.assertIsInstance(exception, TooManyRequests)
-        self.assertEqual(exception.message, content)
-        self.assertEqual(list(exception.errors), [])
-
-
-class _Response(object):
-    def __init__(self, status):
-        self.status = status
+    }).encode('utf-8'))
+
+    exception = exceptions.from_http_response(response)
+
+    assert isinstance(exception, exceptions.NotFound)
+    assert exception.code == http_client.NOT_FOUND
+    assert exception.message == 'POST https://example.com/: json message'
+    assert exception.errors == ['1', '2']
+
+
+def test_from_http_response_bad_json_content():
+    response = make_response(json.dumps({'meep': 'moop'}).encode('utf-8'))
+
+    exception = exceptions.from_http_response(response)
+
+    assert isinstance(exception, exceptions.NotFound)
+    assert exception.code == http_client.NOT_FOUND
+    assert exception.message == 'POST https://example.com/: unknown error'
diff --git a/datastore/google/cloud/datastore/_http.py b/datastore/google/cloud/datastore/_http.py
index 0723a97a0de4d..de976f7e1bb3b 100644
--- a/datastore/google/cloud/datastore/_http.py
+++ b/datastore/google/cloud/datastore/_http.py
@@ -39,7 +39,7 @@
 def _request(http, project, method, data, base_url):
     """Make a request over the Http transport to the Cloud Datastore API.
 
-    :type http: :class:`~httplib2.Http`
+    :type http: :class:`requests.Session`
     :param http: HTTP object to make requests.
 
     :type project: str
@@ -63,27 +63,26 @@ def _request(http, project, method, data, base_url):
     """
     headers = {
         'Content-Type': 'application/x-protobuf',
-        'Content-Length': str(len(data)),
         'User-Agent': connection_module.DEFAULT_USER_AGENT,
         connection_module.CLIENT_INFO_HEADER: _CLIENT_INFO,
     }
     api_url = build_api_url(project, method, base_url)
-    headers, content = http.request(
-        uri=api_url, method='POST', headers=headers, body=data)
 
-    status = headers['status']
-    if status != '200':
-        error_status = status_pb2.Status.FromString(content)
-        raise exceptions.make_exception(
-            headers, error_status.message, use_json=False)
+    response = http.request(
+        url=api_url, method='POST', headers=headers, data=data)
 
-    return content
+    if response.status_code != 200:
+        error_status = status_pb2.Status.FromString(response.content)
+        raise exceptions.from_http_status(
+            response.status_code, error_status.message, errors=[error_status])
+
+    return response.content
 
 
 def _rpc(http, project, method, base_url, request_pb, response_pb_cls):
     """Make a protobuf RPC request.
 
-    :type http: :class:`~httplib2.Http`
+    :type http: :class:`requests.Session`
     :param http: HTTP object to make requests.
 
     :type project: str
diff --git a/datastore/google/cloud/datastore/client.py b/datastore/google/cloud/datastore/client.py
index af7d6d4f91139..0ccef9f5f8f02 100644
--- a/datastore/google/cloud/datastore/client.py
+++ b/datastore/google/cloud/datastore/client.py
@@ -177,10 +177,10 @@ class Client(ClientWithProject):
                         passed), falls back to the default inferred from the
                         environment.
 
-    :type _http: :class:`~httplib2.Http`
+    :type _http: :class:`~requests.Session`
     :param _http: (Optional) HTTP object to make requests. Can be any object
                   that defines ``request()`` with the same interface as
-                  :meth:`~httplib2.Http.request`. If not passed, an
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/datastore/tests/system/test_system.py b/datastore/tests/system/test_system.py
index 129018748e08a..b33f7de21925c 100644
--- a/datastore/tests/system/test_system.py
+++ b/datastore/tests/system/test_system.py
@@ -16,7 +16,7 @@
 import os
 import unittest
 
-import httplib2
+import requests
 import six
 
 from google.cloud._helpers import UTC
@@ -57,7 +57,7 @@ def setUpModule():
         Config.CLIENT = datastore.Client(namespace=test_namespace)
     else:
         credentials = EmulatorCreds()
-        http = httplib2.Http()  # Un-authorized.
+        http = requests.Session()  # Un-authorized.
         Config.CLIENT = datastore.Client(project=emulator_dataset,
                                          namespace=test_namespace,
                                          credentials=credentials,
diff --git a/datastore/tests/unit/test__http.py b/datastore/tests/unit/test__http.py
index db364ec4dd613..c416cd36671a7 100644
--- a/datastore/tests/unit/test__http.py
+++ b/datastore/tests/unit/test__http.py
@@ -15,6 +15,9 @@
 import unittest
 
 import mock
+from six.moves import http_client
+
+import requests
 
 
 class Test__request(unittest.TestCase):
@@ -32,29 +35,25 @@ def test_success(self):
         project = 'PROJECT'
         method = 'METHOD'
         data = b'DATA'
-        uri = 'http://api-url'
-
-        # Make mock HTTP object with canned response.
+        base_url = 'http://api-url'
         response_data = 'CONTENT'
-        http = Http({'status': '200'}, response_data)
+
+        http = _make_requests_session([_make_response(content=response_data)])
 
         # Call actual function under test.
-        response = self._call_fut(http, project, method, data, uri)
+        response = self._call_fut(http, project, method, data, base_url)
         self.assertEqual(response, response_data)
 
         # Check that the mocks were called as expected.
-        called_with = http._called_with
-        self.assertEqual(len(called_with), 4)
-        self.assertTrue(called_with['uri'].startswith(uri))
-        self.assertEqual(called_with['method'], 'POST')
+        expected_url = _build_expected_url(base_url, project, method)
         expected_headers = {
             'Content-Type': 'application/x-protobuf',
             'User-Agent': connection_module.DEFAULT_USER_AGENT,
-            'Content-Length': '4',
             connection_module.CLIENT_INFO_HEADER: _CLIENT_INFO,
         }
-        self.assertEqual(called_with['headers'], expected_headers)
-        self.assertEqual(called_with['body'], data)
+        http.request.assert_called_once_with(
+            method='POST', url=expected_url, headers=expected_headers,
+            data=data)
 
     def test_failure(self):
         from google.cloud.exceptions import BadRequest
@@ -66,17 +65,19 @@ def test_failure(self):
         data = 'DATA'
         uri = 'http://api-url'
 
-        # Make mock HTTP object with canned response.
         error = status_pb2.Status()
         error.message = 'Entity value is indexed.'
         error.code = code_pb2.FAILED_PRECONDITION
-        http = Http({'status': '400'}, error.SerializeToString())
 
-        # Call actual function under test.
+        http = _make_requests_session([
+            _make_response(
+                http_client.BAD_REQUEST,
+                content=error.SerializeToString())
+        ])
+
         with self.assertRaises(BadRequest) as exc:
             self._call_fut(http, project, method, data, uri)
 
-        # Check that the mocks were called as expected.
         expected_message = '400 Entity value is indexed.'
         self.assertEqual(str(exc.exception), expected_message)
 
@@ -147,7 +148,8 @@ def test_lookup_single_key_empty_response(self):
         read_options = datastore_pb2.ReadOptions()
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -161,10 +163,9 @@ def test_lookup_single_key_empty_response(self):
         self.assertEqual(len(response.found), 0)
         self.assertEqual(len(response.missing), 0)
         self.assertEqual(len(response.deferred), 0)
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        request = datastore_pb2.LookupRequest()
-        request.ParseFromString(cw['body'])
+
+        request = _verify_protobuf_call(
+            http, uri, datastore_pb2.LookupRequest())
         self.assertEqual(list(request.keys), [key_pb])
         self.assertEqual(request.read_options, read_options)
 
@@ -178,7 +179,8 @@ def test_lookup_single_key_empty_response_w_eventual(self):
             read_consistency=datastore_pb2.ReadOptions.EVENTUAL)
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -192,10 +194,9 @@ def test_lookup_single_key_empty_response_w_eventual(self):
         self.assertEqual(len(response.found), 0)
         self.assertEqual(len(response.missing), 0)
         self.assertEqual(len(response.deferred), 0)
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        request = datastore_pb2.LookupRequest()
-        request.ParseFromString(cw['body'])
+
+        request = _verify_protobuf_call(
+            http, uri, datastore_pb2.LookupRequest())
         self.assertEqual(list(request.keys), [key_pb])
         self.assertEqual(request.read_options, read_options)
 
@@ -209,7 +210,8 @@ def test_lookup_single_key_empty_response_w_transaction(self):
         read_options = datastore_pb2.ReadOptions(transaction=transaction)
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -223,10 +225,9 @@ def test_lookup_single_key_empty_response_w_transaction(self):
         self.assertEqual(len(response.found), 0)
         self.assertEqual(len(response.missing), 0)
         self.assertEqual(len(response.deferred), 0)
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        request = datastore_pb2.LookupRequest()
-        request.ParseFromString(cw['body'])
+
+        request = _verify_protobuf_call(
+            http, uri, datastore_pb2.LookupRequest())
         self.assertEqual(list(request.keys), [key_pb])
         self.assertEqual(request.read_options, read_options)
 
@@ -243,7 +244,8 @@ def test_lookup_single_key_nonempty_response(self):
         read_options = datastore_pb2.ReadOptions()
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -260,10 +262,9 @@ def test_lookup_single_key_nonempty_response(self):
         found = response.found[0].entity
         self.assertEqual(found.key.path[0].kind, 'Kind')
         self.assertEqual(found.key.path[0].id, 1234)
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        request = datastore_pb2.LookupRequest()
-        request.ParseFromString(cw['body'])
+
+        request = _verify_protobuf_call(
+            http, uri, datastore_pb2.LookupRequest())
         self.assertEqual(list(request.keys), [key_pb])
         self.assertEqual(request.read_options, read_options)
 
@@ -277,7 +278,8 @@ def test_lookup_multiple_keys_empty_response(self):
         read_options = datastore_pb2.ReadOptions()
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -291,10 +293,9 @@ def test_lookup_multiple_keys_empty_response(self):
         self.assertEqual(len(response.found), 0)
         self.assertEqual(len(response.missing), 0)
         self.assertEqual(len(response.deferred), 0)
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        request = datastore_pb2.LookupRequest()
-        request.ParseFromString(cw['body'])
+
+        request = _verify_protobuf_call(
+            http, uri, datastore_pb2.LookupRequest())
         self.assertEqual(list(request.keys), [key_pb1, key_pb2])
         self.assertEqual(request.read_options, read_options)
 
@@ -312,7 +313,8 @@ def test_lookup_multiple_keys_w_missing(self):
         read_options = datastore_pb2.ReadOptions()
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -327,17 +329,14 @@ def test_lookup_multiple_keys_w_missing(self):
         self.assertEqual(len(response.deferred), 0)
         missing_keys = [result.entity.key for result in response.missing]
         self.assertEqual(missing_keys, [key_pb1, key_pb2])
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        request = datastore_pb2.LookupRequest()
-        request.ParseFromString(cw['body'])
+
+        request = _verify_protobuf_call(
+            http, uri, datastore_pb2.LookupRequest())
         self.assertEqual(list(request.keys), [key_pb1, key_pb2])
         self.assertEqual(request.read_options, read_options)
 
     def test_lookup_multiple_keys_w_deferred(self):
         from google.cloud.proto.datastore.v1 import datastore_pb2
-        from google.cloud import _http as connection_module
-        from google.cloud.datastore._http import _CLIENT_INFO
 
         project = 'PROJECT'
         key_pb1 = _make_key_pb(project)
@@ -348,7 +347,8 @@ def test_lookup_multiple_keys_w_deferred(self):
         read_options = datastore_pb2.ReadOptions()
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -362,19 +362,9 @@ def test_lookup_multiple_keys_w_deferred(self):
         self.assertEqual(len(response.found), 0)
         self.assertEqual(len(response.missing), 0)
         self.assertEqual(list(response.deferred), [key_pb1, key_pb2])
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        self.assertEqual(cw['uri'], uri)
-        self.assertEqual(cw['method'], 'POST')
-        expected_headers = {
-            'Content-Type': 'application/x-protobuf',
-            'User-Agent': connection_module.DEFAULT_USER_AGENT,
-            'Content-Length': str(len(cw['body'])),
-            connection_module.CLIENT_INFO_HEADER: _CLIENT_INFO,
-        }
-        self.assertEqual(cw['headers'], expected_headers)
-        request = datastore_pb2.LookupRequest()
-        request.ParseFromString(cw['body'])
+
+        request = _verify_protobuf_call(
+            http, uri, datastore_pb2.LookupRequest())
         self.assertEqual(list(request.keys), [key_pb1, key_pb2])
         self.assertEqual(request.read_options, read_options)
 
@@ -399,7 +389,8 @@ def test_run_query_w_eventual_no_transaction(self):
         )
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -410,11 +401,10 @@ def test_run_query_w_eventual_no_transaction(self):
 
         # Check the result and verify the callers.
         self.assertEqual(response, rsp_pb)
+
         uri = _build_expected_url(client._base_url, project, 'runQuery')
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        request = datastore_pb2.RunQueryRequest()
-        request.ParseFromString(cw['body'])
+        request = _verify_protobuf_call(
+            http, uri, datastore_pb2.RunQueryRequest())
         self.assertEqual(request.partition_id, partition_id)
         self.assertEqual(request.query, query_pb)
         self.assertEqual(request.read_options, read_options)
@@ -440,7 +430,8 @@ def test_run_query_wo_eventual_w_transaction(self):
         )
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -451,11 +442,10 @@ def test_run_query_wo_eventual_w_transaction(self):
 
         # Check the result and verify the callers.
         self.assertEqual(response, rsp_pb)
+
         uri = _build_expected_url(client._base_url, project, 'runQuery')
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        request = datastore_pb2.RunQueryRequest()
-        request.ParseFromString(cw['body'])
+        request = _verify_protobuf_call(
+            http, uri, datastore_pb2.RunQueryRequest())
         self.assertEqual(request.partition_id, partition_id)
         self.assertEqual(request.query, query_pb)
         self.assertEqual(request.read_options, read_options)
@@ -480,7 +470,8 @@ def test_run_query_wo_namespace_empty_result(self):
         )
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -491,11 +482,10 @@ def test_run_query_wo_namespace_empty_result(self):
 
         # Check the result and verify the callers.
         self.assertEqual(response, rsp_pb)
+
         uri = _build_expected_url(client._base_url, project, 'runQuery')
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        request = datastore_pb2.RunQueryRequest()
-        request.ParseFromString(cw['body'])
+        request = _verify_protobuf_call(
+            http, uri, datastore_pb2.RunQueryRequest())
         self.assertEqual(request.partition_id, partition_id)
         self.assertEqual(request.query, query_pb)
         self.assertEqual(request.read_options, read_options)
@@ -523,7 +513,8 @@ def test_run_query_w_namespace_nonempty_result(self):
         )
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -534,11 +525,10 @@ def test_run_query_w_namespace_nonempty_result(self):
 
         # Check the result and verify the callers.
         self.assertEqual(response, rsp_pb)
-        cw = http._called_with
+
         uri = _build_expected_url(client._base_url, project, 'runQuery')
-        _verify_protobuf_call(self, cw, uri)
-        request = datastore_pb2.RunQueryRequest()
-        request.ParseFromString(cw['body'])
+        request = _verify_protobuf_call(
+            http, uri, datastore_pb2.RunQueryRequest())
         self.assertEqual(request.partition_id, partition_id)
         self.assertEqual(request.query, query_pb)
 
@@ -551,7 +541,8 @@ def test_begin_transaction(self):
         rsp_pb.transaction = transaction
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -561,12 +552,11 @@ def test_begin_transaction(self):
 
         # Check the result and verify the callers.
         self.assertEqual(response, rsp_pb)
+
         uri = _build_expected_url(
             client._base_url, project, 'beginTransaction')
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        request = datastore_pb2.BeginTransactionRequest()
-        request.ParseFromString(cw['body'])
+        request = _verify_protobuf_call(
+            http, uri, datastore_pb2.BeginTransactionRequest())
         # The RPC-over-HTTP request does not set the project in the request.
         self.assertEqual(request.project_id, u'')
 
@@ -585,7 +575,8 @@ def test_commit_wo_transaction(self):
         value_pb.string_value = u'Foo'
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -597,11 +588,9 @@ def test_commit_wo_transaction(self):
 
         # Check the result and verify the callers.
         self.assertEqual(result, rsp_pb)
+
         uri = _build_expected_url(client._base_url, project, 'commit')
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        request = rq_class()
-        request.ParseFromString(cw['body'])
+        request = _verify_protobuf_call(http, uri, rq_class())
         self.assertEqual(request.transaction, b'')
         self.assertEqual(list(request.mutations), [mutation])
         self.assertEqual(request.mode, rq_class.NON_TRANSACTIONAL)
@@ -621,7 +610,8 @@ def test_commit_w_transaction(self):
         value_pb.string_value = u'Foo'
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -633,11 +623,9 @@ def test_commit_w_transaction(self):
 
         # Check the result and verify the callers.
         self.assertEqual(result, rsp_pb)
+
         uri = _build_expected_url(client._base_url, project, 'commit')
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        request = rq_class()
-        request.ParseFromString(cw['body'])
+        request = _verify_protobuf_call(http, uri, rq_class())
         self.assertEqual(request.transaction, b'xact')
         self.assertEqual(list(request.mutations), [mutation])
         self.assertEqual(request.mode, rq_class.TRANSACTIONAL)
@@ -650,7 +638,8 @@ def test_rollback_ok(self):
         rsp_pb = datastore_pb2.RollbackResponse()
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -660,11 +649,10 @@ def test_rollback_ok(self):
 
         # Check the result and verify the callers.
         self.assertEqual(response, rsp_pb)
+
         uri = _build_expected_url(client._base_url, project, 'rollback')
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        request = datastore_pb2.RollbackRequest()
-        request.ParseFromString(cw['body'])
+        request = _verify_protobuf_call(
+            http, uri, datastore_pb2.RollbackRequest())
         self.assertEqual(request.transaction, transaction)
 
     def test_allocate_ids_empty(self):
@@ -674,7 +662,8 @@ def test_allocate_ids_empty(self):
         rsp_pb = datastore_pb2.AllocateIdsResponse()
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -685,11 +674,10 @@ def test_allocate_ids_empty(self):
         # Check the result and verify the callers.
         self.assertEqual(response, rsp_pb)
         self.assertEqual(list(response.keys), [])
+
         uri = _build_expected_url(client._base_url, project, 'allocateIds')
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        request = datastore_pb2.AllocateIdsRequest()
-        request.ParseFromString(cw['body'])
+        request = _verify_protobuf_call(
+            http, uri, datastore_pb2.AllocateIdsRequest())
         self.assertEqual(list(request.keys), [])
 
     def test_allocate_ids_non_empty(self):
@@ -709,7 +697,8 @@ def test_allocate_ids_non_empty(self):
         rsp_pb.keys.add().CopyFrom(after_key_pbs[1])
 
         # Create mock HTTP and client with response.
-        http = Http({'status': '200'}, rsp_pb.SerializeToString())
+        http = _make_requests_session(
+            [_make_response(content=rsp_pb.SerializeToString())])
         client = mock.Mock(
             _http=http, _base_url='test.invalid', spec=['_http', '_base_url'])
 
@@ -720,29 +709,28 @@ def test_allocate_ids_non_empty(self):
         # Check the result and verify the callers.
         self.assertEqual(list(response.keys), after_key_pbs)
         self.assertEqual(response, rsp_pb)
+
         uri = _build_expected_url(client._base_url, project, 'allocateIds')
-        cw = http._called_with
-        _verify_protobuf_call(self, cw, uri)
-        request = datastore_pb2.AllocateIdsRequest()
-        request.ParseFromString(cw['body'])
+        request = _verify_protobuf_call(
+            http, uri, datastore_pb2.AllocateIdsRequest())
         self.assertEqual(len(request.keys), len(before_key_pbs))
         for key_before, key_after in zip(before_key_pbs, request.keys):
             self.assertEqual(key_before, key_after)
 
 
-class Http(object):
+def _make_response(status=http_client.OK, content=b'', headers={}):
+    response = requests.Response()
+    response.status_code = status
+    response._content = content
+    response.headers = headers
+    response.request = requests.Request()
+    return response
 
-    _called_with = None
 
-    def __init__(self, headers, content):
-        from httplib2 import Response
-
-        self._response = Response(headers)
-        self._content = content
-
-    def request(self, **kw):
-        self._called_with = kw
-        return self._response, self._content
+def _make_requests_session(responses):
+    session = mock.create_autospec(requests.Session, instance=True)
+    session.request.side_effect = responses
+    return session
 
 
 def _build_expected_url(api_base_url, project, method):
@@ -765,16 +753,20 @@ def _make_key_pb(project, id_=1234):
     return Key(*path_args, project=project).to_protobuf()
 
 
-def _verify_protobuf_call(testcase, called_with, uri):
+def _verify_protobuf_call(http, expected_url, pb):
     from google.cloud import _http as connection_module
     from google.cloud.datastore._http import _CLIENT_INFO
 
-    testcase.assertEqual(called_with['uri'], uri)
-    testcase.assertEqual(called_with['method'], 'POST')
     expected_headers = {
         'Content-Type': 'application/x-protobuf',
         'User-Agent': connection_module.DEFAULT_USER_AGENT,
-        'Content-Length': str(len(called_with['body'])),
         connection_module.CLIENT_INFO_HEADER: _CLIENT_INFO,
     }
-    testcase.assertEqual(called_with['headers'], expected_headers)
+
+    http.request.assert_called_once_with(
+        method='POST', url=expected_url, headers=expected_headers,
+        data=mock.ANY)
+
+    data = http.request.mock_calls[0][2]['data']
+    pb.ParseFromString(data)
+    return pb
diff --git a/dns/google/cloud/dns/client.py b/dns/google/cloud/dns/client.py
index 1984c3d1a247b..4025f7e9eb68c 100644
--- a/dns/google/cloud/dns/client.py
+++ b/dns/google/cloud/dns/client.py
@@ -36,10 +36,10 @@ class Client(ClientWithProject):
                         passed), falls back to the default inferred from the
                         environment.
 
-    :type _http: :class:`~httplib2.Http`
+    :type _http: :class:`~requests.Session`
     :param _http: (Optional) HTTP object to make requests. Can be any object
                   that defines ``request()`` with the same interface as
-                  :meth:`~httplib2.Http.request`. If not passed, an
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/dns/google/cloud/dns/zone.py b/dns/google/cloud/dns/zone.py
index 3c589d493311e..4c278e9038624 100644
--- a/dns/google/cloud/dns/zone.py
+++ b/dns/google/cloud/dns/zone.py
@@ -219,7 +219,7 @@ def _require_client(self, client):
     def _set_properties(self, api_response):
         """Update properties from resource in body of ``api_response``
 
-        :type api_response: httplib2.Response
+        :type api_response: dict
         :param api_response: response returned from an API call
         """
         self._properties.clear()
diff --git a/dns/tests/unit/test__http.py b/dns/tests/unit/test__http.py
index 98264e2abe300..4a6c574156553 100644
--- a/dns/tests/unit/test__http.py
+++ b/dns/tests/unit/test__http.py
@@ -52,31 +52,34 @@ def test_build_api_url_w_extra_query_params(self):
         self.assertEqual(parms['bar'], 'baz')
 
     def test_extra_headers(self):
+        import requests
+
         from google.cloud import _http as base_http
         from google.cloud.dns import _http as MUT
 
-        http = mock.Mock(spec=['request'])
-        response = mock.Mock(status=200, spec=['status'])
-        data = b'brent-spiner'
-        http.request.return_value = response, data
+        http = mock.create_autospec(requests.Session, instance=True)
+        response = requests.Response()
+        response.status_code = 200
+        response_data = b'brent-spiner'
+        response._content = response_data
+        http.request.return_value = response
         client = mock.Mock(_http=http, spec=['_http'])
 
         conn = self._make_one(client)
         req_data = 'req-data-boring'
         result = conn.api_request(
             'GET', '/rainbow', data=req_data, expect_json=False)
-        self.assertEqual(result, data)
+        self.assertEqual(result, response_data)
 
         expected_headers = {
-            'Content-Length': str(len(req_data)),
             'Accept-Encoding': 'gzip',
             base_http.CLIENT_INFO_HEADER: MUT._CLIENT_INFO,
             'User-Agent': conn.USER_AGENT,
         }
         expected_uri = conn.build_api_url('/rainbow')
         http.request.assert_called_once_with(
-            body=req_data,
+            data=req_data,
             headers=expected_headers,
             method='GET',
-            uri=expected_uri,
+            url=expected_uri,
         )
diff --git a/docs/conf.py b/docs/conf.py
index 8aa99a9753def..86ee7d427928e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -295,14 +295,11 @@
 autoclass_content = 'both'
 
 # Configuration for intersphinx:
-# Refer to the Python standard library and the oauth2client and
-# httplib2 libraries.
 intersphinx_mapping = {
     'google-auth': ('https://google-auth.readthedocs.io/en/stable', None),
     'google-gax': ('https://gax-python.readthedocs.io/en/latest/', None),
     'grpc': ('http://www.grpc.io/grpc/python/', None),
-    'httplib2': ('http://httplib2.readthedocs.io/en/latest/', None),
+    'requests': ('http://docs.python-requests.org/en/master/', None),
     'pandas': ('http://pandas.pydata.org/pandas-docs/stable/', None),
     'python': ('https://docs.python.org/3', None),
-    'oauth2client': ('http://oauth2client.readthedocs.io/en/latest', None),
 }
diff --git a/docs/core/auth.rst b/docs/core/auth.rst
index ac3c4b29528ae..3c2cc2b0c4ca7 100644
--- a/docs/core/auth.rst
+++ b/docs/core/auth.rst
@@ -299,52 +299,3 @@ you add the correct scopes for the APIs you want to access:
     * ``https://www.googleapis.com/auth/devstorage.read_write``
 
 .. _set up the GCE instance: https://cloud.google.com/compute/docs/authentication#using
-
-Advanced Customization
-======================
-
-.. warning::
-
-    The developers of this library want to improve our HTTP handling to
-    support more situations more easily, and use current tooling.
-
-    In order to allow this, this particular mechanism may have to be altered
-    in a backwards-compatible way. Therefore, the following section should
-    be considered "private API" that is subject to change.
-
-The ``google-cloud-python`` library uses `google-auth`_ to sign
-requests and ``httplib2`` for sending requests.
-
-.. _google-auth: http://google-auth.readthedocs.io/en/stable/
-
-This is not a strict requirement:
-The :class:`Client <google.cloud.client.Client>` constructor accepts an
-optional ``_http`` argument in place of a ``credentials`` object.
-If passed, all HTTP requests made by the client will use your
-custom HTTP object.
-
-In order for this to be possible,
-the ``_http`` object must do two things:
-
-* Handle authentication on its own
-* Define a method ``request()`` that can subsitute for
-  :meth:`httplib2.Http.request`.
-
-The entire signature from ``httplib2`` need not be implemented,
-we only use it as
-
-.. code-block:: python
-
-    http.request(uri, method=method_name, body=body, headers=headers)
-
-For an example of such an implementation,
-a ``google-cloud-python`` user created a `custom HTTP class`_
-using the `requests`_ library.
-
-.. _custom HTTP class: https://github.com/GoogleCloudPlatform/google-cloud-python/issues/908#issuecomment-110811556
-.. _requests: http://www.python-requests.org/en/latest/
-
-We hope to enable using `custom HTTP libraries`_ with this library at
-some point.
-
-.. _custom HTTP libraries: https://github.com/google/oauth2client/issues/128
diff --git a/error_reporting/google/cloud/error_reporting/_logging.py b/error_reporting/google/cloud/error_reporting/_logging.py
index d8bd7a12a4771..5d7fd3ff38535 100644
--- a/error_reporting/google/cloud/error_reporting/_logging.py
+++ b/error_reporting/google/cloud/error_reporting/_logging.py
@@ -37,8 +37,10 @@ class _ErrorReportingLoggingAPI(object):
                         ``_http`` object is passed), falls back to the default
                         inferred from the environment.
 
-    :type _http: :class:`httplib2.Http` or class that defines ``request()``.
-    :param _http: An optional HTTP object to make requests. If not passed, an
+    :type _http: :class:`~requests.Session`
+    :param _http: (Optional) HTTP object to make requests. Can be any object
+                  that defines ``request()`` with the same interface as
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/error_reporting/google/cloud/error_reporting/client.py b/error_reporting/google/cloud/error_reporting/client.py
index 77c2da631f20e..bcd164c03eeee 100644
--- a/error_reporting/google/cloud/error_reporting/client.py
+++ b/error_reporting/google/cloud/error_reporting/client.py
@@ -90,8 +90,10 @@ class Client(ClientWithProject):
                         ``_http`` object is passed), falls back to the default
                         inferred from the environment.
 
-    :type _http: :class:`httplib2.Http` or class that defines ``request()``.
-    :param _http: An optional HTTP object to make requests. If not passed, an
+    :type _http: :class:`~requests.Session`
+    :param _http: (Optional) HTTP object to make requests. Can be any object
+                  that defines ``request()`` with the same interface as
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/language/google/cloud/language/client.py b/language/google/cloud/language/client.py
index 58066443c8446..2a4bf47879ef8 100644
--- a/language/google/cloud/language/client.py
+++ b/language/google/cloud/language/client.py
@@ -33,10 +33,10 @@ class Client(client_module.Client):
                         passed), falls back to the default inferred from the
                         environment.
 
-    :type _http: :class:`~httplib2.Http`
+    :type _http: :class:`~requests.Session`
     :param _http: (Optional) HTTP object to make requests. Can be any object
                   that defines ``request()`` with the same interface as
-                  :meth:`~httplib2.Http.request`. If not passed, an
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/language/tests/unit/test__http.py b/language/tests/unit/test__http.py
index 6071c697fd017..0b5ffd8ea9c6c 100644
--- a/language/tests/unit/test__http.py
+++ b/language/tests/unit/test__http.py
@@ -40,13 +40,17 @@ def test_build_api_url(self):
         self.assertEqual(conn.build_api_url(method), uri)
 
     def test_extra_headers(self):
+        import requests
+
         from google.cloud import _http as base_http
         from google.cloud.language import _http as MUT
 
-        http = mock.Mock(spec=['request'])
-        response = mock.Mock(status=200, spec=['status'])
+        http = mock.create_autospec(requests.Session, instance=True)
+        response = requests.Response()
+        response.status_code = 200
         data = b'brent-spiner'
-        http.request.return_value = response, data
+        response._content = data
+        http.request.return_value = response
         client = mock.Mock(_http=http, spec=['_http'])
 
         conn = self._make_one(client)
@@ -56,15 +60,14 @@ def test_extra_headers(self):
         self.assertEqual(result, data)
 
         expected_headers = {
-            'Content-Length': str(len(req_data)),
             'Accept-Encoding': 'gzip',
             base_http.CLIENT_INFO_HEADER: MUT._CLIENT_INFO,
             'User-Agent': conn.USER_AGENT,
         }
         expected_uri = conn.build_api_url('/rainbow')
         http.request.assert_called_once_with(
-            body=req_data,
+            data=req_data,
             headers=expected_headers,
             method='GET',
-            uri=expected_uri,
+            url=expected_uri,
         )
diff --git a/logging/google/cloud/logging/client.py b/logging/google/cloud/logging/client.py
index ca698dde99def..3ce67fba151c8 100644
--- a/logging/google/cloud/logging/client.py
+++ b/logging/google/cloud/logging/client.py
@@ -73,10 +73,10 @@ class Client(ClientWithProject):
                         passed), falls back to the default inferred from the
                         environment.
 
-    :type _http: :class:`~httplib2.Http`
+    :type _http: :class:`~requests.Session`
     :param _http: (Optional) HTTP object to make requests. Can be any object
                   that defines ``request()`` with the same interface as
-                  :meth:`~httplib2.Http.request`. If not passed, an
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/logging/tests/unit/test__http.py b/logging/tests/unit/test__http.py
index 459c0cf304d78..d3e9970cb757a 100644
--- a/logging/tests/unit/test__http.py
+++ b/logging/tests/unit/test__http.py
@@ -43,13 +43,17 @@ def test_default_url(self):
         self.assertIs(conn._client, client)
 
     def test_extra_headers(self):
+        import requests
+
         from google.cloud import _http as base_http
         from google.cloud.logging import _http as MUT
 
-        http = mock.Mock(spec=['request'])
-        response = mock.Mock(status=200, spec=['status'])
+        http = mock.create_autospec(requests.Session, instance=True)
+        response = requests.Response()
+        response.status_code = 200
         data = b'brent-spiner'
-        http.request.return_value = response, data
+        response._content = data
+        http.request.return_value = response
         client = mock.Mock(_http=http, spec=['_http'])
 
         conn = self._make_one(client)
@@ -59,17 +63,16 @@ def test_extra_headers(self):
         self.assertEqual(result, data)
 
         expected_headers = {
-            'Content-Length': str(len(req_data)),
             'Accept-Encoding': 'gzip',
             base_http.CLIENT_INFO_HEADER: MUT._CLIENT_INFO,
             'User-Agent': conn.USER_AGENT,
         }
         expected_uri = conn.build_api_url('/rainbow')
         http.request.assert_called_once_with(
-            body=req_data,
+            data=req_data,
             headers=expected_headers,
             method='GET',
-            uri=expected_uri,
+            url=expected_uri,
         )
 
 
diff --git a/logging/tests/unit/test_client.py b/logging/tests/unit/test_client.py
index 1655dd7ad1c6e..37bfc5c182143 100644
--- a/logging/tests/unit/test_client.py
+++ b/logging/tests/unit/test_client.py
@@ -560,13 +560,13 @@ def test_list_metrics_with_paging(self):
         })
 
     def test_get_default_handler_app_engine(self):
-        import httplib2
+        import requests
         import os
         from google.cloud._testing import _Monkey
         from google.cloud.logging.client import _APPENGINE_FLEXIBLE_ENV_VM
         from google.cloud.logging.handlers import AppEngineHandler
 
-        http_mock = mock.Mock(spec=httplib2.Http)
+        http_mock = mock.Mock(spec=requests.Session)
         credentials = _make_credentials()
         deepcopy = mock.Mock(return_value=http_mock)
 
@@ -596,10 +596,10 @@ def test_get_default_handler_container_engine(self):
         self.assertIsInstance(handler, ContainerEngineHandler)
 
     def test_get_default_handler_general(self):
-        import httplib2
+        import requests
         from google.cloud.logging.handlers import CloudLoggingHandler
 
-        http_mock = mock.Mock(spec=httplib2.Http)
+        http_mock = mock.Mock(spec=requests.Session)
         credentials = _make_credentials()
         deepcopy = mock.Mock(return_value=http_mock)
 
@@ -613,9 +613,9 @@ def test_get_default_handler_general(self):
         self.assertIsInstance(handler, CloudLoggingHandler)
 
     def test_setup_logging(self):
-        import httplib2
+        import requests
 
-        http_mock = mock.Mock(spec=httplib2.Http)
+        http_mock = mock.Mock(spec=requests.Session)
         deepcopy = mock.Mock(return_value=http_mock)
         setup_logging = mock.Mock(spec=[])
 
diff --git a/monitoring/google/cloud/monitoring/client.py b/monitoring/google/cloud/monitoring/client.py
index 7712a072d7937..5ce44d8c7e1ff 100644
--- a/monitoring/google/cloud/monitoring/client.py
+++ b/monitoring/google/cloud/monitoring/client.py
@@ -62,10 +62,10 @@ class Client(ClientWithProject):
                         passed), falls back to the default inferred from the
                         environment.
 
-    :type _http: :class:`~httplib2.Http`
+    :type _http: :class:`~requests.Session`
     :param _http: (Optional) HTTP object to make requests. Can be any object
                   that defines ``request()`` with the same interface as
-                  :meth:`~httplib2.Http.request`. If not passed, an
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/monitoring/tests/unit/test__http.py b/monitoring/tests/unit/test__http.py
index d73bcc3498ff7..47d1f81311f58 100644
--- a/monitoring/tests/unit/test__http.py
+++ b/monitoring/tests/unit/test__http.py
@@ -34,13 +34,17 @@ def test_constructor(self):
         self.assertIs(connection._client, client)
 
     def test_extra_headers(self):
+        import requests
+
         from google.cloud import _http as base_http
         from google.cloud.monitoring import _http as MUT
 
-        http = mock.Mock(spec=['request'])
-        response = mock.Mock(status=200, spec=['status'])
+        http = mock.create_autospec(requests.Session, instance=True)
+        response = requests.Response()
+        response.status_code = 200
         data = b'brent-spiner'
-        http.request.return_value = response, data
+        response._content = data
+        http.request.return_value = response
         client = mock.Mock(_http=http, spec=['_http'])
 
         conn = self._make_one(client)
@@ -50,15 +54,14 @@ def test_extra_headers(self):
         self.assertEqual(result, data)
 
         expected_headers = {
-            'Content-Length': str(len(req_data)),
             'Accept-Encoding': 'gzip',
             base_http.CLIENT_INFO_HEADER: MUT._CLIENT_INFO,
             'User-Agent': conn.USER_AGENT,
         }
         expected_uri = conn.build_api_url('/rainbow')
         http.request.assert_called_once_with(
-            body=req_data,
+            data=req_data,
             headers=expected_headers,
             method='GET',
-            uri=expected_uri,
+            url=expected_uri,
         )
diff --git a/pubsub/google/cloud/pubsub/client.py b/pubsub/google/cloud/pubsub/client.py
index 6a7e60a1923d8..ae808c038b7c5 100644
--- a/pubsub/google/cloud/pubsub/client.py
+++ b/pubsub/google/cloud/pubsub/client.py
@@ -58,10 +58,10 @@ class Client(ClientWithProject):
                         passed), falls back to the default inferred from the
                         environment.
 
-    :type _http: :class:`~httplib2.Http`
+    :type _http: :class:`~requests.Session`
     :param _http: (Optional) HTTP object to make requests. Can be any object
                   that defines ``request()`` with the same interface as
-                  :meth:`~httplib2.Http.request`. If not passed, an
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/pubsub/tests/system.py b/pubsub/tests/system.py
index d55011a5254ec..fd70f44165de7 100644
--- a/pubsub/tests/system.py
+++ b/pubsub/tests/system.py
@@ -19,7 +19,7 @@
 from google.gax.errors import GaxError
 from google.gax.grpc import exc_to_code
 from grpc import StatusCode
-import httplib2
+import requests
 
 from google.cloud.environment_vars import PUBSUB_EMULATOR
 from google.cloud.exceptions import Conflict
@@ -53,9 +53,9 @@ def setUpModule():
     Config.IN_EMULATOR = os.getenv(PUBSUB_EMULATOR) is not None
     if Config.IN_EMULATOR:
         credentials = EmulatorCreds()
-        http = httplib2.Http()  # Un-authorized.
-        Config.CLIENT = client.Client(credentials=credentials,
-                                      _http=http)
+        http = requests.Session()  # Un-authorized.
+        Config.CLIENT = client.Client(
+            credentials=credentials, _http=http)
     else:
         Config.CLIENT = client.Client()
 
diff --git a/pubsub/tests/unit/test__http.py b/pubsub/tests/unit/test__http.py
index d4bbc29dd6dd5..794fe093bbb31 100644
--- a/pubsub/tests/unit/test__http.py
+++ b/pubsub/tests/unit/test__http.py
@@ -102,13 +102,17 @@ def test_build_api_url_w_base_url_override(self):
                          URI)
 
     def test_extra_headers(self):
+        import requests
+
         from google.cloud import _http as base_http
         from google.cloud.pubsub import _http as MUT
 
-        http = mock.Mock(spec=['request'])
-        response = mock.Mock(status=200, spec=['status'])
+        http = mock.create_autospec(requests.Session, instance=True)
+        response = requests.Response()
+        response.status_code = 200
         data = b'brent-spiner'
-        http.request.return_value = response, data
+        response._content = data
+        http.request.return_value = response
         client = mock.Mock(_http=http, spec=['_http'])
 
         conn = self._make_one(client)
@@ -118,17 +122,16 @@ def test_extra_headers(self):
         self.assertEqual(result, data)
 
         expected_headers = {
-            'Content-Length': str(len(req_data)),
             'Accept-Encoding': 'gzip',
             base_http.CLIENT_INFO_HEADER: MUT._CLIENT_INFO,
             'User-Agent': conn.USER_AGENT,
         }
         expected_uri = conn.build_api_url('/rainbow')
         http.request.assert_called_once_with(
-            body=req_data,
+            data=req_data,
             headers=expected_headers,
             method='GET',
-            uri=expected_uri,
+            url=expected_uri,
         )
 
 
diff --git a/resource_manager/google/cloud/resource_manager/client.py b/resource_manager/google/cloud/resource_manager/client.py
index d2cea6cad2cdc..90f1877359747 100644
--- a/resource_manager/google/cloud/resource_manager/client.py
+++ b/resource_manager/google/cloud/resource_manager/client.py
@@ -40,10 +40,10 @@ class Client(BaseClient):
                         passed), falls back to the default inferred from the
                         environment.
 
-    :type _http: :class:`~httplib2.Http`
+    :type _http: :class:`~requests.Session`
     :param _http: (Optional) HTTP object to make requests. Can be any object
                   that defines ``request()`` with the same interface as
-                  :meth:`~httplib2.Http.request`. If not passed, an
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/resource_manager/tests/unit/test__http.py b/resource_manager/tests/unit/test__http.py
index a5e0e4a776666..250dcd6c64ba6 100644
--- a/resource_manager/tests/unit/test__http.py
+++ b/resource_manager/tests/unit/test__http.py
@@ -51,13 +51,17 @@ def test_build_api_url_w_extra_query_params(self):
         self.assertEqual(parms['bar'], 'baz')
 
     def test_extra_headers(self):
+        import requests
+
         from google.cloud import _http as base_http
         from google.cloud.resource_manager import _http as MUT
 
-        http = mock.Mock(spec=['request'])
-        response = mock.Mock(status=200, spec=['status'])
+        http = mock.create_autospec(requests.Session, instance=True)
+        response = requests.Response()
+        response.status_code = 200
         data = b'brent-spiner'
-        http.request.return_value = response, data
+        response._content = data
+        http.request.return_value = response
         client = mock.Mock(_http=http, spec=['_http'])
 
         conn = self._make_one(client)
@@ -67,15 +71,14 @@ def test_extra_headers(self):
         self.assertEqual(result, data)
 
         expected_headers = {
-            'Content-Length': str(len(req_data)),
             'Accept-Encoding': 'gzip',
             base_http.CLIENT_INFO_HEADER: MUT._CLIENT_INFO,
             'User-Agent': conn.USER_AGENT,
         }
         expected_uri = conn.build_api_url('/rainbow')
         http.request.assert_called_once_with(
-            body=req_data,
+            data=req_data,
             headers=expected_headers,
             method='GET',
-            uri=expected_uri,
+            url=expected_uri,
         )
diff --git a/runtimeconfig/google/cloud/runtimeconfig/client.py b/runtimeconfig/google/cloud/runtimeconfig/client.py
index 5921a5d1eb980..fc821345272f3 100644
--- a/runtimeconfig/google/cloud/runtimeconfig/client.py
+++ b/runtimeconfig/google/cloud/runtimeconfig/client.py
@@ -35,10 +35,10 @@ class Client(ClientWithProject):
                         passed), falls back to the default inferred from the
                         environment.
 
-    :type _http: :class:`~httplib2.Http`
+    :type _http: :class:`~requests.Session`
     :param _http: (Optional) HTTP object to make requests. Can be any object
                   that defines ``request()`` with the same interface as
-                  :meth:`~httplib2.Http.request`. If not passed, an
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/runtimeconfig/google/cloud/runtimeconfig/config.py b/runtimeconfig/google/cloud/runtimeconfig/config.py
index 4b85ff5843bff..385b92a31c406 100644
--- a/runtimeconfig/google/cloud/runtimeconfig/config.py
+++ b/runtimeconfig/google/cloud/runtimeconfig/config.py
@@ -128,7 +128,7 @@ def _require_client(self, client):
     def _set_properties(self, api_response):
         """Update properties from resource in body of ``api_response``
 
-        :type api_response: httplib2.Response
+        :type api_response: dict
         :param api_response: response returned from an API call
         """
         self._properties.clear()
diff --git a/runtimeconfig/tests/unit/test__http.py b/runtimeconfig/tests/unit/test__http.py
index 324994bd4ef6f..c4419e165f4e7 100644
--- a/runtimeconfig/tests/unit/test__http.py
+++ b/runtimeconfig/tests/unit/test__http.py
@@ -34,13 +34,17 @@ def test_default_url(self):
         self.assertIs(conn._client, client)
 
     def test_extra_headers(self):
+        import requests
+
         from google.cloud import _http as base_http
         from google.cloud.runtimeconfig import _http as MUT
 
-        http = mock.Mock(spec=['request'])
-        response = mock.Mock(status=200, spec=['status'])
+        http = mock.create_autospec(requests.Session, instance=True)
+        response = requests.Response()
+        response.status_code = 200
         data = b'brent-spiner'
-        http.request.return_value = response, data
+        response._content = data
+        http.request.return_value = response
         client = mock.Mock(_http=http, spec=['_http'])
 
         conn = self._make_one(client)
@@ -50,15 +54,14 @@ def test_extra_headers(self):
         self.assertEqual(result, data)
 
         expected_headers = {
-            'Content-Length': str(len(req_data)),
             'Accept-Encoding': 'gzip',
             base_http.CLIENT_INFO_HEADER: MUT._CLIENT_INFO,
             'User-Agent': conn.USER_AGENT,
         }
         expected_uri = conn.build_api_url('/rainbow')
         http.request.assert_called_once_with(
-            body=req_data,
+            data=req_data,
             headers=expected_headers,
             method='GET',
-            uri=expected_uri,
+            url=expected_uri,
         )
diff --git a/speech/google/cloud/speech/client.py b/speech/google/cloud/speech/client.py
index 7c066d48cb9d2..df0bee95461b7 100644
--- a/speech/google/cloud/speech/client.py
+++ b/speech/google/cloud/speech/client.py
@@ -39,10 +39,10 @@ class Client(BaseClient):
                         passed), falls back to the default inferred from the
                         environment.
 
-    :type _http: :class:`~httplib2.Http`
+    :type _http: :class:`~requests.Session`
     :param _http: (Optional) HTTP object to make requests. Can be any object
                   that defines ``request()`` with the same interface as
-                  :meth:`~httplib2.Http.request`. If not passed, an
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/speech/tests/unit/test__http.py b/speech/tests/unit/test__http.py
index fd39428ffdbb9..4aa7613910e9b 100644
--- a/speech/tests/unit/test__http.py
+++ b/speech/tests/unit/test__http.py
@@ -40,13 +40,17 @@ def test_build_api_url(self):
         self.assertEqual(conn.build_api_url(method), uri)
 
     def test_extra_headers(self):
+        import requests
+
         from google.cloud import _http as base_http
         from google.cloud.speech import _http as MUT
 
-        http = mock.Mock(spec=['request'])
-        response = mock.Mock(status=200, spec=['status'])
+        http = mock.create_autospec(requests.Session, instance=True)
+        response = requests.Response()
+        response.status_code = 200
         data = b'brent-spiner'
-        http.request.return_value = response, data
+        response._content = data
+        http.request.return_value = response
         client = mock.Mock(_http=http, spec=['_http'])
 
         conn = self._make_one(client)
@@ -56,12 +60,14 @@ def test_extra_headers(self):
         self.assertEqual(result, data)
 
         expected_headers = {
-            'Content-Length': str(len(req_data)),
             'Accept-Encoding': 'gzip',
             base_http.CLIENT_INFO_HEADER: MUT._CLIENT_INFO,
             'User-Agent': conn.USER_AGENT,
         }
         expected_uri = conn.build_api_url('/rainbow')
         http.request.assert_called_once_with(
-            body=req_data, headers=expected_headers, method='GET',
-            uri=expected_uri)
+            data=req_data,
+            headers=expected_headers,
+            method='GET',
+            url=expected_uri,
+        )
diff --git a/storage/google/cloud/storage/batch.py b/storage/google/cloud/storage/batch.py
index 0ab95a98743c7..30847ab12302c 100644
--- a/storage/google/cloud/storage/batch.py
+++ b/storage/google/cloud/storage/batch.py
@@ -23,10 +23,11 @@
 import io
 import json
 
-import httplib2
+import requests
 import six
 
-from google.cloud.exceptions import make_exception
+from google.cloud import _helpers
+from google.cloud import exceptions
 from google.cloud.storage._http import Connection
 
 
@@ -70,11 +71,6 @@ def __init__(self, method, uri, headers, body):
             super_init(payload, 'http', encode_noop)
 
 
-class NoContent(object):
-    """Emulate an HTTP '204 No Content' response."""
-    status = 204
-
-
 class _FutureDict(object):
     """Class to hold a future value for a deferred request.
 
@@ -123,6 +119,21 @@ def __setitem__(self, key, value):
         raise KeyError('Cannot set %r -> %r on a future' % (key, value))
 
 
+class _FutureResponse(requests.Response):
+    """Reponse that returns a placeholder dictionary for a batched requests."""
+    def __init__(self, future_dict):
+        super(_FutureResponse, self).__init__()
+        self._future_dict = future_dict
+        self.status_code = 204
+
+    def json(self):
+        return self._future_dict
+
+    @property
+    def content(self):
+        return self._future_dict
+
+
 class Batch(Connection):
     """Proxy an underlying connection, batching up change operations.
 
@@ -171,7 +182,7 @@ def _do_request(self, method, url, headers, data, target_object):
         self._target_objects.append(target_object)
         if target_object is not None:
             target_object._properties = result
-        return NoContent(), result
+        return _FutureResponse(result)
 
     def _prepare_batch_request(self):
         """Prepares headers and body for a batch request.
@@ -218,17 +229,18 @@ def _finish_futures(self, responses):
         if len(self._target_objects) != len(responses):
             raise ValueError('Expected a response for every request.')
 
-        for target_object, sub_response in zip(self._target_objects,
-                                               responses):
-            resp_headers, sub_payload = sub_response
-            if not 200 <= resp_headers.status < 300:
-                exception_args = exception_args or (resp_headers,
-                                                    sub_payload)
+        for target_object, subresponse in zip(
+                self._target_objects, responses):
+            if not 200 <= subresponse.status_code < 300:
+                exception_args = exception_args or subresponse
             elif target_object is not None:
-                target_object._properties = sub_payload
+                try:
+                    target_object._properties = subresponse.json()
+                except ValueError:
+                    target_object._properties = subresponse.content
 
         if exception_args is not None:
-            raise make_exception(*exception_args)
+            raise exceptions.from_http_response(exception_args)
 
     def finish(self):
         """Submit a single `multipart/mixed` request with deferred requests.
@@ -243,9 +255,9 @@ def finish(self):
         # Use the private ``_base_connection`` rather than the property
         # ``_connection``, since the property may be this
         # current batch.
-        response, content = self._client._base_connection._make_request(
+        response = self._client._base_connection._make_request(
             'POST', url, data=body, headers=headers)
-        responses = list(_unpack_batch_response(response, content))
+        responses = list(_unpack_batch_response(response))
         self._finish_futures(responses)
         return responses
 
@@ -265,7 +277,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
             self._client._pop_batch()
 
 
-def _generate_faux_mime_message(parser, response, content):
+def _generate_faux_mime_message(parser, response):
     """Convert response, content -> (multipart) email.message.
 
     Helper for _unpack_batch_response.
@@ -273,16 +285,14 @@ def _generate_faux_mime_message(parser, response, content):
     # We coerce to bytes to get consistent concat across
     # Py2 and Py3. Percent formatting is insufficient since
     # it includes the b in Py3.
-    if not isinstance(content, six.binary_type):
-        content = content.encode('utf-8')
-    content_type = response['content-type']
-    if not isinstance(content_type, six.binary_type):
-        content_type = content_type.encode('utf-8')
+    content_type = _helpers._to_bytes(
+        response.headers.get('content-type', ''))
+
     faux_message = b''.join([
         b'Content-Type: ',
         content_type,
         b'\nMIME-Version: 1.0\n\n',
-        content,
+        response.content,
     ])
 
     if six.PY2:
@@ -291,20 +301,17 @@ def _generate_faux_mime_message(parser, response, content):
         return parser.parsestr(faux_message.decode('utf-8'))
 
 
-def _unpack_batch_response(response, content):
-    """Convert response, content -> [(headers, payload)].
+def _unpack_batch_response(response):
+    """Convert requests.Response -> [(headers, payload)].
 
     Creates a generator of tuples of emulating the responses to
-    :meth:`httplib2.Http.request` (a pair of headers and payload).
+    :meth:`requests.Session.request`.
 
-    :type response: :class:`httplib2.Response`
+    :type response: :class:`requests.Response`
     :param response: HTTP response / headers from a request.
-
-    :type content: str
-    :param content: Response payload with a batch response.
     """
     parser = Parser()
-    message = _generate_faux_mime_message(parser, response, content)
+    message = _generate_faux_mime_message(parser, response)
 
     if not isinstance(message._payload, list):
         raise ValueError('Bad response:  not multi-part')
@@ -314,10 +321,15 @@ def _unpack_batch_response(response, content):
         _, status, _ = status_line.split(' ', 2)
         sub_message = parser.parsestr(rest)
         payload = sub_message._payload
-        ctype = sub_message['Content-Type']
         msg_headers = dict(sub_message._headers)
-        msg_headers['status'] = status
-        headers = httplib2.Response(msg_headers)
-        if ctype and ctype.startswith('application/json'):
-            payload = json.loads(payload)
-        yield headers, payload
+        content_id = msg_headers.get('Content-ID')
+
+        subresponse = requests.Response()
+        subresponse.request = requests.Request(
+            method='BATCH',
+            url='contentid://{}'.format(content_id)).prepare()
+        subresponse.status_code = int(status)
+        subresponse.headers.update(msg_headers)
+        subresponse._content = payload.encode('utf-8')
+
+        yield subresponse
diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index dfefc3c1a4faf..b515d1e2c8c2a 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -34,7 +34,6 @@
 import time
 import warnings
 
-import httplib2
 from six.moves.urllib.parse import quote
 
 import google.auth.transport.requests
@@ -44,11 +43,11 @@
 from google.resumable_media.requests import MultipartUpload
 from google.resumable_media.requests import ResumableUpload
 
+from google.cloud import exceptions
 from google.cloud._helpers import _rfc3339_to_datetime
 from google.cloud._helpers import _to_bytes
 from google.cloud._helpers import _bytes_to_unicode
 from google.cloud.exceptions import NotFound
-from google.cloud.exceptions import make_exception
 from google.cloud.iam import Policy
 from google.cloud.storage._helpers import _PropertyMixin
 from google.cloud.storage._helpers import _scalar_property
@@ -469,7 +468,7 @@ def download_to_file(self, file_obj, client=None):
         try:
             self._do_download(transport, file_obj, download_url, headers)
         except resumable_media.InvalidResponse as exc:
-            _raise_from_invalid_response(exc, download_url)
+            _raise_from_invalid_response(exc)
 
     def download_to_filename(self, filename, client=None):
         """Download the contents of this blob into a named file.
@@ -1598,20 +1597,14 @@ def _maybe_rewind(stream, rewind=False):
         stream.seek(0, os.SEEK_SET)
 
 
-def _raise_from_invalid_response(error, error_info=None):
+def _raise_from_invalid_response(error):
     """Re-wrap and raise an ``InvalidResponse`` exception.
 
     :type error: :exc:`google.resumable_media.InvalidResponse`
     :param error: A caught exception from the ``google-resumable-media``
                   library.
 
-    :type error_info: str
-    :param error_info: (Optional) Extra information about the failed request.
-
     :raises: :class:`~google.cloud.exceptions.GoogleCloudError` corresponding
              to the failed status code
     """
-    response = error.response
-    faux_response = httplib2.Response({'status': response.status_code})
-    raise make_exception(faux_response, response.content,
-                         error_info=error_info, use_json=False)
+    raise exceptions.from_http_response(error.response)
diff --git a/storage/google/cloud/storage/client.py b/storage/google/cloud/storage/client.py
index 93785e05269fc..42b4bb7d9592d 100644
--- a/storage/google/cloud/storage/client.py
+++ b/storage/google/cloud/storage/client.py
@@ -38,10 +38,10 @@ class Client(ClientWithProject):
                         passed), falls back to the default inferred from the
                         environment.
 
-    :type _http: :class:`~httplib2.Http`
+    :type _http: :class:`~requests.Session`
     :param _http: (Optional) HTTP object to make requests. Can be any object
                   that defines ``request()`` with the same interface as
-                  :meth:`~httplib2.Http.request`. If not passed, an
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/storage/tests/system.py b/storage/tests/system.py
index afab659882bfc..a89c45edbf256 100644
--- a/storage/tests/system.py
+++ b/storage/tests/system.py
@@ -17,7 +17,7 @@
 import time
 import unittest
 
-import httplib2
+import requests
 import six
 
 from google.cloud import exceptions
@@ -28,9 +28,6 @@
 from test_utils.system import unique_resource_id
 
 
-HTTP = httplib2.Http()
-
-
 def _bad_copy(bad_request):
     """Predicate: pass only exceptions for a failed copyTo."""
     err_msg = bad_request.message
@@ -426,9 +423,9 @@ def test_create_signed_read_url(self):
         signed_url = blob.generate_signed_url(expiration, method='GET',
                                               client=Config.CLIENT)
 
-        response, content = HTTP.request(signed_url, method='GET')
-        self.assertEqual(response.status, 200)
-        self.assertEqual(content, self.LOCAL_FILE)
+        response = requests.get(signed_url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, self.LOCAL_FILE)
 
     def test_create_signed_delete_url(self):
         blob = self.bucket.blob('LogoToSign.jpg')
@@ -437,9 +434,9 @@ def test_create_signed_delete_url(self):
                                                      method='DELETE',
                                                      client=Config.CLIENT)
 
-        response, content = HTTP.request(signed_delete_url, method='DELETE')
-        self.assertEqual(response.status, 204)
-        self.assertEqual(content, b'')
+        response = requests.request('DELETE', signed_delete_url)
+        self.assertEqual(response.status_code, 204)
+        self.assertEqual(response.content, b'')
 
         # Check that the blob has actually been deleted.
         self.assertFalse(blob.exists())
diff --git a/storage/tests/unit/test__http.py b/storage/tests/unit/test__http.py
index cb9344a16389b..5e03f94a64065 100644
--- a/storage/tests/unit/test__http.py
+++ b/storage/tests/unit/test__http.py
@@ -29,13 +29,17 @@ def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
     def test_extra_headers(self):
+        import requests
+
         from google.cloud import _http as base_http
         from google.cloud.storage import _http as MUT
 
-        http = mock.Mock(spec=['request'])
-        response = mock.Mock(status=200, spec=['status'])
+        http = mock.create_autospec(requests.Session, instance=True)
+        response = requests.Response()
+        response.status_code = 200
         data = b'brent-spiner'
-        http.request.return_value = response, data
+        response._content = data
+        http.request.return_value = response
         client = mock.Mock(_http=http, spec=['_http'])
 
         conn = self._make_one(client)
@@ -45,17 +49,16 @@ def test_extra_headers(self):
         self.assertEqual(result, data)
 
         expected_headers = {
-            'Content-Length': str(len(req_data)),
             'Accept-Encoding': 'gzip',
             base_http.CLIENT_INFO_HEADER: MUT._CLIENT_INFO,
             'User-Agent': conn.USER_AGENT,
         }
         expected_uri = conn.build_api_url('/rainbow')
         http.request.assert_called_once_with(
-            body=req_data,
+            data=req_data,
             headers=expected_headers,
             method='GET',
-            uri=expected_uri,
+            url=expected_uri,
         )
 
     def test_build_api_url_no_extra_query_params(self):
diff --git a/storage/tests/unit/test_batch.py b/storage/tests/unit/test_batch.py
index 60157af8c06b5..c40e4600097a0 100644
--- a/storage/tests/unit/test_batch.py
+++ b/storage/tests/unit/test_batch.py
@@ -15,6 +15,8 @@
 import unittest
 
 import mock
+import requests
+from six.moves import http_client
 
 
 def _make_credentials():
@@ -23,6 +25,21 @@ def _make_credentials():
     return mock.Mock(spec=google.auth.credentials.Credentials)
 
 
+def _make_response(status=http_client.OK, content=b'', headers={}):
+    response = requests.Response()
+    response.status_code = status
+    response._content = content
+    response.headers = headers
+    response.request = requests.Request()
+    return response
+
+
+def _make_requests_session(responses):
+    session = mock.create_autospec(requests.Session, instance=True)
+    session.request.side_effect = responses
+    return session
+
+
 class TestMIMEApplicationHTTP(unittest.TestCase):
 
     @staticmethod
@@ -88,7 +105,7 @@ def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
     def test_ctor(self):
-        http = _HTTP()
+        http = _make_requests_session([])
         connection = _Connection(http=http)
         client = _Client(connection)
         batch = self._make_one(client)
@@ -115,125 +132,134 @@ def test_current(self):
     def test__make_request_GET_normal(self):
         from google.cloud.storage.batch import _FutureDict
 
-        URL = 'http://example.com/api'
-        expected = _Response()
-        http = _HTTP((expected, ''))
+        url = 'http://example.com/api'
+        http = _make_requests_session([])
         connection = _Connection(http=http)
         batch = self._make_one(connection)
         target = _MockObject()
-        response, content = batch._make_request('GET', URL,
-                                                target_object=target)
-        self.assertEqual(response.status, 204)
-        self.assertIsInstance(content, _FutureDict)
-        self.assertIs(target._properties, content)
-        self.assertEqual(http._requests, [])
-        EXPECTED_HEADERS = [
-            ('Accept-Encoding', 'gzip'),
-            ('Content-Length', '0'),
-        ]
-        solo_request, = batch._requests
-        self.assertEqual(solo_request[0], 'GET')
-        self.assertEqual(solo_request[1], URL)
-        headers = solo_request[2]
-        for key, value in EXPECTED_HEADERS:
-            self.assertEqual(headers[key], value)
-        self.assertIsNone(solo_request[3])
+
+        response = batch._make_request('GET', url, target_object=target)
+
+        # Check the respone
+        self.assertEqual(response.status_code, 204)
+        self.assertIsInstance(response.json(), _FutureDict)
+        self.assertIsInstance(response.content, _FutureDict)
+        self.assertIs(target._properties, response.content)
+
+        # The real http request should not have been called yet.
+        http.request.assert_not_called()
+
+        # Check the queued request
+        self.assertEqual(len(batch._requests), 1)
+        request = batch._requests[0]
+        request_method, request_url, _, request_data = request
+        self.assertEqual(request_method, 'GET')
+        self.assertEqual(request_url, url)
+        self.assertIsNone(request_data)
 
     def test__make_request_POST_normal(self):
         from google.cloud.storage.batch import _FutureDict
 
-        URL = 'http://example.com/api'
-        http = _HTTP()  # no requests expected
+        url = 'http://example.com/api'
+        http = _make_requests_session([])
         connection = _Connection(http=http)
         batch = self._make_one(connection)
+        data = {'foo': 1}
         target = _MockObject()
-        response, content = batch._make_request('POST', URL, data={'foo': 1},
-                                                target_object=target)
-        self.assertEqual(response.status, 204)
-        self.assertIsInstance(content, _FutureDict)
-        self.assertIs(target._properties, content)
-        self.assertEqual(http._requests, [])
-        EXPECTED_HEADERS = [
-            ('Accept-Encoding', 'gzip'),
-            ('Content-Length', '10'),
-        ]
-        solo_request, = batch._requests
-        self.assertEqual(solo_request[0], 'POST')
-        self.assertEqual(solo_request[1], URL)
-        headers = solo_request[2]
-        for key, value in EXPECTED_HEADERS:
-            self.assertEqual(headers[key], value)
-        self.assertEqual(solo_request[3], {'foo': 1})
+
+        response = batch._make_request(
+            'POST', url, data={'foo': 1}, target_object=target)
+
+        self.assertEqual(response.status_code, 204)
+        self.assertIsInstance(response.content, _FutureDict)
+        self.assertIs(target._properties, response.content)
+
+        # The real http request should not have been called yet.
+        http.request.assert_not_called()
+
+        request = batch._requests[0]
+        request_method, request_url, _, request_data = request
+        self.assertEqual(request_method, 'POST')
+        self.assertEqual(request_url, url)
+        self.assertEqual(request_data, data)
 
     def test__make_request_PATCH_normal(self):
         from google.cloud.storage.batch import _FutureDict
 
-        URL = 'http://example.com/api'
-        http = _HTTP()  # no requests expected
+        url = 'http://example.com/api'
+        http = _make_requests_session([])
         connection = _Connection(http=http)
         batch = self._make_one(connection)
+        data = {'foo': 1}
         target = _MockObject()
-        response, content = batch._make_request('PATCH', URL, data={'foo': 1},
-                                                target_object=target)
-        self.assertEqual(response.status, 204)
-        self.assertIsInstance(content, _FutureDict)
-        self.assertIs(target._properties, content)
-        self.assertEqual(http._requests, [])
-        EXPECTED_HEADERS = [
-            ('Accept-Encoding', 'gzip'),
-            ('Content-Length', '10'),
-        ]
-        solo_request, = batch._requests
-        self.assertEqual(solo_request[0], 'PATCH')
-        self.assertEqual(solo_request[1], URL)
-        headers = solo_request[2]
-        for key, value in EXPECTED_HEADERS:
-            self.assertEqual(headers[key], value)
-        self.assertEqual(solo_request[3], {'foo': 1})
+
+        response = batch._make_request(
+            'PATCH', url, data={'foo': 1}, target_object=target)
+
+        self.assertEqual(response.status_code, 204)
+        self.assertIsInstance(response.content, _FutureDict)
+        self.assertIs(target._properties, response.content)
+
+        # The real http request should not have been called yet.
+        http.request.assert_not_called()
+
+        request = batch._requests[0]
+        request_method, request_url, _, request_data = request
+        self.assertEqual(request_method, 'PATCH')
+        self.assertEqual(request_url, url)
+        self.assertEqual(request_data, data)
 
     def test__make_request_DELETE_normal(self):
         from google.cloud.storage.batch import _FutureDict
 
-        URL = 'http://example.com/api'
-        http = _HTTP()  # no requests expected
+        url = 'http://example.com/api'
+        http = _make_requests_session([])
         connection = _Connection(http=http)
         batch = self._make_one(connection)
         target = _MockObject()
-        response, content = batch._make_request('DELETE', URL,
-                                                target_object=target)
-        self.assertEqual(response.status, 204)
-        self.assertIsInstance(content, _FutureDict)
-        self.assertIs(target._properties, content)
-        self.assertEqual(http._requests, [])
-        EXPECTED_HEADERS = [
-            ('Accept-Encoding', 'gzip'),
-            ('Content-Length', '0'),
-        ]
-        solo_request, = batch._requests
-        self.assertEqual(solo_request[0], 'DELETE')
-        self.assertEqual(solo_request[1], URL)
-        headers = solo_request[2]
-        for key, value in EXPECTED_HEADERS:
-            self.assertEqual(headers[key], value)
-        self.assertIsNone(solo_request[3])
+
+        response = batch._make_request('DELETE', url, target_object=target)
+
+        # Check the respone
+        self.assertEqual(response.status_code, 204)
+        self.assertIsInstance(response.content, _FutureDict)
+        self.assertIs(target._properties, response.content)
+
+        # The real http request should not have been called yet.
+        http.request.assert_not_called()
+
+        # Check the queued request
+        self.assertEqual(len(batch._requests), 1)
+        request = batch._requests[0]
+        request_method, request_url, _, request_data = request
+        self.assertEqual(request_method, 'DELETE')
+        self.assertEqual(request_url, url)
+        self.assertIsNone(request_data)
 
     def test__make_request_POST_too_many_requests(self):
-        URL = 'http://example.com/api'
-        http = _HTTP()  # no requests expected
+        url = 'http://example.com/api'
+        http = _make_requests_session([])
         connection = _Connection(http=http)
         batch = self._make_one(connection)
+
         batch._MAX_BATCH_SIZE = 1
-        batch._requests.append(('POST', URL, {}, {'bar': 2}))
-        self.assertRaises(ValueError,
-                          batch._make_request, 'POST', URL, data={'foo': 1})
-        self.assertIs(connection.http, http)
+        batch._requests.append(('POST', url, {}, {'bar': 2}))
+
+        with self.assertRaises(ValueError):
+            batch._make_request('POST', url, data={'foo': 1})
 
     def test_finish_empty(self):
-        http = _HTTP()  # no requests expected
+        http = _make_requests_session([])
         connection = _Connection(http=http)
         batch = self._make_one(connection)
-        self.assertRaises(ValueError, batch.finish)
-        self.assertIs(connection.http, http)
+
+        with self.assertRaises(ValueError):
+            batch.finish()
+
+    def _get_payload_chunks(self, boundary, payload):
+        divider = '--' + boundary[len('boundary="'):-1]
+        chunks = payload.split(divider)[1:-1]  # discard prolog / epilog
+        return chunks
 
     def _check_subrequest_no_payload(self, chunk, method, url):
         lines = chunk.splitlines()
@@ -269,133 +295,144 @@ def _check_subrequest_payload(self, chunk, method, url, payload):
             self.assertEqual(lines[7], '')
             self.assertEqual(json.loads(lines[8]), payload)
 
-    def test_finish_nonempty(self):
-        import httplib2
+    def _get_mutlipart_request(self, http):
+        request_call = http.request.mock_calls[0][2]
+        request_headers = request_call['headers']
+        request_body = request_call['data']
+        content_type, boundary = [
+            value.strip() for value in
+            request_headers['Content-Type'].split(';')]
+
+        return request_headers, request_body, content_type, boundary
 
-        URL = 'http://api.example.com/other_api'
-        expected = _Response()
-        expected['content-type'] = 'multipart/mixed; boundary="DEADBEEF="'
-        http = _HTTP((expected, _THREE_PART_MIME_RESPONSE))
+    def test_finish_nonempty(self):
+        url = 'http://api.example.com/other_api'
+        expected_response = _make_response(
+            content=_THREE_PART_MIME_RESPONSE,
+            headers={'content-type': 'multipart/mixed; boundary="DEADBEEF="'})
+        http = _make_requests_session([expected_response])
         connection = _Connection(http=http)
         client = _Client(connection)
         batch = self._make_one(client)
         batch.API_BASE_URL = 'http://api.example.com'
-        batch._do_request('POST', URL, {}, {'foo': 1, 'bar': 2}, None)
-        batch._do_request('PATCH', URL, {}, {'bar': 3}, None)
-        batch._do_request('DELETE', URL, {}, None, None)
+
+        batch._do_request('POST', url, {}, {'foo': 1, 'bar': 2}, None)
+        batch._do_request('PATCH', url, {}, {'bar': 3}, None)
+        batch._do_request('DELETE', url, {}, None, None)
         result = batch.finish()
+
         self.assertEqual(len(result), len(batch._requests))
-        response0 = httplib2.Response({
-            'content-length': '20',
-            'content-type': 'application/json; charset=UTF-8',
-            'status': '200',
+
+        response1, response2, response3 = result
+
+        self.assertEqual(response1.headers, {
+            'Content-Length': '20',
+            'Content-Type': 'application/json; charset=UTF-8',
         })
-        self.assertEqual(result[0], (response0, {'foo': 1, 'bar': 2}))
-        response1 = response0
-        self.assertEqual(result[1], (response1, {u'foo': 1, u'bar': 3}))
-        response2 = httplib2.Response({
-            'content-length': '0',
-            'status': '204',
+        self.assertEqual(response1.json(), {'foo': 1, 'bar': 2})
+
+        self.assertEqual(response2.headers, {
+            'Content-Length': '20',
+            'Content-Type': 'application/json; charset=UTF-8',
         })
-        self.assertEqual(result[2], (response2, ''))
-        self.assertEqual(len(http._requests), 1)
-        method, uri, headers, body = http._requests[0]
-        self.assertEqual(method, 'POST')
-        self.assertEqual(uri, 'http://api.example.com/batch')
-        self.assertEqual(len(headers), 2)
-        ctype, boundary = [x.strip()
-                           for x in headers['Content-Type'].split(';')]
-        self.assertEqual(ctype, 'multipart/mixed')
-        self.assertTrue(boundary.startswith('boundary="=='))
-        self.assertTrue(boundary.endswith('=="'))
-        self.assertEqual(headers['MIME-Version'], '1.0')
+        self.assertEqual(response2.json(), {'foo': 1, 'bar': 3})
 
-        divider = '--' + boundary[len('boundary="'):-1]
-        chunks = body.split(divider)[1:-1]  # discard prolog / epilog
-        self.assertEqual(len(chunks), 3)
+        self.assertEqual(response3.headers, {'Content-Length': '0'})
+        self.assertEqual(response3.status_code, http_client.NO_CONTENT)
 
-        self._check_subrequest_payload(chunks[0], 'POST', URL,
-                                       {'foo': 1, 'bar': 2})
+        expected_url = '{}/batch'.format(batch.API_BASE_URL)
+        http.request.assert_called_once_with(
+            method='POST', url=expected_url, headers=mock.ANY, data=mock.ANY)
 
-        self._check_subrequest_payload(chunks[1], 'PATCH', URL, {'bar': 3})
+        request_info = self._get_mutlipart_request(http)
+        request_headers, request_body, content_type, boundary = request_info
 
-        self._check_subrequest_no_payload(chunks[2], 'DELETE', URL)
+        self.assertEqual(content_type, 'multipart/mixed')
+        self.assertTrue(boundary.startswith('boundary="=='))
+        self.assertTrue(boundary.endswith('=="'))
+        self.assertEqual(request_headers['MIME-Version'], '1.0')
+
+        chunks = self._get_payload_chunks(boundary, request_body)
+        self.assertEqual(len(chunks), 3)
+        self._check_subrequest_payload(
+            chunks[0], 'POST', url, {'foo': 1, 'bar': 2})
+        self._check_subrequest_payload(chunks[1], 'PATCH', url, {'bar': 3})
+        self._check_subrequest_no_payload(chunks[2], 'DELETE', url)
 
     def test_finish_responses_mismatch(self):
-        URL = 'http://api.example.com/other_api'
-        expected = _Response()
-        expected['content-type'] = 'multipart/mixed; boundary="DEADBEEF="'
-        http = _HTTP((expected, _TWO_PART_MIME_RESPONSE_WITH_FAIL))
+        url = 'http://api.example.com/other_api'
+        expected_response = _make_response(
+            content=_TWO_PART_MIME_RESPONSE_WITH_FAIL,
+            headers={'content-type': 'multipart/mixed; boundary="DEADBEEF="'})
+        http = _make_requests_session([expected_response])
         connection = _Connection(http=http)
         client = _Client(connection)
         batch = self._make_one(client)
         batch.API_BASE_URL = 'http://api.example.com'
-        batch._requests.append(('GET', URL, {}, None))
-        self.assertRaises(ValueError, batch.finish)
+
+        batch._requests.append(('GET', url, {}, None))
+        with self.assertRaises(ValueError):
+            batch.finish()
 
     def test_finish_nonempty_with_status_failure(self):
         from google.cloud.exceptions import NotFound
-
-        URL = 'http://api.example.com/other_api'
-        expected = _Response()
-        expected['content-type'] = 'multipart/mixed; boundary="DEADBEEF="'
-        http = _HTTP((expected, _TWO_PART_MIME_RESPONSE_WITH_FAIL))
+        url = 'http://api.example.com/other_api'
+        expected_response = _make_response(
+            content=_TWO_PART_MIME_RESPONSE_WITH_FAIL,
+            headers={'content-type': 'multipart/mixed; boundary="DEADBEEF="'})
+        http = _make_requests_session([expected_response])
         connection = _Connection(http=http)
         client = _Client(connection)
         batch = self._make_one(client)
         batch.API_BASE_URL = 'http://api.example.com'
         target1 = _MockObject()
         target2 = _MockObject()
-        batch._do_request('GET', URL, {}, None, target1)
-        batch._do_request('GET', URL, {}, None, target2)
+
+        batch._do_request('GET', url, {}, None, target1)
+        batch._do_request('GET', url, {}, None, target2)
+
         # Make sure futures are not populated.
         self.assertEqual([future for future in batch._target_objects],
                          [target1, target2])
         target2_future_before = target2._properties
-        self.assertRaises(NotFound, batch.finish)
+
+        with self.assertRaises(NotFound):
+            batch.finish()
+
         self.assertEqual(target1._properties,
                          {'foo': 1, 'bar': 2})
         self.assertIs(target2._properties, target2_future_before)
 
-        self.assertEqual(len(http._requests), 1)
-        method, uri, headers, body = http._requests[0]
-        self.assertEqual(method, 'POST')
-        self.assertEqual(uri, 'http://api.example.com/batch')
-        self.assertEqual(len(headers), 2)
-        ctype, boundary = [x.strip()
-                           for x in headers['Content-Type'].split(';')]
-        self.assertEqual(ctype, 'multipart/mixed')
-        self.assertTrue(boundary.startswith('boundary="=='))
-        self.assertTrue(boundary.endswith('=="'))
-        self.assertEqual(headers['MIME-Version'], '1.0')
+        expected_url = '{}/batch'.format(batch.API_BASE_URL)
+        http.request.assert_called_once_with(
+            method='POST', url=expected_url, headers=mock.ANY, data=mock.ANY)
 
-        divider = '--' + boundary[len('boundary="'):-1]
-        chunks = body.split(divider)[1:-1]  # discard prolog / epilog
-        self.assertEqual(len(chunks), 2)
+        _, request_body, _, boundary = self._get_mutlipart_request(http)
 
-        self._check_subrequest_payload(chunks[0], 'GET', URL, {})
-        self._check_subrequest_payload(chunks[1], 'GET', URL, {})
+        chunks = self._get_payload_chunks(boundary, request_body)
+        self.assertEqual(len(chunks), 2)
+        self._check_subrequest_payload(chunks[0], 'GET', url, {})
+        self._check_subrequest_payload(chunks[1], 'GET', url, {})
 
     def test_finish_nonempty_non_multipart_response(self):
-        URL = 'http://api.example.com/other_api'
-        expected = _Response()
-        expected['content-type'] = 'text/plain'
-        http = _HTTP((expected, 'NOT A MIME_RESPONSE'))
+        url = 'http://api.example.com/other_api'
+        http = _make_requests_session([_make_response()])
         connection = _Connection(http=http)
         client = _Client(connection)
         batch = self._make_one(client)
-        batch._requests.append(('POST', URL, {}, {'foo': 1, 'bar': 2}))
-        batch._requests.append(('PATCH', URL, {}, {'bar': 3}))
-        batch._requests.append(('DELETE', URL, {}, None))
-        self.assertRaises(ValueError, batch.finish)
+        batch._requests.append(('POST', url, {}, {'foo': 1, 'bar': 2}))
+
+        with self.assertRaises(ValueError):
+            batch.finish()
 
     def test_as_context_mgr_wo_error(self):
         from google.cloud.storage.client import Client
 
-        URL = 'http://example.com/api'
-        expected = _Response()
-        expected['content-type'] = 'multipart/mixed; boundary="DEADBEEF="'
-        http = _HTTP((expected, _THREE_PART_MIME_RESPONSE))
+        url = 'http://example.com/api'
+        expected_response = _make_response(
+            content=_THREE_PART_MIME_RESPONSE,
+            headers={'content-type': 'multipart/mixed; boundary="DEADBEEF="'})
+        http = _make_requests_session([expected_response])
         project = 'PROJECT'
         credentials = _make_credentials()
         client = Client(project=project, credentials=credentials)
@@ -406,13 +443,14 @@ def test_as_context_mgr_wo_error(self):
         target1 = _MockObject()
         target2 = _MockObject()
         target3 = _MockObject()
+
         with self._make_one(client) as batch:
             self.assertEqual(list(client._batch_stack), [batch])
-            batch._make_request('POST', URL, {'foo': 1, 'bar': 2},
+            batch._make_request('POST', url, {'foo': 1, 'bar': 2},
                                 target_object=target1)
-            batch._make_request('PATCH', URL, {'bar': 3},
+            batch._make_request('PATCH', url, {'bar': 3},
                                 target_object=target2)
-            batch._make_request('DELETE', URL, target_object=target3)
+            batch._make_request('DELETE', url, target_object=target3)
 
         self.assertEqual(list(client._batch_stack), [])
         self.assertEqual(len(batch._requests), 3)
@@ -424,14 +462,14 @@ def test_as_context_mgr_wo_error(self):
                          {'foo': 1, 'bar': 2})
         self.assertEqual(target2._properties,
                          {'foo': 1, 'bar': 3})
-        self.assertEqual(target3._properties, '')
+        self.assertEqual(target3._properties, b'')
 
     def test_as_context_mgr_w_error(self):
         from google.cloud.storage.batch import _FutureDict
         from google.cloud.storage.client import Client
 
         URL = 'http://example.com/api'
-        http = _HTTP()
+        http = _make_requests_session([])
         connection = _Connection(http=http)
         project = 'PROJECT'
         credentials = _make_credentials()
@@ -455,8 +493,8 @@ def test_as_context_mgr_w_error(self):
         except ValueError:
             pass
 
+        http.request.assert_not_called()
         self.assertEqual(list(client._batch_stack), [])
-        self.assertEqual(len(http._requests), 0)
         self.assertEqual(len(batch._requests), 3)
         self.assertEqual(batch._target_objects, [target1, target2, target3])
         # Since the context manager fails, finish will not get called and
@@ -468,44 +506,37 @@ def test_as_context_mgr_w_error(self):
 
 class Test__unpack_batch_response(unittest.TestCase):
 
-    def _call_fut(self, response, content):
+    def _call_fut(self, headers, content):
         from google.cloud.storage.batch import _unpack_batch_response
 
-        return _unpack_batch_response(response, content)
+        response = _make_response(content=content, headers=headers)
 
-    def _unpack_helper(self, response, content):
-        import httplib2
+        return _unpack_batch_response(response)
 
+    def _unpack_helper(self, response, content):
         result = list(self._call_fut(response, content))
         self.assertEqual(len(result), 3)
-        response0 = httplib2.Response({
-            'content-length': '20',
-            'content-type': 'application/json; charset=UTF-8',
-            'status': '200',
-        })
-        self.assertEqual(result[0], (response0, {u'bar': 2, u'foo': 1}))
-        response1 = response0
-        self.assertEqual(result[1], (response1, {u'foo': 1, u'bar': 3}))
-        response2 = httplib2.Response({
-            'content-length': '0',
-            'status': '204',
-        })
-        self.assertEqual(result[2], (response2, ''))
 
-    def test_bytes(self):
+        self.assertEqual(result[0].status_code, http_client.OK)
+        self.assertEqual(result[0].json(), {u'bar': 2, u'foo': 1})
+        self.assertEqual(result[1].status_code, http_client.OK)
+        self.assertEqual(result[1].json(), {u'foo': 1, u'bar': 3})
+        self.assertEqual(result[2].status_code, http_client.NO_CONTENT)
+
+    def test_bytes_headers(self):
         RESPONSE = {'content-type': b'multipart/mixed; boundary="DEADBEEF="'}
         CONTENT = _THREE_PART_MIME_RESPONSE
         self._unpack_helper(RESPONSE, CONTENT)
 
-    def test_unicode(self):
+    def test_unicode_headers(self):
         RESPONSE = {'content-type': u'multipart/mixed; boundary="DEADBEEF="'}
-        CONTENT = _THREE_PART_MIME_RESPONSE.decode('utf-8')
+        CONTENT = _THREE_PART_MIME_RESPONSE
         self._unpack_helper(RESPONSE, CONTENT)
 
 
 _TWO_PART_MIME_RESPONSE_WITH_FAIL = b"""\
 --DEADBEEF=
-Content-Type: application/http
+Content-Type: application/json
 Content-ID: <response-8a09ca85-8d1d-4f45-9eb0-da8e8b07ec83+1>
 
 HTTP/1.1 200 OK
@@ -515,7 +546,7 @@ def test_unicode(self):
 {"foo": 1, "bar": 2}
 
 --DEADBEEF=
-Content-Type: application/http
+Content-Type: application/json
 Content-ID: <response-8a09ca85-8d1d-4f45-9eb0-da8e8b07ec83+2>
 
 HTTP/1.1 404 Not Found
@@ -529,7 +560,7 @@ def test_unicode(self):
 
 _THREE_PART_MIME_RESPONSE = b"""\
 --DEADBEEF=
-Content-Type: application/http
+Content-Type: application/json
 Content-ID: <response-8a09ca85-8d1d-4f45-9eb0-da8e8b07ec83+1>
 
 HTTP/1.1 200 OK
@@ -539,7 +570,7 @@ def test_unicode(self):
 {"foo": 1, "bar": 2}
 
 --DEADBEEF=
-Content-Type: application/http
+Content-Type: application/json
 Content-ID: <response-8a09ca85-8d1d-4f45-9eb0-da8e8b07ec83+2>
 
 HTTP/1.1 200 OK
@@ -549,7 +580,7 @@ def test_unicode(self):
 {"foo": 1, "bar": 3}
 
 --DEADBEEF=
-Content-Type: application/http
+Content-Type: text/plain
 Content-ID: <response-8a09ca85-8d1d-4f45-9eb0-da8e8b07ec83+3>
 
 HTTP/1.1 204 No Content
@@ -591,25 +622,8 @@ def __init__(self, **kw):
         self.__dict__.update(kw)
 
     def _make_request(self, method, url, data=None, headers=None):
-        return self.http.request(uri=url, method=method,
-                                 headers=headers, body=data)
-
-
-class _Response(dict):
-    def __init__(self, status=200, **kw):
-        self.status = status
-        super(_Response, self).__init__(**kw)
-
-
-class _HTTP(object):
-    def __init__(self, *responses):
-        self._requests = []
-        self._responses = list(responses)
-
-    def request(self, uri, method, headers, body):
-        self._requests.append((method, uri, headers, body))
-        response, self._responses = self._responses[0], self._responses[1:]
-        return response
+        return self.http.request(url=url, method=method,
+                                 headers=headers, data=data)
 
 
 class _MockObject(object):
diff --git a/storage/tests/unit/test_blob.py b/storage/tests/unit/test_blob.py
index e2227adbd94ae..7904ce86e89bc 100644
--- a/storage/tests/unit/test_blob.py
+++ b/storage/tests/unit/test_blob.py
@@ -376,9 +376,15 @@ def test__get_download_url_on_the_fly_with_generation(self):
 
     @staticmethod
     def _mock_requests_response(status_code, headers, content=b''):
-        return mock.Mock(
-            content=content, headers=headers, status_code=status_code,
-            spec=['content', 'headers', 'status_code'])
+        import requests
+
+        response = requests.Response()
+        response.status_code = status_code
+        response.headers.update(headers)
+        response._content = content
+        response.request = requests.Request(
+            'POST', 'http://example.com').prepare()
+        return response
 
     def _mock_download_transport(self):
         fake_transport = mock.Mock(spec=['request'])
@@ -1159,19 +1165,23 @@ def test_upload_from_file_with_rewind(self):
         assert stream.tell() == 0
 
     def test_upload_from_file_failure(self):
+        import requests
+
         from google.resumable_media import InvalidResponse
         from google.cloud import exceptions
 
         message = b'Someone is already in this spot.'
-        response = mock.Mock(
-            content=message, status_code=http_client.CONFLICT,
-            spec=[u'content', u'status_code'])
+        response = requests.Response()
+        response._content = message
+        response.status_code = http_client.CONFLICT
+        response.request = requests.Request(
+            'POST', 'http://example.com').prepare()
         side_effect = InvalidResponse(response)
 
         with self.assertRaises(exceptions.Conflict) as exc_info:
             self._upload_from_file_helper(side_effect=side_effect)
 
-        self.assertEqual(exc_info.exception.message, message.decode('utf-8'))
+        self.assertIn(message.decode('utf-8'), exc_info.exception.message)
         self.assertEqual(exc_info.exception.errors, [])
 
     def _do_upload_mock_call_helper(self, blob, client, content_type, size):
@@ -1309,16 +1319,16 @@ def test_create_resumable_upload_session_with_failure(self):
         from google.cloud import exceptions
 
         message = b'5-oh-3 woe is me.'
-        response = mock.Mock(
+        response = self._mock_requests_response(
             content=message, status_code=http_client.SERVICE_UNAVAILABLE,
-            spec=[u'content', u'status_code'])
+            headers={})
         side_effect = InvalidResponse(response)
 
         with self.assertRaises(exceptions.ServiceUnavailable) as exc_info:
             self._create_resumable_upload_session_helper(
                 side_effect=side_effect)
 
-        self.assertEqual(exc_info.exception.message, message.decode('utf-8'))
+        self.assertIn(message.decode('utf-8'), exc_info.exception.message)
         self.assertEqual(exc_info.exception.errors, [])
 
     def test_get_iam_policy(self):
@@ -2225,12 +2235,16 @@ def _call_fut(*args, **kwargs):
         return _raise_from_invalid_response(*args, **kwargs)
 
     def _helper(self, message, **kwargs):
+        import requests
+
         from google.resumable_media import InvalidResponse
         from google.cloud import exceptions
 
-        response = mock.Mock(
-            content=message, status_code=http_client.BAD_REQUEST,
-            spec=[u'content', u'status_code'])
+        response = requests.Response()
+        response.request = requests.Request(
+            'GET', 'http://example.com').prepare()
+        response.status_code = http_client.BAD_REQUEST
+        response._content = message
         error = InvalidResponse(response)
 
         with self.assertRaises(exceptions.BadRequest) as exc_info:
@@ -2241,17 +2255,9 @@ def _helper(self, message, **kwargs):
     def test_default(self):
         message = b'Failure'
         exc_info = self._helper(message)
-        self.assertEqual(exc_info.exception.message, message.decode('utf-8'))
-        self.assertEqual(exc_info.exception.errors, [])
-
-    def test_with_error_info(self):
-        message = b'Eeek bad.'
-        error_info = 'http://test.invalid'
-        exc_info = self._helper(message, error_info=error_info)
-
         message_str = message.decode('utf-8')
-        full_message = u'{} ({})'.format(message_str, error_info)
-        self.assertEqual(exc_info.exception.message, full_message)
+        expected = 'GET http://example.com/: {}'.format(message_str)
+        self.assertEqual(exc_info.exception.message, expected)
         self.assertEqual(exc_info.exception.errors, [])
 
 
diff --git a/storage/tests/unit/test_client.py b/storage/tests/unit/test_client.py
index 9696d4e5fa515..ab75d9be8fcaf 100644
--- a/storage/tests/unit/test_client.py
+++ b/storage/tests/unit/test_client.py
@@ -12,9 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import json
 import unittest
 
 import mock
+import requests
+from six.moves import http_client
 
 
 def _make_credentials():
@@ -23,6 +26,30 @@ def _make_credentials():
     return mock.Mock(spec=google.auth.credentials.Credentials)
 
 
+def _make_response(status=http_client.OK, content=b'', headers={}):
+    response = requests.Response()
+    response.status_code = status
+    response._content = content
+    response.headers = headers
+    response.request = requests.Request()
+    return response
+
+
+def _make_json_response(data, status=http_client.OK, headers=None):
+    headers = headers or {}
+    headers['Content-Type'] = 'application/json'
+    return _make_response(
+        status=status,
+        content=json.dumps(data).encode('utf-8'),
+        headers=headers)
+
+
+def _make_requests_session(responses):
+    session = mock.create_autospec(requests.Session, instance=True)
+    session.request.side_effect = responses
+    return session
+
+
 class TestClient(unittest.TestCase):
 
     @staticmethod
@@ -140,13 +167,15 @@ def test_get_bucket_miss(self):
             'b',
             'nonesuch?projection=noAcl',
         ])
-        http = client._http_internal = _Http(
-            {'status': '404', 'content-type': 'application/json'},
-            b'{}',
-        )
-        self.assertRaises(NotFound, client.get_bucket, NONESUCH)
-        self.assertEqual(http._called_with['method'], 'GET')
-        self.assertEqual(http._called_with['uri'], URI)
+        http = _make_requests_session([
+            _make_json_response({}, status=http_client.NOT_FOUND)])
+        client._http_internal = http
+
+        with self.assertRaises(NotFound):
+            client.get_bucket(NONESUCH)
+
+        http.request.assert_called_once_with(
+            method='GET', url=URI, data=mock.ANY, headers=mock.ANY)
 
     def test_get_bucket_hit(self):
         from google.cloud.storage.bucket import Bucket
@@ -163,16 +192,17 @@ def test_get_bucket_hit(self):
             'b',
             '%s?projection=noAcl' % (BLOB_NAME,),
         ])
-        http = client._http_internal = _Http(
-            {'status': '200', 'content-type': 'application/json'},
-            '{{"name": "{0}"}}'.format(BLOB_NAME).encode('utf-8'),
-        )
+
+        data = {'name': BLOB_NAME}
+        http = _make_requests_session([_make_json_response(data)])
+        client._http_internal = http
 
         bucket = client.get_bucket(BLOB_NAME)
+
         self.assertIsInstance(bucket, Bucket)
         self.assertEqual(bucket.name, BLOB_NAME)
-        self.assertEqual(http._called_with['method'], 'GET')
-        self.assertEqual(http._called_with['uri'], URI)
+        http.request.assert_called_once_with(
+            method='GET', url=URI, data=mock.ANY, headers=mock.ANY)
 
     def test_lookup_bucket_miss(self):
         PROJECT = 'PROJECT'
@@ -187,14 +217,15 @@ def test_lookup_bucket_miss(self):
             'b',
             'nonesuch?projection=noAcl',
         ])
-        http = client._http_internal = _Http(
-            {'status': '404', 'content-type': 'application/json'},
-            b'{}',
-        )
+        http = _make_requests_session([
+            _make_json_response({}, status=http_client.NOT_FOUND)])
+        client._http_internal = http
+
         bucket = client.lookup_bucket(NONESUCH)
+
         self.assertIsNone(bucket)
-        self.assertEqual(http._called_with['method'], 'GET')
-        self.assertEqual(http._called_with['uri'], URI)
+        http.request.assert_called_once_with(
+            method='GET', url=URI, data=mock.ANY, headers=mock.ANY)
 
     def test_lookup_bucket_hit(self):
         from google.cloud.storage.bucket import Bucket
@@ -211,16 +242,16 @@ def test_lookup_bucket_hit(self):
             'b',
             '%s?projection=noAcl' % (BLOB_NAME,),
         ])
-        http = client._http_internal = _Http(
-            {'status': '200', 'content-type': 'application/json'},
-            '{{"name": "{0}"}}'.format(BLOB_NAME).encode('utf-8'),
-        )
+        data = {'name': BLOB_NAME}
+        http = _make_requests_session([_make_json_response(data)])
+        client._http_internal = http
 
         bucket = client.lookup_bucket(BLOB_NAME)
+
         self.assertIsInstance(bucket, Bucket)
         self.assertEqual(bucket.name, BLOB_NAME)
-        self.assertEqual(http._called_with['method'], 'GET')
-        self.assertEqual(http._called_with['uri'], URI)
+        http.request.assert_called_once_with(
+            method='GET', url=URI, data=mock.ANY, headers=mock.ANY)
 
     def test_create_bucket_conflict(self):
         from google.cloud.exceptions import Conflict
@@ -236,14 +267,14 @@ def test_create_bucket_conflict(self):
             client._connection.API_VERSION,
             'b?project=%s' % (PROJECT,),
         ])
-        http = client._http_internal = _Http(
-            {'status': '409', 'content-type': 'application/json'},
-            '{"error": {"message": "Conflict"}}',
-        )
+        data = {'error': {'message': 'Conflict'}}
+        http = _make_requests_session([
+            _make_json_response(data, status=http_client.CONFLICT)])
+        client._http_internal = http
 
         self.assertRaises(Conflict, client.create_bucket, BLOB_NAME)
-        self.assertEqual(http._called_with['method'], 'POST')
-        self.assertEqual(http._called_with['uri'], URI)
+        http.request.assert_called_once_with(
+            method='POST', url=URI, data=mock.ANY, headers=mock.ANY)
 
     def test_create_bucket_success(self):
         from google.cloud.storage.bucket import Bucket
@@ -259,16 +290,16 @@ def test_create_bucket_success(self):
             client._connection.API_VERSION,
             'b?project=%s' % (PROJECT,),
         ])
-        http = client._http_internal = _Http(
-            {'status': '200', 'content-type': 'application/json'},
-            '{{"name": "{0}"}}'.format(BLOB_NAME).encode('utf-8'),
-        )
+        data = {'name': BLOB_NAME}
+        http = _make_requests_session([_make_json_response(data)])
+        client._http_internal = http
 
         bucket = client.create_bucket(BLOB_NAME)
+
         self.assertIsInstance(bucket, Bucket)
         self.assertEqual(bucket.name, BLOB_NAME)
-        self.assertEqual(http._called_with['method'], 'POST')
-        self.assertEqual(http._called_with['uri'], URI)
+        http.request.assert_called_once_with(
+            method='POST', url=URI, data=mock.ANY, headers=mock.ANY)
 
     def test_list_buckets_empty(self):
         from six.moves.urllib.parse import parse_qs
@@ -278,59 +309,50 @@ def test_list_buckets_empty(self):
         CREDENTIALS = _make_credentials()
         client = self._make_one(project=PROJECT, credentials=CREDENTIALS)
 
-        EXPECTED_QUERY = {
-            'project': [PROJECT],
-            'projection': ['noAcl'],
-        }
-        http = client._http_internal = _Http(
-            {'status': '200', 'content-type': 'application/json'},
-            b'{}',
-        )
+        http = _make_requests_session([_make_json_response({})])
+        client._http_internal = http
+
         buckets = list(client.list_buckets())
+
         self.assertEqual(len(buckets), 0)
-        self.assertEqual(http._called_with['method'], 'GET')
-        self.assertIsNone(http._called_with['body'])
 
-        BASE_URI = '/'.join([
+        http.request.assert_called_once_with(
+            method='GET', url=mock.ANY, data=mock.ANY, headers=mock.ANY)
+
+        requested_url = http.request.mock_calls[0][2]['url']
+        expected_base_url = '/'.join([
             client._connection.API_BASE_URL,
             'storage',
             client._connection.API_VERSION,
             'b',
         ])
-        URI = http._called_with['uri']
-        self.assertTrue(URI.startswith(BASE_URI))
-        uri_parts = urlparse(URI)
-        self.assertEqual(parse_qs(uri_parts.query), EXPECTED_QUERY)
+        self.assertTrue(requested_url.startswith(expected_base_url))
 
-    def test_list_buckets_non_empty(self):
-        from six.moves.urllib.parse import parse_qs
-        from six.moves.urllib.parse import urlencode
-        from six.moves.urllib.parse import urlparse
+        expected_query = {
+            'project': [PROJECT],
+            'projection': ['noAcl'],
+        }
+        uri_parts = urlparse(requested_url)
+        self.assertEqual(parse_qs(uri_parts.query), expected_query)
 
+    def test_list_buckets_non_empty(self):
         PROJECT = 'PROJECT'
         CREDENTIALS = _make_credentials()
         client = self._make_one(project=PROJECT, credentials=CREDENTIALS)
 
         BUCKET_NAME = 'bucket-name'
-        query_params = urlencode({'project': PROJECT, 'projection': 'noAcl'})
-        BASE_URI = '/'.join([
-            client._connection.API_BASE_URL,
-            'storage',
-            client._connection.API_VERSION,
-        ])
-        URI = '/'.join([BASE_URI, 'b?%s' % (query_params,)])
-        http = client._http_internal = _Http(
-            {'status': '200', 'content-type': 'application/json'},
-            '{{"items": [{{"name": "{0}"}}]}}'.format(BUCKET_NAME)
-            .encode('utf-8'),
-        )
+
+        data = {'items': [{'name': BUCKET_NAME}]}
+        http = _make_requests_session([_make_json_response(data)])
+        client._http_internal = http
+
         buckets = list(client.list_buckets())
+
         self.assertEqual(len(buckets), 1)
         self.assertEqual(buckets[0].name, BUCKET_NAME)
-        self.assertEqual(http._called_with['method'], 'GET')
-        self.assertTrue(http._called_with['uri'].startswith(BASE_URI))
-        self.assertEqual(parse_qs(urlparse(http._called_with['uri']).query),
-                         parse_qs(urlparse(URI).query))
+
+        http.request.assert_called_once_with(
+            method='GET', url=mock.ANY, data=mock.ANY, headers=mock.ANY)
 
     def test_list_buckets_all_arguments(self):
         from six.moves.urllib.parse import parse_qs
@@ -345,19 +367,10 @@ def test_list_buckets_all_arguments(self):
         PREFIX = 'subfolder'
         PROJECTION = 'full'
         FIELDS = 'items/id,nextPageToken'
-        EXPECTED_QUERY = {
-            'project': [PROJECT],
-            'maxResults': [str(MAX_RESULTS)],
-            'pageToken': [PAGE_TOKEN],
-            'prefix': [PREFIX],
-            'projection': [PROJECTION],
-            'fields': [FIELDS],
-        }
 
-        http = client._http_internal = _Http(
-            {'status': '200', 'content-type': 'application/json'},
-            '{"items": []}',
-        )
+        data = {'items': []}
+        http = _make_requests_session([_make_json_response(data)])
+        client._http_internal = http
         iterator = client.list_buckets(
             max_results=MAX_RESULTS,
             page_token=PAGE_TOKEN,
@@ -367,19 +380,28 @@ def test_list_buckets_all_arguments(self):
         )
         buckets = list(iterator)
         self.assertEqual(buckets, [])
-        self.assertEqual(http._called_with['method'], 'GET')
-        self.assertIsNone(http._called_with['body'])
+        http.request.assert_called_once_with(
+            method='GET', url=mock.ANY, data=mock.ANY, headers=mock.ANY)
 
-        BASE_URI = '/'.join([
+        requested_url = http.request.mock_calls[0][2]['url']
+        expected_base_url = '/'.join([
             client._connection.API_BASE_URL,
             'storage',
             client._connection.API_VERSION,
-            'b'
+            'b',
         ])
-        URI = http._called_with['uri']
-        self.assertTrue(URI.startswith(BASE_URI))
-        uri_parts = urlparse(URI)
-        self.assertEqual(parse_qs(uri_parts.query), EXPECTED_QUERY)
+        self.assertTrue(requested_url.startswith(expected_base_url))
+
+        expected_query = {
+            'project': [PROJECT],
+            'maxResults': [str(MAX_RESULTS)],
+            'pageToken': [PAGE_TOKEN],
+            'prefix': [PREFIX],
+            'projection': [PROJECTION],
+            'fields': [FIELDS],
+        }
+        uri_parts = urlparse(requested_url)
+        self.assertEqual(parse_qs(uri_parts.query), expected_query)
 
     def test_page_empty_response(self):
         from google.cloud.iterator import Page
@@ -415,18 +437,3 @@ def dummy_response():
         self.assertEqual(page.remaining, 0)
         self.assertIsInstance(bucket, Bucket)
         self.assertEqual(bucket.name, blob_name)
-
-
-class _Http(object):
-
-    _called_with = None
-
-    def __init__(self, headers, content):
-        from httplib2 import Response
-
-        self._response = Response(headers)
-        self._content = content
-
-    def request(self, **kw):
-        self._called_with = kw
-        return self._response, self._content
diff --git a/translate/google/cloud/translate_v2/client.py b/translate/google/cloud/translate_v2/client.py
index d72993f0fffdc..6bddfe3f25531 100644
--- a/translate/google/cloud/translate_v2/client.py
+++ b/translate/google/cloud/translate_v2/client.py
@@ -47,10 +47,10 @@ class Client(BaseClient):
                         passed), falls back to the default inferred from the
                         environment.
 
-    :type _http: :class:`~httplib2.Http`
+    :type _http: :class:`~requests.Session`
     :param _http: (Optional) HTTP object to make requests. Can be any object
                   that defines ``request()`` with the same interface as
-                  :meth:`~httplib2.Http.request`. If not passed, an
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/translate/tests/unit/test__http.py b/translate/tests/unit/test__http.py
index 2dc6b015d6dec..edec628309b0e 100644
--- a/translate/tests/unit/test__http.py
+++ b/translate/tests/unit/test__http.py
@@ -56,13 +56,17 @@ def test_build_api_url_w_extra_query_params(self):
         self.assertEqual(params, query_params)
 
     def test_extra_headers(self):
+        import requests
+
         from google.cloud import _http as base_http
         from google.cloud.translate_v2 import _http as MUT
 
-        http = mock.Mock(spec=['request'])
-        response = mock.Mock(status=200, spec=['status'])
+        http = mock.create_autospec(requests.Session, instance=True)
+        response = requests.Response()
+        response.status_code = 200
         data = b'brent-spiner'
-        http.request.return_value = response, data
+        response._content = data
+        http.request.return_value = response
         client = mock.Mock(_http=http, spec=['_http'])
 
         conn = self._make_one(client)
@@ -72,15 +76,14 @@ def test_extra_headers(self):
         self.assertEqual(result, data)
 
         expected_headers = {
-            'Content-Length': str(len(req_data)),
             'Accept-Encoding': 'gzip',
             base_http.CLIENT_INFO_HEADER: MUT._CLIENT_INFO,
             'User-Agent': conn.USER_AGENT,
         }
         expected_uri = conn.build_api_url('/rainbow')
         http.request.assert_called_once_with(
-            body=req_data,
+            data=req_data,
             headers=expected_headers,
             method='GET',
-            uri=expected_uri,
+            url=expected_uri,
         )
diff --git a/vision/google/cloud/vision/client.py b/vision/google/cloud/vision/client.py
index 8dc6930069991..e0a0256e47c31 100644
--- a/vision/google/cloud/vision/client.py
+++ b/vision/google/cloud/vision/client.py
@@ -43,10 +43,10 @@ class Client(ClientWithProject):
                         passed), falls back to the default inferred from the
                         environment.
 
-    :type _http: :class:`~httplib2.Http`
+    :type _http: :class:`~requests.Session`
     :param _http: (Optional) HTTP object to make requests. Can be any object
                   that defines ``request()`` with the same interface as
-                  :meth:`~httplib2.Http.request`. If not passed, an
+                  :meth:`requests.Session.request`. If not passed, an
                   ``_http`` object is created that is bound to the
                   ``credentials`` for the current object.
                   This parameter should be considered private, and could
diff --git a/vision/tests/unit/test__http.py b/vision/tests/unit/test__http.py
index ee486e409b8a0..ca5d470589bd9 100644
--- a/vision/tests/unit/test__http.py
+++ b/vision/tests/unit/test__http.py
@@ -40,13 +40,17 @@ def test_default_url(self):
         self.assertEqual(conn._client, client)
 
     def test_extra_headers(self):
+        import requests
+
         from google.cloud import _http as base_http
         from google.cloud.vision import _http as MUT
 
-        http = mock.Mock(spec=['request'])
-        response = mock.Mock(status=200, spec=['status'])
+        http = mock.create_autospec(requests.Session, instance=True)
+        response = requests.Response()
+        response.status_code = 200
         data = b'brent-spiner'
-        http.request.return_value = response, data
+        response._content = data
+        http.request.return_value = response
         client = mock.Mock(_http=http, spec=['_http'])
 
         conn = self._make_one(client)
@@ -56,17 +60,16 @@ def test_extra_headers(self):
         self.assertEqual(result, data)
 
         expected_headers = {
-            'Content-Length': str(len(req_data)),
             'Accept-Encoding': 'gzip',
             base_http.CLIENT_INFO_HEADER: MUT._CLIENT_INFO,
             'User-Agent': conn.USER_AGENT,
         }
         expected_uri = conn.build_api_url('/rainbow')
         http.request.assert_called_once_with(
-            body=req_data,
+            data=req_data,
             headers=expected_headers,
             method='GET',
-            uri=expected_uri,
+            url=expected_uri,
         )
 
 

From a1269a6f93f4b308f9af83176be097eac648aa2f Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Thu, 27 Jul 2017 16:40:55 -0400
Subject: [PATCH 131/211] Create parameter type aliases for scalar field types.
 (#3670)

See #3364
---
 spanner/google/cloud/spanner/__init__.py | 29 ++++++++++++++++++++----
 spanner/google/cloud/spanner/types.py    | 27 ++++++++++++++++++++++
 2 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 spanner/google/cloud/spanner/types.py

diff --git a/spanner/google/cloud/spanner/__init__.py b/spanner/google/cloud/spanner/__init__.py
index 31913d8b1202f..6b9366ab6646a 100644
--- a/spanner/google/cloud/spanner/__init__.py
+++ b/spanner/google/cloud/spanner/__init__.py
@@ -18,7 +18,6 @@
 import pkg_resources
 __version__ = pkg_resources.get_distribution('google-cloud-spanner').version
 
-
 from google.cloud.spanner.client import Client
 
 from google.cloud.spanner.keyset import KeyRange
@@ -28,6 +27,28 @@
 from google.cloud.spanner.pool import BurstyPool
 from google.cloud.spanner.pool import FixedSizePool
 
-
-__all__ = ['__version__', 'AbstractSessionPool', 'BurstyPool', 'Client',
-           'FixedSizePool', 'KeyRange', 'KeySet']
+from google.cloud.spanner.types import BOOL_PARAM_TYPE
+from google.cloud.spanner.types import BYTES_PARAM_TYPE
+from google.cloud.spanner.types import DATE_PARAM_TYPE
+from google.cloud.spanner.types import FLOAT64_PARAM_TYPE
+from google.cloud.spanner.types import INT64_PARAM_TYPE
+from google.cloud.spanner.types import STRING_PARAM_TYPE
+from google.cloud.spanner.types import TIMESTAMP_PARAM_TYPE
+
+
+__all__ = [
+    '__version__',
+    'AbstractSessionPool',
+    'BOOL_PARAM_TYPE',
+    'BYTES_PARAM_TYPE',
+    'BurstyPool',
+    'Client',
+    'DATE_PARAM_TYPE',
+    'FLOAT64_PARAM_TYPE',
+    'FixedSizePool',
+    'INT64_PARAM_TYPE',
+    'KeyRange',
+    'KeySet',
+    'STRING_PARAM_TYPE',
+    'TIMESTAMP_PARAM_TYPE',
+]
diff --git a/spanner/google/cloud/spanner/types.py b/spanner/google/cloud/spanner/types.py
new file mode 100644
index 0000000000000..aa0316ee02b93
--- /dev/null
+++ b/spanner/google/cloud/spanner/types.py
@@ -0,0 +1,27 @@
+# Copyright 2017 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Types exported from this package."""
+
+from google.cloud.proto.spanner.v1 import type_pb2
+
+
+# Scalar paramter types
+STRING_PARAM_TYPE = type_pb2.Type(code=type_pb2.STRING)
+BYTES_PARAM_TYPE = type_pb2.Type(code=type_pb2.BYTES)
+BOOL_PARAM_TYPE = type_pb2.Type(code=type_pb2.BOOL)
+INT64_PARAM_TYPE = type_pb2.Type(code=type_pb2.INT64)
+FLOAT64_PARAM_TYPE = type_pb2.Type(code=type_pb2.FLOAT64)
+DATE_PARAM_TYPE = type_pb2.Type(code=type_pb2.DATE)
+TIMESTAMP_PARAM_TYPE = type_pb2.Type(code=type_pb2.TIMESTAMP)

From 9d9b6c0708ae6553458ad6107e5ad8efb23762e8 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Thu, 27 Jul 2017 17:11:31 -0400
Subject: [PATCH 132/211] Appease current pylint opinions: (#3692)

- Document missing ':raises:', ':rtype:', and ':returns:'.
- Use ':raises <exception_type>:'.
- Add pro-forma docstrings to namespace package initializers.
- Avoid using 'len(seq) == 0' (or '!=') for boolean tests.

pylint still complains about import cycles:

  ************* Module google.cloud.spanner.streamed
  R:  1, 0: Cyclic import (google.cloud.spanner ->
  google.cloud.spanner.client -> google.cloud.spanner.instance ->
  google.cloud.spanner.database) (cyclic-import)
  R:  1, 0: Cyclic import (google.cloud.spanner ->
  google.cloud.spanner.client) (cyclic-import)
---
 spanner/google/__init__.py                  |  2 ++
 spanner/google/cloud/__init__.py            |  2 ++
 spanner/google/cloud/spanner/_helpers.py    | 11 ++++++---
 spanner/google/cloud/spanner/database.py    | 27 ++++++++++++++++++---
 spanner/google/cloud/spanner/instance.py    | 22 +++++++++++++----
 spanner/google/cloud/spanner/pool.py        |  8 ++++++
 spanner/google/cloud/spanner/session.py     | 16 +++++++++---
 spanner/google/cloud/spanner/snapshot.py    | 16 ++++++------
 spanner/google/cloud/spanner/streamed.py    |  2 +-
 spanner/google/cloud/spanner/transaction.py |  8 +++---
 10 files changed, 86 insertions(+), 28 deletions(-)

diff --git a/spanner/google/__init__.py b/spanner/google/__init__.py
index b2b8333738826..a35569c36339e 100644
--- a/spanner/google/__init__.py
+++ b/spanner/google/__init__.py
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+"""Google namespace package."""
+
 try:
     import pkg_resources
     pkg_resources.declare_namespace(__name__)
diff --git a/spanner/google/cloud/__init__.py b/spanner/google/cloud/__init__.py
index b2b8333738826..59a804265f5c3 100644
--- a/spanner/google/cloud/__init__.py
+++ b/spanner/google/cloud/__init__.py
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+"""Google Cloud namespace package."""
+
 try:
     import pkg_resources
     pkg_resources.declare_namespace(__name__)
diff --git a/spanner/google/cloud/spanner/_helpers.py b/spanner/google/cloud/spanner/_helpers.py
index 021c6de05215d..ef3d2530287cf 100644
--- a/spanner/google/cloud/spanner/_helpers.py
+++ b/spanner/google/cloud/spanner/_helpers.py
@@ -38,6 +38,7 @@ class TimestampWithNanoseconds(datetime.datetime):
     """
     __slots__ = ('_nanosecond',)
 
+    # pylint: disable=arguments-differ
     def __new__(cls, *args, **kw):
         nanos = kw.pop('nanosecond', 0)
         if nanos > 0:
@@ -48,6 +49,7 @@ def __new__(cls, *args, **kw):
         inst = datetime.datetime.__new__(cls, *args, **kw)
         inst._nanosecond = nanos or 0
         return inst
+    # pylint: disable=arguments-differ
 
     @property
     def nanosecond(self):
@@ -74,6 +76,7 @@ def from_rfc3339(cls, stamp):
 
         :rtype: :class:`TimestampWithNanoseconds`
         :returns: an instance matching the timestamp string
+        :raises ValueError: if ``stamp`` does not match the expected format
         """
         with_nanos = _RFC3339_NANOS.match(stamp)
         if with_nanos is None:
@@ -110,7 +113,7 @@ def _try_to_coerce_bytes(bytestring):
                          'base64-encoded bytes.')
 
 
-# pylint: disable=too-many-return-statements
+# pylint: disable=too-many-return-statements,too-many-branches
 def _make_value_pb(value):
     """Helper for :func:`_make_list_value_pbs`.
 
@@ -119,7 +122,7 @@ def _make_value_pb(value):
 
     :rtype: :class:`~google.protobuf.struct_pb2.Value`
     :returns: value protobufs
-    :raises: :exc:`ValueError` if value is not of a known scalar type.
+    :raises ValueError: if value is not of a known scalar type.
     """
     if value is None:
         return Value(null_value='NULL_VALUE')
@@ -150,7 +153,7 @@ def _make_value_pb(value):
     if isinstance(value, six.text_type):
         return Value(string_value=value)
     raise ValueError("Unknown type: %s" % (value,))
-# pylint: enable=too-many-return-statements
+# pylint: enable=too-many-return-statements,too-many-branches
 
 
 def _make_list_value_pb(values):
@@ -189,7 +192,7 @@ def _parse_value_pb(value_pb, field_type):
 
     :rtype: varies on field_type
     :returns: value extracted from value_pb
-    :raises: ValueError if uknown type is passed
+    :raises ValueError: if unknown type is passed
     """
     if value_pb.HasField('null_value'):
         return None
diff --git a/spanner/google/cloud/spanner/database.py b/spanner/google/cloud/spanner/database.py
index 8df06812949de..9b838bfaa8780 100644
--- a/spanner/google/cloud/spanner/database.py
+++ b/spanner/google/cloud/spanner/database.py
@@ -99,9 +99,8 @@ def from_pb(cls, database_pb, instance, pool=None):
 
         :rtype: :class:`Database`
         :returns: The database parsed from the protobuf response.
-        :raises:
-            :class:`ValueError <exceptions.ValueError>` if the instance
-            name does not match the expected format
+        :raises ValueError:
+            if the instance name does not match the expected format
             or if the parsed project ID does not match the project ID
             on the instance's client, or if the parsed instance ID does
             not match the instance's ID.
@@ -175,6 +174,13 @@ def create(self):
 
         See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.CreateDatabase
+
+        :rtype: :class:`~google.cloud.future.operation.Operation`
+        :returns: a future used to poll the status of the create request
+        :raises Conflict: if the database already exists
+        :raises NotFound: if the instance owning the database does not exist
+        :raises GaxError:
+            for errors other than ``ALREADY_EXISTS`` returned from the call
         """
         api = self._instance._client.database_admin_api
         options = _options_with_prefix(self.name)
@@ -205,6 +211,11 @@ def exists(self):
 
         See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.GetDatabaseDDL
+
+        :rtype: bool
+        :returns: True if the database exists, else false.
+        :raises GaxError:
+            for errors other than ``NOT_FOUND`` returned from the call
         """
         api = self._instance._client.database_admin_api
         options = _options_with_prefix(self.name)
@@ -224,6 +235,10 @@ def reload(self):
 
         See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.GetDatabaseDDL
+
+        :raises NotFound: if the database does not exist
+        :raises GaxError:
+            for errors other than ``NOT_FOUND`` returned from the call
         """
         api = self._instance._client.database_admin_api
         options = _options_with_prefix(self.name)
@@ -246,6 +261,9 @@ def update_ddl(self, ddl_statements):
 
         :rtype: :class:`google.cloud.future.operation.Operation`
         :returns: an operation instance
+        :raises NotFound: if the database does not exist
+        :raises GaxError:
+            for errors other than ``NOT_FOUND`` returned from the call
         """
         client = self._instance._client
         api = client.database_admin_api
@@ -474,6 +492,9 @@ def _check_ddl_statements(value):
 
     :rtype: tuple
     :returns: tuple of validated DDL statement strings.
+    :raises ValueError:
+        if elements in ``value`` are not strings, or if ``value`` contains
+        a ``CREATE DATABASE`` statement.
     """
     if not all(isinstance(line, six.string_types) for line in value):
         raise ValueError("Pass a list of strings")
diff --git a/spanner/google/cloud/spanner/instance.py b/spanner/google/cloud/spanner/instance.py
index e67a0c31be6c5..5bd4663764f5d 100644
--- a/spanner/google/cloud/spanner/instance.py
+++ b/spanner/google/cloud/spanner/instance.py
@@ -109,11 +109,10 @@ def from_pb(cls, instance_pb, client):
 
         :rtype: :class:`Instance`
         :returns: The instance parsed from the protobuf response.
-        :raises: :class:`ValueError <exceptions.ValueError>` if the instance
-                 name does not match
-                 ``projects/{project}/instances/{instance_id}``
-                 or if the parsed project ID does not match the project ID
-                 on the client.
+        :raises ValueError:
+            if the instance name does not match
+            ``projects/{project}/instances/{instance_id}`` or if the parsed
+            project ID does not match the project ID on the client.
         """
         match = _INSTANCE_NAME_RE.match(instance_pb.name)
         if match is None:
@@ -201,6 +200,9 @@ def create(self):
 
         :rtype: :class:`google.cloud.future.operation.Operation`
         :returns: an operation instance
+        :raises Conflict: if the instance already exists
+        :raises GaxError:
+            for errors other than ``ALREADY_EXISTS`` returned from the call
         """
         api = self._client.instance_admin_api
         instance_pb = admin_v1_pb2.Instance(
@@ -230,6 +232,11 @@ def exists(self):
 
         See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.GetInstanceConfig
+
+        :rtype: bool
+        :returns: True if the instance exists, else false
+        :raises GaxError:
+            for errors other than ``NOT_FOUND`` returned from the call
         """
         api = self._client.instance_admin_api
         options = _options_with_prefix(self.name)
@@ -248,6 +255,9 @@ def reload(self):
 
         See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.GetInstanceConfig
+
+        :raises NotFound: if the instance does not exist
+        :raises GaxError: for other errors returned from the call
         """
         api = self._client.instance_admin_api
         options = _options_with_prefix(self.name)
@@ -281,6 +291,8 @@ def update(self):
 
         :rtype: :class:`google.cloud.future.operation.Operation`
         :returns: an operation instance
+        :raises NotFound: if the instance does not exist
+        :raises GaxError: for other errors returned from the call
         """
         api = self._client.instance_admin_api
         instance_pb = admin_v1_pb2.Instance(
diff --git a/spanner/google/cloud/spanner/pool.py b/spanner/google/cloud/spanner/pool.py
index e88f635573f95..a0c1a49104dff 100644
--- a/spanner/google/cloud/spanner/pool.py
+++ b/spanner/google/cloud/spanner/pool.py
@@ -39,6 +39,8 @@ def bind(self, database):
 
         Concrete implementations of this method may pre-fill the pool
         using the database.
+
+        :raises NotImplementedError: abstract method
         """
         raise NotImplementedError()
 
@@ -48,6 +50,8 @@ def get(self):
         Concrete implementations of this method are allowed to raise an
         error to signal that the pool is exhausted, or to block until a
         session is available.
+
+        :raises NotImplementedError: abstract method
         """
         raise NotImplementedError()
 
@@ -60,6 +64,8 @@ def put(self, session):
         Concrete implementations of this method are allowed to raise an
         error to signal that the pool is full, or to block until it is
         not full.
+
+        :raises NotImplementedError: abstract method
         """
         raise NotImplementedError()
 
@@ -69,6 +75,8 @@ def clear(self):
         Concrete implementations of this method are allowed to raise an
         error to signal that the pool is full, or to block until it is
         not full.
+
+        :raises NotImplementedError: abstract method
         """
         raise NotImplementedError()
 
diff --git a/spanner/google/cloud/spanner/session.py b/spanner/google/cloud/spanner/session.py
index 19ff60de4e1bc..953ab62993ccd 100644
--- a/spanner/google/cloud/spanner/session.py
+++ b/spanner/google/cloud/spanner/session.py
@@ -78,6 +78,7 @@ def name(self):
 
         :rtype: str
         :returns: The session name.
+        :raises ValueError: if session is not yet created
         """
         if self._session_id is None:
             raise ValueError('No session ID set by back-end')
@@ -106,6 +107,8 @@ def exists(self):
 
         :rtype: bool
         :returns: True if the session exists on the back-end, else False.
+        :raises GaxError:
+            for errors other than ``NOT_FOUND`` returned from the call
         """
         if self._session_id is None:
             return False
@@ -126,7 +129,10 @@ def delete(self):
         See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.Spanner.GetSession
 
-        :raises: :exc:`ValueError` if :attr:`session_id` is not already set.
+        :raises ValueError: if :attr:`session_id` is not already set.
+        :raises NotFound: if the session does not exist
+        :raises GaxError:
+            for errors other than ``NOT_FOUND`` returned from the call
         """
         if self._session_id is None:
             raise ValueError('Session ID not set by back-end')
@@ -151,7 +157,7 @@ def snapshot(self, **kw):
 
         :rtype: :class:`~google.cloud.spanner.snapshot.Snapshot`
         :returns: a snapshot bound to this session
-        :raises: :exc:`ValueError` if the session has not yet been created.
+        :raises ValueError: if the session has not yet been created.
         """
         if self._session_id is None:
             raise ValueError("Session has not been created.")
@@ -223,7 +229,7 @@ def batch(self):
 
         :rtype: :class:`~google.cloud.spanner.batch.Batch`
         :returns: a batch bound to this session
-        :raises: :exc:`ValueError` if the session has not yet been created.
+        :raises ValueError: if the session has not yet been created.
         """
         if self._session_id is None:
             raise ValueError("Session has not been created.")
@@ -235,7 +241,7 @@ def transaction(self):
 
         :rtype: :class:`~google.cloud.spanner.transaction.Transaction`
         :returns: a transaction bound to this session
-        :raises: :exc:`ValueError` if the session has not yet been created.
+        :raises ValueError: if the session has not yet been created.
         """
         if self._session_id is None:
             raise ValueError("Session has not been created.")
@@ -264,6 +270,8 @@ def run_in_transaction(self, func, *args, **kw):
 
         :rtype: :class:`datetime.datetime`
         :returns: timestamp of committed transaction
+        :raises Exception:
+            reraises any non-ABORT execptions raised by ``func``.
         """
         deadline = time.time() + kw.pop(
             'timeout_secs', DEFAULT_RETRY_TIMEOUT_SECS)
diff --git a/spanner/google/cloud/spanner/snapshot.py b/spanner/google/cloud/spanner/snapshot.py
index e0da23f3acd9a..89bd840000dc1 100644
--- a/spanner/google/cloud/spanner/snapshot.py
+++ b/spanner/google/cloud/spanner/snapshot.py
@@ -74,8 +74,9 @@ def read(self, table, columns, keyset, index='', limit=0,
 
         :rtype: :class:`~google.cloud.spanner.streamed.StreamedResultSet`
         :returns: a result set instance which can be used to consume rows.
-        :raises: ValueError for reuse of single-use snapshots, or if a
-                 transaction ID is pending for multiple-use snapshots.
+        :raises ValueError:
+            for reuse of single-use snapshots, or if a transaction ID is
+            already pending for multiple-use snapshots.
         """
         if self._read_request_count > 0:
             if not self._multi_use:
@@ -126,8 +127,9 @@ def execute_sql(self, sql, params=None, param_types=None, query_mode=None,
 
         :rtype: :class:`~google.cloud.spanner.streamed.StreamedResultSet`
         :returns: a result set instance which can be used to consume rows.
-        :raises: ValueError for reuse of single-use snapshots, or if a
-                 transaction ID is pending for multiple-use snapshots.
+        :raises ValueError:
+            for reuse of single-use snapshots, or if a transaction ID is
+            already pending for multiple-use snapshots.
         """
         if self._read_request_count > 0:
             if not self._multi_use:
@@ -248,12 +250,12 @@ def _make_txn_selector(self):
             return TransactionSelector(single_use=options)
 
     def begin(self):
-        """Begin a transaction on the database.
+        """Begin a read-only transaction on the database.
 
         :rtype: bytes
         :returns: the ID for the newly-begun transaction.
-        :raises: ValueError if the transaction is already begun, committed,
-                 or rolled back.
+        :raises ValueError:
+            if the transaction is already begun, committed, or rolled back.
         """
         if not self._multi_use:
             raise ValueError("Cannot call 'begin' single-use snapshots")
diff --git a/spanner/google/cloud/spanner/streamed.py b/spanner/google/cloud/spanner/streamed.py
index 7aa0ca43156ec..f44d0278a22aa 100644
--- a/spanner/google/cloud/spanner/streamed.py
+++ b/spanner/google/cloud/spanner/streamed.py
@@ -163,7 +163,7 @@ def consume_all(self):
     def __iter__(self):
         iter_rows, self._rows[:] = self._rows[:], ()
         while True:
-            if len(iter_rows) == 0:
+            if not iter_rows:
                 self.consume_next()  # raises StopIteration
                 iter_rows, self._rows[:] = self._rows[:], ()
             while iter_rows:
diff --git a/spanner/google/cloud/spanner/transaction.py b/spanner/google/cloud/spanner/transaction.py
index 598fb0c304078..e440210bf1225 100644
--- a/spanner/google/cloud/spanner/transaction.py
+++ b/spanner/google/cloud/spanner/transaction.py
@@ -60,8 +60,8 @@ def begin(self):
 
         :rtype: bytes
         :returns: the ID for the newly-begun transaction.
-        :raises: ValueError if the transaction is already begun, committed,
-                 or rolled back.
+        :raises ValueError:
+            if the transaction is already begun, committed, or rolled back.
         """
         if self._transaction_id is not None:
             raise ValueError("Transaction already begun")
@@ -97,11 +97,11 @@ def commit(self):
 
         :rtype: datetime
         :returns: timestamp of the committed changes.
-        :raises: :exc:`ValueError` if there are no mutations to commit.
+        :raises ValueError: if there are no mutations to commit.
         """
         self._check_state()
 
-        if len(self._mutations) == 0:
+        if not self._mutations:
             raise ValueError("No mutations to commit")
 
         database = self._session._database

From 597657eae3a67526d0046332b0649ad2e97b8b74 Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Thu, 27 Jul 2017 15:56:22 -0700
Subject: [PATCH 133/211] Increment BQ DB-API thread safety. (#3693)

Increment to 2 per https://www.python.org/dev/peps/pep-0249/#threadsafety. The cursor object includes some state for paging through results and other things which are not protected by locs.

Closes #3522.
---
 bigquery/google/cloud/bigquery/dbapi/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/dbapi/__init__.py b/bigquery/google/cloud/bigquery/dbapi/__init__.py
index 4e9c9a810da48..4786ef8ef5fa5 100644
--- a/bigquery/google/cloud/bigquery/dbapi/__init__.py
+++ b/bigquery/google/cloud/bigquery/dbapi/__init__.py
@@ -55,8 +55,8 @@
 
 apilevel = '2.0'
 
-# Threads may share the module, but not connections.
-threadsafety = 1
+# Threads may share the module and connections, but not cursors.
+threadsafety = 2
 
 paramstyle = 'pyformat'
 

From b94a3260c10c2050d18cf307e976b9a8b51ab78e Mon Sep 17 00:00:00 2001
From: Willian Fuks <willian.fuks@gmail.com>
Date: Fri, 28 Jul 2017 14:08:25 -0300
Subject: [PATCH 134/211] Added support for schema auto-detection feature in
 `LoadTableFromStorageJob` (#3648)

---
 bigquery/google/cloud/bigquery/job.py | 45 ++++++++++++---
 bigquery/tests/system.py              | 81 +++++++++++++++++++++++---
 bigquery/tests/unit/test_job.py       | 82 +++++++++++++++++++++++++++
 3 files changed, 194 insertions(+), 14 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/job.py b/bigquery/google/cloud/bigquery/job.py
index c2d1feee7120e..953a2c2655802 100644
--- a/bigquery/google/cloud/bigquery/job.py
+++ b/bigquery/google/cloud/bigquery/job.py
@@ -80,6 +80,20 @@ def _error_result_to_exception(error_result):
         status_code, error_result.get('message', ''), errors=[error_result])
 
 
+class AutoDetectSchema(_TypedProperty):
+    """Typed Property for ``autodetect`` properties.
+
+    :raises ValueError: on ``set`` operation if ``instance.schema``
+                        is already defined.
+    """
+    def __set__(self, instance, value):
+        self._validate(value)
+        if instance.schema:
+            raise ValueError('A schema should not be already defined '
+                             'when using schema auto-detection')
+        setattr(instance._configuration, self._backing_name, value)
+
+
 class Compression(_EnumProperty):
     """Pseudo-enum for ``compression`` properties."""
     GZIP = 'GZIP'
@@ -505,6 +519,7 @@ class _LoadConfiguration(object):
     """
     _allow_jagged_rows = None
     _allow_quoted_newlines = None
+    _autodetect = None
     _create_disposition = None
     _encoding = None
     _field_delimiter = None
@@ -544,9 +559,10 @@ def __init__(self, name, destination, source_uris, client, schema=()):
         super(LoadTableFromStorageJob, self).__init__(name, client)
         self.destination = destination
         self.source_uris = source_uris
-        # Let the @property do validation.
-        self.schema = schema
         self._configuration = _LoadConfiguration()
+        # Let the @property do validation. This must occur after all other
+        # attributes have been set.
+        self.schema = schema
 
     @property
     def schema(self):
@@ -564,12 +580,20 @@ def schema(self, value):
         :type value: list of :class:`SchemaField`
         :param value: fields describing the schema
 
-        :raises: TypeError if 'value' is not a sequence, or ValueError if
-                 any item in the sequence is not a SchemaField
+        :raises TypeError: If ``value`is not a sequence.
+        :raises ValueError: If any item in the sequence is not
+                            a ``SchemaField``.
         """
-        if not all(isinstance(field, SchemaField) for field in value):
-            raise ValueError('Schema items must be fields')
-        self._schema = tuple(value)
+        if not value:
+            self._schema = ()
+        else:
+            if not all(isinstance(field, SchemaField) for field in value):
+                raise ValueError('Schema items must be fields')
+            if self.autodetect:
+                raise ValueError(
+                    'Schema can not be set if `autodetect` property is True')
+
+            self._schema = tuple(value)
 
     @property
     def input_file_bytes(self):
@@ -625,6 +649,11 @@ def output_rows(self):
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.allowQuotedNewlines
     """
 
+    autodetect = AutoDetectSchema('autodetect', bool)
+    """See
+    https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.autodetect
+    """
+
     create_disposition = CreateDisposition('create_disposition')
     """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.createDisposition
@@ -676,6 +705,8 @@ def _populate_config_resource(self, configuration):
             configuration['allowJaggedRows'] = self.allow_jagged_rows
         if self.allow_quoted_newlines is not None:
             configuration['allowQuotedNewlines'] = self.allow_quoted_newlines
+        if self.autodetect is not None:
+            configuration['autodetect'] = self.autodetect
         if self.create_disposition is not None:
             configuration['createDisposition'] = self.create_disposition
         if self.encoding is not None:
diff --git a/bigquery/tests/system.py b/bigquery/tests/system.py
index 1d3da3d2a83d7..9d3bb77942567 100644
--- a/bigquery/tests/system.py
+++ b/bigquery/tests/system.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import base64
+import csv
 import datetime
 import json
 import operator
@@ -21,6 +22,8 @@
 import unittest
 import uuid
 
+import six
+
 from google.cloud import bigquery
 from google.cloud._helpers import UTC
 from google.cloud.bigquery import dbapi
@@ -290,8 +293,6 @@ def test_update_table(self):
 
     @staticmethod
     def _fetch_single_page(table):
-        import six
-
         iterator = table.fetch_data()
         page = six.next(iterator.pages)
         return list(page)
@@ -341,7 +342,6 @@ def test_insert_data_then_dump_table(self):
                          sorted(ROWS, key=by_age))
 
     def test_load_table_from_local_file_then_dump_table(self):
-        import csv
         from google.cloud._testing import _NamedTemporaryFile
 
         ROWS = [
@@ -432,7 +432,6 @@ def test_load_table_from_local_avro_file_then_dump_table(self):
                          sorted(ROWS, key=by_wavelength))
 
     def test_load_table_from_storage_then_dump_table(self):
-        import csv
         from google.cloud._testing import _NamedTemporaryFile
         from google.cloud.storage import Client as StorageClient
 
@@ -448,11 +447,11 @@ def test_load_table_from_storage_then_dump_table(self):
         ]
         TABLE_NAME = 'test_table'
 
-        s_client = StorageClient()
+        storage_client = StorageClient()
 
         # In the **very** rare case the bucket name is reserved, this
         # fails with a ConnectionError.
-        bucket = s_client.create_bucket(BUCKET_NAME)
+        bucket = storage_client.create_bucket(BUCKET_NAME)
         self.to_delete.append(bucket)
 
         blob = bucket.blob(BLOB_NAME)
@@ -501,6 +500,75 @@ def test_load_table_from_storage_then_dump_table(self):
         self.assertEqual(sorted(rows, key=by_age),
                          sorted(ROWS, key=by_age))
 
+    def test_load_table_from_storage_w_autodetect_schema(self):
+        from google.cloud._testing import _NamedTemporaryFile
+        from google.cloud.storage import Client as StorageClient
+        from google.cloud.bigquery import SchemaField
+
+        local_id = unique_resource_id()
+        bucket_name = 'bq_load_test' + local_id
+        blob_name = 'person_ages.csv'
+        gs_url = 'gs://{}/{}'.format(bucket_name, blob_name)
+        rows = [
+            ('Phred Phlyntstone', 32),
+            ('Bharney Rhubble', 33),
+            ('Wylma Phlyntstone', 29),
+            ('Bhettye Rhubble', 27),
+        ] * 100  # BigQuery internally uses the first 100 rows to detect schema
+        table_name = 'test_table'
+
+        storage_client = StorageClient()
+
+        # In the **very** rare case the bucket name is reserved, this
+        # fails with a ConnectionError.
+        bucket = storage_client.create_bucket(bucket_name)
+        self.to_delete.append(bucket)
+
+        blob = bucket.blob(blob_name)
+
+        with _NamedTemporaryFile() as temp:
+            with open(temp.name, 'w') as csv_write:
+                writer = csv.writer(csv_write)
+                writer.writerow(('Full Name', 'Age'))
+                writer.writerows(rows)
+
+            with open(temp.name, 'rb') as csv_read:
+                blob.upload_from_file(csv_read, content_type='text/csv')
+
+        self.to_delete.insert(0, blob)
+
+        dataset = Config.CLIENT.dataset(
+            _make_dataset_name('load_gcs_then_dump'))
+
+        retry_403(dataset.create)()
+        self.to_delete.append(dataset)
+
+        table = dataset.table(table_name)
+        self.to_delete.insert(0, table)
+
+        job = Config.CLIENT.load_table_from_storage(
+            'bq_load_storage_test_' + local_id, table, gs_url)
+        job.autodetect = True
+
+        job.begin()
+
+        # Allow for 90 seconds of "warm up" before rows visible.  See
+        # https://cloud.google.com/bigquery/streaming-data-into-bigquery#dataavailability
+        # 8 tries -> 1 + 2 + 4 + 8 + 16 + 32 + 64 = 127 seconds
+        retry = RetryInstanceState(_job_done, max_tries=8)
+        retry(job.reload)()
+
+        table.reload()
+        field_name = SchemaField(
+            u'Full_Name', u'string', u'NULLABLE', None, ())
+        field_age = SchemaField(u'Age', u'integer', u'NULLABLE', None, ())
+        self.assertEqual(table.schema, [field_name, field_age])
+
+        actual_rows = self._fetch_single_page(table)
+        by_age = operator.itemgetter(1)
+        self.assertEqual(
+            sorted(actual_rows, key=by_age), sorted(rows, key=by_age))
+
     def test_job_cancel(self):
         DATASET_NAME = _make_dataset_name('job_cancel')
         JOB_NAME = 'fetch_' + DATASET_NAME
@@ -674,7 +742,6 @@ def test_dbapi_w_standard_sql_types(self):
             self.assertIsNone(row)
 
     def _load_table_for_dml(self, rows, dataset_name, table_name):
-        import csv
         from google.cloud._testing import _NamedTemporaryFile
 
         dataset = Config.CLIENT.dataset(dataset_name)
diff --git a/bigquery/tests/unit/test_job.py b/bigquery/tests/unit/test_job.py
index d2ec7027d5e66..46326441a5e19 100644
--- a/bigquery/tests/unit/test_job.py
+++ b/bigquery/tests/unit/test_job.py
@@ -189,6 +189,11 @@ def _verifyBooleanConfigProperties(self, job, config):
                              config['allowQuotedNewlines'])
         else:
             self.assertIsNone(job.allow_quoted_newlines)
+        if 'autodetect' in config:
+            self.assertEqual(
+                job.autodetect, config['autodetect'])
+        else:
+            self.assertIsNone(job.autodetect)
         if 'ignoreUnknownValues' in config:
             self.assertEqual(job.ignore_unknown_values,
                              config['ignoreUnknownValues'])
@@ -277,6 +282,7 @@ def test_ctor(self):
         # set/read from resource['configuration']['load']
         self.assertIsNone(job.allow_jagged_rows)
         self.assertIsNone(job.allow_quoted_newlines)
+        self.assertIsNone(job.autodetect)
         self.assertIsNone(job.create_disposition)
         self.assertIsNone(job.encoding)
         self.assertIsNone(job.field_delimiter)
@@ -326,6 +332,41 @@ def test_schema_setter(self):
         job.schema = [full_name, age]
         self.assertEqual(job.schema, [full_name, age])
 
+    def test_schema_setter_w_autodetect(self):
+        from google.cloud.bigquery.schema import SchemaField
+
+        client = _Client(self.PROJECT)
+        table = _Table()
+        full_name = SchemaField('full_name', 'STRING')
+        job = self._make_one(self.JOB_NAME, table, [self.SOURCE1], client)
+        job.autodetect = False
+        job.schema = [full_name]
+        self.assertEqual(job.schema, [full_name])
+
+        job = self._make_one(self.JOB_NAME, table, [self.SOURCE1], client)
+        job.autodetect = True
+        with self.assertRaises(ValueError):
+            job.schema = [full_name]
+
+    def test_autodetect_setter_w_schema(self):
+        from google.cloud.bigquery.schema import SchemaField
+
+        client = _Client(self.PROJECT)
+        table = _Table()
+        full_name = SchemaField('full_name', 'STRING')
+        job = self._make_one(self.JOB_NAME, table, [self.SOURCE1], client)
+
+        job.autodetect = True
+        job.schema = []
+        self.assertEqual(job.schema, [])
+
+        job.autodetect = False
+        job.schema = [full_name]
+        self.assertEqual(job.autodetect, False)
+
+        with self.assertRaises(ValueError):
+            job.autodetect = True
+
     def test_props_set_by_server(self):
         import datetime
         from google.cloud._helpers import UTC
@@ -491,6 +532,47 @@ def test_begin_w_bound_client(self):
         self.assertEqual(req['data'], SENT)
         self._verifyResourceProperties(job, RESOURCE)
 
+    def test_begin_w_autodetect(self):
+        path = '/projects/{}/jobs'.format(self.PROJECT)
+        resource = self._makeResource()
+        resource['configuration']['load']['autodetect'] = True
+        # Ensure None for missing server-set props
+        del resource['statistics']['creationTime']
+        del resource['etag']
+        del resource['selfLink']
+        del resource['user_email']
+        conn = _Connection(resource)
+        client = _Client(project=self.PROJECT, connection=conn)
+        table = _Table()
+        job = self._make_one(self.JOB_NAME, table, [self.SOURCE1], client)
+        job.autodetect = True
+        job.begin()
+
+        sent = {
+            'jobReference': {
+                'projectId': self.PROJECT,
+                'jobId': self.JOB_NAME,
+            },
+            'configuration': {
+                'load': {
+                    'sourceUris': [self.SOURCE1],
+                    'destinationTable': {
+                        'projectId': self.PROJECT,
+                        'datasetId': self.DS_NAME,
+                        'tableId': self.TABLE_NAME,
+                    },
+                    'autodetect': True
+                },
+            },
+        }
+        expected_request = {
+            'method': 'POST',
+            'path': path,
+            'data': sent,
+        }
+        self.assertEqual(conn._requested, [expected_request])
+        self._verifyResourceProperties(job, resource)
+
     def test_begin_w_alternate_client(self):
         from google.cloud.bigquery.schema import SchemaField
 

From 78e51d92399f0a3c35ee9456b9379380edae7bf8 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Fri, 28 Jul 2017 15:18:07 -0400
Subject: [PATCH 135/211] Add factories to ease creation of array / struct
 parameter types. (#3700)

Closes: #3364
---
 spanner/google/cloud/spanner/__init__.py |  6 +++
 spanner/google/cloud/spanner/types.py    | 41 ++++++++++++++++
 spanner/tests/unit/test_types.py         | 61 ++++++++++++++++++++++++
 3 files changed, 108 insertions(+)
 create mode 100644 spanner/tests/unit/test_types.py

diff --git a/spanner/google/cloud/spanner/__init__.py b/spanner/google/cloud/spanner/__init__.py
index 6b9366ab6646a..244bdb868f9a7 100644
--- a/spanner/google/cloud/spanner/__init__.py
+++ b/spanner/google/cloud/spanner/__init__.py
@@ -27,18 +27,22 @@
 from google.cloud.spanner.pool import BurstyPool
 from google.cloud.spanner.pool import FixedSizePool
 
+from google.cloud.spanner.types import ArrayParamType
 from google.cloud.spanner.types import BOOL_PARAM_TYPE
 from google.cloud.spanner.types import BYTES_PARAM_TYPE
 from google.cloud.spanner.types import DATE_PARAM_TYPE
 from google.cloud.spanner.types import FLOAT64_PARAM_TYPE
 from google.cloud.spanner.types import INT64_PARAM_TYPE
 from google.cloud.spanner.types import STRING_PARAM_TYPE
+from google.cloud.spanner.types import StructField
+from google.cloud.spanner.types import StructParamType
 from google.cloud.spanner.types import TIMESTAMP_PARAM_TYPE
 
 
 __all__ = [
     '__version__',
     'AbstractSessionPool',
+    'ArrayParamType',
     'BOOL_PARAM_TYPE',
     'BYTES_PARAM_TYPE',
     'BurstyPool',
@@ -50,5 +54,7 @@
     'KeyRange',
     'KeySet',
     'STRING_PARAM_TYPE',
+    'StructField',
+    'StructParamType',
     'TIMESTAMP_PARAM_TYPE',
 ]
diff --git a/spanner/google/cloud/spanner/types.py b/spanner/google/cloud/spanner/types.py
index aa0316ee02b93..9e22da94c51f4 100644
--- a/spanner/google/cloud/spanner/types.py
+++ b/spanner/google/cloud/spanner/types.py
@@ -25,3 +25,44 @@
 FLOAT64_PARAM_TYPE = type_pb2.Type(code=type_pb2.FLOAT64)
 DATE_PARAM_TYPE = type_pb2.Type(code=type_pb2.DATE)
 TIMESTAMP_PARAM_TYPE = type_pb2.Type(code=type_pb2.TIMESTAMP)
+
+
+def ArrayParamType(element_type):  # pylint: disable=invalid-name
+    """Construct an array paramter type description protobuf.
+
+    :type element_type: :class:`type_pb2.Type`
+    :param element_type: the type of elements of the array
+
+    :rtype: :class:`type_pb2.Type`
+    :returns: the appropriate array-type protobuf
+    """
+    return type_pb2.Type(code=type_pb2.ARRAY, array_element_type=element_type)
+
+
+def StructField(name, field_type):  # pylint: disable=invalid-name
+    """Construct a field description protobuf.
+
+    :type name: str
+    :param name: the name of the field
+
+    :type field_type: :class:`type_pb2.Type`
+    :param field_type: the type of the field
+
+    :rtype: :class:`type_pb2.StructType.Field`
+    :returns: the appropriate array-type protobuf
+    """
+    return type_pb2.StructType.Field(name=name, type=field_type)
+
+
+def StructParamType(fields):  # pylint: disable=invalid-name
+    """Construct a struct paramter type description protobuf.
+
+    :type fields: list of :class:`type_pb2.StructType.Field`
+    :param fields: the fields of the struct
+
+    :rtype: :class:`type_pb2.Type`
+    :returns: the appropriate struct-type protobuf
+    """
+    return type_pb2.Type(
+        code=type_pb2.STRUCT,
+        struct_type=type_pb2.StructType(fields=fields))
diff --git a/spanner/tests/unit/test_types.py b/spanner/tests/unit/test_types.py
new file mode 100644
index 0000000000000..4f30779c757f7
--- /dev/null
+++ b/spanner/tests/unit/test_types.py
@@ -0,0 +1,61 @@
+# Copyright 2017 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import unittest
+
+
+class Test_ArrayParamType(unittest.TestCase):
+
+    def test_it(self):
+        from google.cloud.proto.spanner.v1 import type_pb2
+        from google.cloud.spanner.types import ArrayParamType
+        from google.cloud.spanner.types import INT64_PARAM_TYPE
+
+        expected = type_pb2.Type(
+            code=type_pb2.ARRAY,
+            array_element_type=type_pb2.Type(code=type_pb2.INT64))
+
+        found = ArrayParamType(INT64_PARAM_TYPE)
+
+        self.assertEqual(found, expected)
+
+
+class Test_Struct(unittest.TestCase):
+
+    def test_it(self):
+        from google.cloud.proto.spanner.v1 import type_pb2
+        from google.cloud.spanner.types import INT64_PARAM_TYPE
+        from google.cloud.spanner.types import STRING_PARAM_TYPE
+        from google.cloud.spanner.types import StructParamType
+        from google.cloud.spanner.types import StructField
+
+        struct_type = type_pb2.StructType(fields=[
+            type_pb2.StructType.Field(
+                name='name',
+                type=type_pb2.Type(code=type_pb2.STRING)),
+            type_pb2.StructType.Field(
+                name='count',
+                type=type_pb2.Type(code=type_pb2.INT64)),
+        ])
+        expected = type_pb2.Type(
+            code=type_pb2.STRUCT,
+            struct_type=struct_type)
+
+        found = StructParamType([
+            StructField('name', STRING_PARAM_TYPE),
+            StructField('count', INT64_PARAM_TYPE),
+        ])
+
+        self.assertEqual(found, expected)

From e89051f4a68c0735c2bc7d5faebfa9d218ac6c02 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 28 Jul 2017 13:30:15 -0700
Subject: [PATCH 136/211] Language GAPIC update (#3699)

---
 .../language/v1/language_service_client.py    | 26 ++++++--------
 .../v1beta2/language_service_client.py        | 36 ++++++++-----------
 .../test_language_service_client_v1.py        | 27 +++++---------
 .../test_language_service_client_v1beta2.py   | 35 +++++++-----------
 .../gapic/v1/language_service_smoke_test.py   | 30 ----------------
 .../v1beta2/language_service_smoke_test.py    | 30 ----------------
 6 files changed, 46 insertions(+), 138 deletions(-)
 rename language/tests/gapic/{v1 => }/test_language_service_client_v1.py (89%)
 rename language/tests/gapic/{v1beta2 => }/test_language_service_client_v1beta2.py (88%)
 delete mode 100644 language/tests/gapic/v1/language_service_smoke_test.py
 delete mode 100644 language/tests/gapic/v1beta2/language_service_smoke_test.py

diff --git a/language/google/cloud/gapic/language/v1/language_service_client.py b/language/google/cloud/gapic/language/v1/language_service_client.py
index fb55b9568b67b..b413de49fa832 100644
--- a/language/google/cloud/gapic/language/v1/language_service_client.py
+++ b/language/google/cloud/gapic/language/v1/language_service_client.py
@@ -184,12 +184,11 @@ def analyze_sentiment(self, document, encoding_type=None, options=None):
           :exc:`google.gax.errors.GaxError` if the RPC is aborted.
           :exc:`ValueError` if the parameters are invalid.
         """
-        # Create the request object.
         request = language_service_pb2.AnalyzeSentimentRequest(
             document=document, encoding_type=encoding_type)
         return self._analyze_sentiment(request, options)
 
-    def analyze_entities(self, document, encoding_type, options=None):
+    def analyze_entities(self, document, encoding_type=None, options=None):
         """
         Finds named entities (currently proper names and common nouns) in the text
         along with entity types, salience, mentions for each entity, and
@@ -197,12 +196,10 @@ def analyze_entities(self, document, encoding_type, options=None):
 
         Example:
           >>> from google.cloud.gapic.language.v1 import language_service_client
-          >>> from google.cloud.gapic.language.v1 import enums
           >>> from google.cloud.proto.language.v1 import language_service_pb2
           >>> client = language_service_client.LanguageServiceClient()
           >>> document = language_service_pb2.Document()
-          >>> encoding_type = enums.EncodingType.NONE
-          >>> response = client.analyze_entities(document, encoding_type)
+          >>> response = client.analyze_entities(document)
 
         Args:
           document (:class:`google.cloud.proto.language.v1.language_service_pb2.Document`): Input document.
@@ -217,12 +214,11 @@ def analyze_entities(self, document, encoding_type, options=None):
           :exc:`google.gax.errors.GaxError` if the RPC is aborted.
           :exc:`ValueError` if the parameters are invalid.
         """
-        # Create the request object.
         request = language_service_pb2.AnalyzeEntitiesRequest(
             document=document, encoding_type=encoding_type)
         return self._analyze_entities(request, options)
 
-    def analyze_syntax(self, document, encoding_type, options=None):
+    def analyze_syntax(self, document, encoding_type=None, options=None):
         """
         Analyzes the syntax of the text and provides sentence boundaries and
         tokenization along with part of speech tags, dependency trees, and other
@@ -230,12 +226,10 @@ def analyze_syntax(self, document, encoding_type, options=None):
 
         Example:
           >>> from google.cloud.gapic.language.v1 import language_service_client
-          >>> from google.cloud.gapic.language.v1 import enums
           >>> from google.cloud.proto.language.v1 import language_service_pb2
           >>> client = language_service_client.LanguageServiceClient()
           >>> document = language_service_pb2.Document()
-          >>> encoding_type = enums.EncodingType.NONE
-          >>> response = client.analyze_syntax(document, encoding_type)
+          >>> response = client.analyze_syntax(document)
 
         Args:
           document (:class:`google.cloud.proto.language.v1.language_service_pb2.Document`): Input document.
@@ -250,25 +244,26 @@ def analyze_syntax(self, document, encoding_type, options=None):
           :exc:`google.gax.errors.GaxError` if the RPC is aborted.
           :exc:`ValueError` if the parameters are invalid.
         """
-        # Create the request object.
         request = language_service_pb2.AnalyzeSyntaxRequest(
             document=document, encoding_type=encoding_type)
         return self._analyze_syntax(request, options)
 
-    def annotate_text(self, document, features, encoding_type, options=None):
+    def annotate_text(self,
+                      document,
+                      features,
+                      encoding_type=None,
+                      options=None):
         """
         A convenience method that provides all the features that analyzeSentiment,
         analyzeEntities, and analyzeSyntax provide in one call.
 
         Example:
           >>> from google.cloud.gapic.language.v1 import language_service_client
-          >>> from google.cloud.gapic.language.v1 import enums
           >>> from google.cloud.proto.language.v1 import language_service_pb2
           >>> client = language_service_client.LanguageServiceClient()
           >>> document = language_service_pb2.Document()
           >>> features = language_service_pb2.AnnotateTextRequest.Features()
-          >>> encoding_type = enums.EncodingType.NONE
-          >>> response = client.annotate_text(document, features, encoding_type)
+          >>> response = client.annotate_text(document, features)
 
         Args:
           document (:class:`google.cloud.proto.language.v1.language_service_pb2.Document`): Input document.
@@ -284,7 +279,6 @@ def annotate_text(self, document, features, encoding_type, options=None):
           :exc:`google.gax.errors.GaxError` if the RPC is aborted.
           :exc:`ValueError` if the parameters are invalid.
         """
-        # Create the request object.
         request = language_service_pb2.AnnotateTextRequest(
             document=document, features=features, encoding_type=encoding_type)
         return self._annotate_text(request, options)
diff --git a/language/google/cloud/gapic/language/v1beta2/language_service_client.py b/language/google/cloud/gapic/language/v1beta2/language_service_client.py
index a990d2a9758ae..0150ca4f4b837 100644
--- a/language/google/cloud/gapic/language/v1beta2/language_service_client.py
+++ b/language/google/cloud/gapic/language/v1beta2/language_service_client.py
@@ -188,12 +188,11 @@ def analyze_sentiment(self, document, encoding_type=None, options=None):
           :exc:`google.gax.errors.GaxError` if the RPC is aborted.
           :exc:`ValueError` if the parameters are invalid.
         """
-        # Create the request object.
         request = language_service_pb2.AnalyzeSentimentRequest(
             document=document, encoding_type=encoding_type)
         return self._analyze_sentiment(request, options)
 
-    def analyze_entities(self, document, encoding_type, options=None):
+    def analyze_entities(self, document, encoding_type=None, options=None):
         """
         Finds named entities (currently proper names and common nouns) in the text
         along with entity types, salience, mentions for each entity, and
@@ -201,12 +200,10 @@ def analyze_entities(self, document, encoding_type, options=None):
 
         Example:
           >>> from google.cloud.gapic.language.v1beta2 import language_service_client
-          >>> from google.cloud.gapic.language.v1beta2 import enums
           >>> from google.cloud.proto.language.v1beta2 import language_service_pb2
           >>> client = language_service_client.LanguageServiceClient()
           >>> document = language_service_pb2.Document()
-          >>> encoding_type = enums.EncodingType.NONE
-          >>> response = client.analyze_entities(document, encoding_type)
+          >>> response = client.analyze_entities(document)
 
         Args:
           document (:class:`google.cloud.proto.language.v1beta2.language_service_pb2.Document`): Input document.
@@ -221,24 +218,24 @@ def analyze_entities(self, document, encoding_type, options=None):
           :exc:`google.gax.errors.GaxError` if the RPC is aborted.
           :exc:`ValueError` if the parameters are invalid.
         """
-        # Create the request object.
         request = language_service_pb2.AnalyzeEntitiesRequest(
             document=document, encoding_type=encoding_type)
         return self._analyze_entities(request, options)
 
-    def analyze_entity_sentiment(self, document, encoding_type, options=None):
+    def analyze_entity_sentiment(self,
+                                 document,
+                                 encoding_type=None,
+                                 options=None):
         """
         Finds entities, similar to ``AnalyzeEntities`` in the text and analyzes
         sentiment associated with each entity and its mentions.
 
         Example:
           >>> from google.cloud.gapic.language.v1beta2 import language_service_client
-          >>> from google.cloud.gapic.language.v1beta2 import enums
           >>> from google.cloud.proto.language.v1beta2 import language_service_pb2
           >>> client = language_service_client.LanguageServiceClient()
           >>> document = language_service_pb2.Document()
-          >>> encoding_type = enums.EncodingType.NONE
-          >>> response = client.analyze_entity_sentiment(document, encoding_type)
+          >>> response = client.analyze_entity_sentiment(document)
 
         Args:
           document (:class:`google.cloud.proto.language.v1beta2.language_service_pb2.Document`): Input document.
@@ -253,12 +250,11 @@ def analyze_entity_sentiment(self, document, encoding_type, options=None):
           :exc:`google.gax.errors.GaxError` if the RPC is aborted.
           :exc:`ValueError` if the parameters are invalid.
         """
-        # Create the request object.
         request = language_service_pb2.AnalyzeEntitySentimentRequest(
             document=document, encoding_type=encoding_type)
         return self._analyze_entity_sentiment(request, options)
 
-    def analyze_syntax(self, document, encoding_type, options=None):
+    def analyze_syntax(self, document, encoding_type=None, options=None):
         """
         Analyzes the syntax of the text and provides sentence boundaries and
         tokenization along with part of speech tags, dependency trees, and other
@@ -266,12 +262,10 @@ def analyze_syntax(self, document, encoding_type, options=None):
 
         Example:
           >>> from google.cloud.gapic.language.v1beta2 import language_service_client
-          >>> from google.cloud.gapic.language.v1beta2 import enums
           >>> from google.cloud.proto.language.v1beta2 import language_service_pb2
           >>> client = language_service_client.LanguageServiceClient()
           >>> document = language_service_pb2.Document()
-          >>> encoding_type = enums.EncodingType.NONE
-          >>> response = client.analyze_syntax(document, encoding_type)
+          >>> response = client.analyze_syntax(document)
 
         Args:
           document (:class:`google.cloud.proto.language.v1beta2.language_service_pb2.Document`): Input document.
@@ -286,25 +280,26 @@ def analyze_syntax(self, document, encoding_type, options=None):
           :exc:`google.gax.errors.GaxError` if the RPC is aborted.
           :exc:`ValueError` if the parameters are invalid.
         """
-        # Create the request object.
         request = language_service_pb2.AnalyzeSyntaxRequest(
             document=document, encoding_type=encoding_type)
         return self._analyze_syntax(request, options)
 
-    def annotate_text(self, document, features, encoding_type, options=None):
+    def annotate_text(self,
+                      document,
+                      features,
+                      encoding_type=None,
+                      options=None):
         """
         A convenience method that provides all syntax, sentiment, and entity
         features in one call.
 
         Example:
           >>> from google.cloud.gapic.language.v1beta2 import language_service_client
-          >>> from google.cloud.gapic.language.v1beta2 import enums
           >>> from google.cloud.proto.language.v1beta2 import language_service_pb2
           >>> client = language_service_client.LanguageServiceClient()
           >>> document = language_service_pb2.Document()
           >>> features = language_service_pb2.AnnotateTextRequest.Features()
-          >>> encoding_type = enums.EncodingType.NONE
-          >>> response = client.annotate_text(document, features, encoding_type)
+          >>> response = client.annotate_text(document, features)
 
         Args:
           document (:class:`google.cloud.proto.language.v1beta2.language_service_pb2.Document`): Input document.
@@ -320,7 +315,6 @@ def annotate_text(self, document, features, encoding_type, options=None):
           :exc:`google.gax.errors.GaxError` if the RPC is aborted.
           :exc:`ValueError` if the parameters are invalid.
         """
-        # Create the request object.
         request = language_service_pb2.AnnotateTextRequest(
             document=document, features=features, encoding_type=encoding_type)
         return self._annotate_text(request, options)
diff --git a/language/tests/gapic/v1/test_language_service_client_v1.py b/language/tests/gapic/test_language_service_client_v1.py
similarity index 89%
rename from language/tests/gapic/v1/test_language_service_client_v1.py
rename to language/tests/gapic/test_language_service_client_v1.py
index a0b1931727ce1..648ad98e50a3e 100644
--- a/language/tests/gapic/v1/test_language_service_client_v1.py
+++ b/language/tests/gapic/test_language_service_client_v1.py
@@ -18,7 +18,6 @@
 
 from google.gax import errors
 
-from google.cloud.gapic.language.v1 import enums
 from google.cloud.gapic.language.v1 import language_service_client
 from google.cloud.proto.language.v1 import language_service_pb2
 
@@ -86,7 +85,6 @@ def test_analyze_entities(self, mock_create_stub):
 
         # Mock request
         document = language_service_pb2.Document()
-        encoding_type = enums.EncodingType.NONE
 
         # Mock response
         language = 'language-1613589672'
@@ -94,7 +92,7 @@ def test_analyze_entities(self, mock_create_stub):
             language=language)
         grpc_stub.AnalyzeEntities.return_value = expected_response
 
-        response = client.analyze_entities(document, encoding_type)
+        response = client.analyze_entities(document)
         self.assertEqual(expected_response, response)
 
         grpc_stub.AnalyzeEntities.assert_called_once()
@@ -105,7 +103,7 @@ def test_analyze_entities(self, mock_create_stub):
         actual_request = args[0]
 
         expected_request = language_service_pb2.AnalyzeEntitiesRequest(
-            document=document, encoding_type=encoding_type)
+            document=document)
         self.assertEqual(expected_request, actual_request)
 
     @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
@@ -119,13 +117,11 @@ def test_analyze_entities_exception(self, mock_create_stub):
 
         # Mock request
         document = language_service_pb2.Document()
-        encoding_type = enums.EncodingType.NONE
 
         # Mock exception response
         grpc_stub.AnalyzeEntities.side_effect = CustomException()
 
-        self.assertRaises(errors.GaxError, client.analyze_entities, document,
-                          encoding_type)
+        self.assertRaises(errors.GaxError, client.analyze_entities, document)
 
     @mock.patch('google.gax.config.create_stub', spec=True)
     def test_analyze_syntax(self, mock_create_stub):
@@ -137,7 +133,6 @@ def test_analyze_syntax(self, mock_create_stub):
 
         # Mock request
         document = language_service_pb2.Document()
-        encoding_type = enums.EncodingType.NONE
 
         # Mock response
         language = 'language-1613589672'
@@ -145,7 +140,7 @@ def test_analyze_syntax(self, mock_create_stub):
             language=language)
         grpc_stub.AnalyzeSyntax.return_value = expected_response
 
-        response = client.analyze_syntax(document, encoding_type)
+        response = client.analyze_syntax(document)
         self.assertEqual(expected_response, response)
 
         grpc_stub.AnalyzeSyntax.assert_called_once()
@@ -156,7 +151,7 @@ def test_analyze_syntax(self, mock_create_stub):
         actual_request = args[0]
 
         expected_request = language_service_pb2.AnalyzeSyntaxRequest(
-            document=document, encoding_type=encoding_type)
+            document=document)
         self.assertEqual(expected_request, actual_request)
 
     @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
@@ -170,13 +165,11 @@ def test_analyze_syntax_exception(self, mock_create_stub):
 
         # Mock request
         document = language_service_pb2.Document()
-        encoding_type = enums.EncodingType.NONE
 
         # Mock exception response
         grpc_stub.AnalyzeSyntax.side_effect = CustomException()
 
-        self.assertRaises(errors.GaxError, client.analyze_syntax, document,
-                          encoding_type)
+        self.assertRaises(errors.GaxError, client.analyze_syntax, document)
 
     @mock.patch('google.gax.config.create_stub', spec=True)
     def test_annotate_text(self, mock_create_stub):
@@ -189,7 +182,6 @@ def test_annotate_text(self, mock_create_stub):
         # Mock request
         document = language_service_pb2.Document()
         features = language_service_pb2.AnnotateTextRequest.Features()
-        encoding_type = enums.EncodingType.NONE
 
         # Mock response
         language = 'language-1613589672'
@@ -197,7 +189,7 @@ def test_annotate_text(self, mock_create_stub):
             language=language)
         grpc_stub.AnnotateText.return_value = expected_response
 
-        response = client.annotate_text(document, features, encoding_type)
+        response = client.annotate_text(document, features)
         self.assertEqual(expected_response, response)
 
         grpc_stub.AnnotateText.assert_called_once()
@@ -208,7 +200,7 @@ def test_annotate_text(self, mock_create_stub):
         actual_request = args[0]
 
         expected_request = language_service_pb2.AnnotateTextRequest(
-            document=document, features=features, encoding_type=encoding_type)
+            document=document, features=features)
         self.assertEqual(expected_request, actual_request)
 
     @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
@@ -223,10 +215,9 @@ def test_annotate_text_exception(self, mock_create_stub):
         # Mock request
         document = language_service_pb2.Document()
         features = language_service_pb2.AnnotateTextRequest.Features()
-        encoding_type = enums.EncodingType.NONE
 
         # Mock exception response
         grpc_stub.AnnotateText.side_effect = CustomException()
 
         self.assertRaises(errors.GaxError, client.annotate_text, document,
-                          features, encoding_type)
+                          features)
diff --git a/language/tests/gapic/v1beta2/test_language_service_client_v1beta2.py b/language/tests/gapic/test_language_service_client_v1beta2.py
similarity index 88%
rename from language/tests/gapic/v1beta2/test_language_service_client_v1beta2.py
rename to language/tests/gapic/test_language_service_client_v1beta2.py
index fea1c572d4ce9..db8df687456c8 100644
--- a/language/tests/gapic/v1beta2/test_language_service_client_v1beta2.py
+++ b/language/tests/gapic/test_language_service_client_v1beta2.py
@@ -18,7 +18,6 @@
 
 from google.gax import errors
 
-from google.cloud.gapic.language.v1beta2 import enums
 from google.cloud.gapic.language.v1beta2 import language_service_client
 from google.cloud.proto.language.v1beta2 import language_service_pb2
 
@@ -86,7 +85,6 @@ def test_analyze_entities(self, mock_create_stub):
 
         # Mock request
         document = language_service_pb2.Document()
-        encoding_type = enums.EncodingType.NONE
 
         # Mock response
         language = 'language-1613589672'
@@ -94,7 +92,7 @@ def test_analyze_entities(self, mock_create_stub):
             language=language)
         grpc_stub.AnalyzeEntities.return_value = expected_response
 
-        response = client.analyze_entities(document, encoding_type)
+        response = client.analyze_entities(document)
         self.assertEqual(expected_response, response)
 
         grpc_stub.AnalyzeEntities.assert_called_once()
@@ -105,7 +103,7 @@ def test_analyze_entities(self, mock_create_stub):
         actual_request = args[0]
 
         expected_request = language_service_pb2.AnalyzeEntitiesRequest(
-            document=document, encoding_type=encoding_type)
+            document=document)
         self.assertEqual(expected_request, actual_request)
 
     @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
@@ -119,13 +117,11 @@ def test_analyze_entities_exception(self, mock_create_stub):
 
         # Mock request
         document = language_service_pb2.Document()
-        encoding_type = enums.EncodingType.NONE
 
         # Mock exception response
         grpc_stub.AnalyzeEntities.side_effect = CustomException()
 
-        self.assertRaises(errors.GaxError, client.analyze_entities, document,
-                          encoding_type)
+        self.assertRaises(errors.GaxError, client.analyze_entities, document)
 
     @mock.patch('google.gax.config.create_stub', spec=True)
     def test_analyze_entity_sentiment(self, mock_create_stub):
@@ -137,7 +133,6 @@ def test_analyze_entity_sentiment(self, mock_create_stub):
 
         # Mock request
         document = language_service_pb2.Document()
-        encoding_type = enums.EncodingType.NONE
 
         # Mock response
         language = 'language-1613589672'
@@ -145,7 +140,7 @@ def test_analyze_entity_sentiment(self, mock_create_stub):
             language=language)
         grpc_stub.AnalyzeEntitySentiment.return_value = expected_response
 
-        response = client.analyze_entity_sentiment(document, encoding_type)
+        response = client.analyze_entity_sentiment(document)
         self.assertEqual(expected_response, response)
 
         grpc_stub.AnalyzeEntitySentiment.assert_called_once()
@@ -156,7 +151,7 @@ def test_analyze_entity_sentiment(self, mock_create_stub):
         actual_request = args[0]
 
         expected_request = language_service_pb2.AnalyzeEntitySentimentRequest(
-            document=document, encoding_type=encoding_type)
+            document=document)
         self.assertEqual(expected_request, actual_request)
 
     @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
@@ -170,13 +165,12 @@ def test_analyze_entity_sentiment_exception(self, mock_create_stub):
 
         # Mock request
         document = language_service_pb2.Document()
-        encoding_type = enums.EncodingType.NONE
 
         # Mock exception response
         grpc_stub.AnalyzeEntitySentiment.side_effect = CustomException()
 
         self.assertRaises(errors.GaxError, client.analyze_entity_sentiment,
-                          document, encoding_type)
+                          document)
 
     @mock.patch('google.gax.config.create_stub', spec=True)
     def test_analyze_syntax(self, mock_create_stub):
@@ -188,7 +182,6 @@ def test_analyze_syntax(self, mock_create_stub):
 
         # Mock request
         document = language_service_pb2.Document()
-        encoding_type = enums.EncodingType.NONE
 
         # Mock response
         language = 'language-1613589672'
@@ -196,7 +189,7 @@ def test_analyze_syntax(self, mock_create_stub):
             language=language)
         grpc_stub.AnalyzeSyntax.return_value = expected_response
 
-        response = client.analyze_syntax(document, encoding_type)
+        response = client.analyze_syntax(document)
         self.assertEqual(expected_response, response)
 
         grpc_stub.AnalyzeSyntax.assert_called_once()
@@ -207,7 +200,7 @@ def test_analyze_syntax(self, mock_create_stub):
         actual_request = args[0]
 
         expected_request = language_service_pb2.AnalyzeSyntaxRequest(
-            document=document, encoding_type=encoding_type)
+            document=document)
         self.assertEqual(expected_request, actual_request)
 
     @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
@@ -221,13 +214,11 @@ def test_analyze_syntax_exception(self, mock_create_stub):
 
         # Mock request
         document = language_service_pb2.Document()
-        encoding_type = enums.EncodingType.NONE
 
         # Mock exception response
         grpc_stub.AnalyzeSyntax.side_effect = CustomException()
 
-        self.assertRaises(errors.GaxError, client.analyze_syntax, document,
-                          encoding_type)
+        self.assertRaises(errors.GaxError, client.analyze_syntax, document)
 
     @mock.patch('google.gax.config.create_stub', spec=True)
     def test_annotate_text(self, mock_create_stub):
@@ -240,7 +231,6 @@ def test_annotate_text(self, mock_create_stub):
         # Mock request
         document = language_service_pb2.Document()
         features = language_service_pb2.AnnotateTextRequest.Features()
-        encoding_type = enums.EncodingType.NONE
 
         # Mock response
         language = 'language-1613589672'
@@ -248,7 +238,7 @@ def test_annotate_text(self, mock_create_stub):
             language=language)
         grpc_stub.AnnotateText.return_value = expected_response
 
-        response = client.annotate_text(document, features, encoding_type)
+        response = client.annotate_text(document, features)
         self.assertEqual(expected_response, response)
 
         grpc_stub.AnnotateText.assert_called_once()
@@ -259,7 +249,7 @@ def test_annotate_text(self, mock_create_stub):
         actual_request = args[0]
 
         expected_request = language_service_pb2.AnnotateTextRequest(
-            document=document, features=features, encoding_type=encoding_type)
+            document=document, features=features)
         self.assertEqual(expected_request, actual_request)
 
     @mock.patch('google.gax.config.API_ERRORS', (CustomException, ))
@@ -274,10 +264,9 @@ def test_annotate_text_exception(self, mock_create_stub):
         # Mock request
         document = language_service_pb2.Document()
         features = language_service_pb2.AnnotateTextRequest.Features()
-        encoding_type = enums.EncodingType.NONE
 
         # Mock exception response
         grpc_stub.AnnotateText.side_effect = CustomException()
 
         self.assertRaises(errors.GaxError, client.annotate_text, document,
-                          features, encoding_type)
+                          features)
diff --git a/language/tests/gapic/v1/language_service_smoke_test.py b/language/tests/gapic/v1/language_service_smoke_test.py
deleted file mode 100644
index 67839505c670e..0000000000000
--- a/language/tests/gapic/v1/language_service_smoke_test.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2017, Google Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import time
-import unittest
-
-from google.cloud.gapic.language.v1 import enums
-from google.cloud.gapic.language.v1 import language_service_client
-from google.cloud.proto.language.v1 import language_service_pb2
-
-
-class LanguageServiceSmokeTest(unittest.TestCase):
-    def test_analyze_sentiment(self):
-
-        client = language_service_client.LanguageServiceClient()
-        content = 'Hello, world!'
-        type_ = enums.Document.Type.PLAIN_TEXT
-        document = language_service_pb2.Document(content=content, type=type_)
-        response = client.analyze_sentiment(document)
diff --git a/language/tests/gapic/v1beta2/language_service_smoke_test.py b/language/tests/gapic/v1beta2/language_service_smoke_test.py
deleted file mode 100644
index d94531f88f75e..0000000000000
--- a/language/tests/gapic/v1beta2/language_service_smoke_test.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2017, Google Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import time
-import unittest
-
-from google.cloud.gapic.language.v1beta2 import enums
-from google.cloud.gapic.language.v1beta2 import language_service_client
-from google.cloud.proto.language.v1beta2 import language_service_pb2
-
-
-class LanguageServiceSmokeTest(unittest.TestCase):
-    def test_analyze_sentiment(self):
-
-        client = language_service_client.LanguageServiceClient()
-        content = 'Hello, world!'
-        type_ = enums.Document.Type.PLAIN_TEXT
-        document = language_service_pb2.Document(content=content, type=type_)
-        response = client.analyze_sentiment(document)

From e59d305bf7b803c8929da422015723276fdc7886 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 28 Jul 2017 13:34:03 -0700
Subject: [PATCH 137/211] Language 0.26.1 (#3701)

---
 language/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/language/setup.py b/language/setup.py
index 9fb14be942fdf..ed57aeff87551 100644
--- a/language/setup.py
+++ b/language/setup.py
@@ -61,7 +61,7 @@
 
 setup(
     name='google-cloud-language',
-    version='0.26.0',
+    version='0.26.1',
     description='Python Client for Google Cloud Natural Language',
     long_description=README,
     namespace_packages=[

From d2fb6b6778ef7f171ce24bc88a40d446860d3428 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 28 Jul 2017 13:37:58 -0700
Subject: [PATCH 138/211] Python GAPIC: Speech v1 (#3678)

---
 speech/google/cloud/gapic/speech/v1/enums.py  |   6 +-
 .../cloud/gapic/speech/v1/speech_client.py    |   2 -
 .../gapic/speech/v1/speech_client_config.json |   4 +-
 .../cloud/proto/speech/v1/cloud_speech_pb2.py | 187 ++++++++++++++----
 4 files changed, 153 insertions(+), 46 deletions(-)

diff --git a/speech/google/cloud/gapic/speech/v1/enums.py b/speech/google/cloud/gapic/speech/v1/enums.py
index 98379c7078a9f..aa578f3faee02 100644
--- a/speech/google/cloud/gapic/speech/v1/enums.py
+++ b/speech/google/cloud/gapic/speech/v1/enums.py
@@ -18,9 +18,9 @@ class RecognitionConfig(object):
     class AudioEncoding(object):
         """
         Audio encoding of the data sent in the audio message. All encodings support
-        only 1 channel (mono) audio. Only ``FLAC`` includes a header that describes
-        the bytes of audio that follow the header. The other encodings are raw
-        audio bytes with no header.
+        only 1 channel (mono) audio. Only ``FLAC`` and ``WAV`` include a header that
+        describes the bytes of audio that follow the header. The other encodings
+        are raw audio bytes with no header.
 
         For best results, the audio source should be captured and transmitted using
         a lossless encoding (``FLAC`` or ``LINEAR16``). Recognition accuracy may be
diff --git a/speech/google/cloud/gapic/speech/v1/speech_client.py b/speech/google/cloud/gapic/speech/v1/speech_client.py
index 3806330b25bbf..e5707b84c65d4 100644
--- a/speech/google/cloud/gapic/speech/v1/speech_client.py
+++ b/speech/google/cloud/gapic/speech/v1/speech_client.py
@@ -197,7 +197,6 @@ def recognize(self, config, audio, options=None):
           :exc:`google.gax.errors.GaxError` if the RPC is aborted.
           :exc:`ValueError` if the parameters are invalid.
         """
-        # Create the request object.
         request = cloud_speech_pb2.RecognizeRequest(config=config, audio=audio)
         return self._recognize(request, options)
 
@@ -244,7 +243,6 @@ def long_running_recognize(self, config, audio, options=None):
           :exc:`google.gax.errors.GaxError` if the RPC is aborted.
           :exc:`ValueError` if the parameters are invalid.
         """
-        # Create the request object.
         request = cloud_speech_pb2.LongRunningRecognizeRequest(
             config=config, audio=audio)
         return google.gax._OperationFuture(
diff --git a/speech/google/cloud/gapic/speech/v1/speech_client_config.json b/speech/google/cloud/gapic/speech/v1/speech_client_config.json
index 4edd15ce865bb..bf5c507caf1a5 100644
--- a/speech/google/cloud/gapic/speech/v1/speech_client_config.json
+++ b/speech/google/cloud/gapic/speech/v1/speech_client_config.json
@@ -6,9 +6,7 @@
           "DEADLINE_EXCEEDED",
           "UNAVAILABLE"
         ],
-        "non_idempotent": [
-          "UNAVAILABLE"
-        ]
+        "non_idempotent": []
       },
       "retry_params": {
         "default": {
diff --git a/speech/google/cloud/proto/speech/v1/cloud_speech_pb2.py b/speech/google/cloud/proto/speech/v1/cloud_speech_pb2.py
index 29d73064b5564..2f3aae7564694 100644
--- a/speech/google/cloud/proto/speech/v1/cloud_speech_pb2.py
+++ b/speech/google/cloud/proto/speech/v1/cloud_speech_pb2.py
@@ -25,7 +25,7 @@
   name='google/cloud/proto/speech/v1/cloud_speech.proto',
   package='google.cloud.speech.v1',
   syntax='proto3',
-  serialized_pb=_b('\n/google/cloud/proto/speech/v1/cloud_speech.proto\x12\x16google.cloud.speech.v1\x1a\x1cgoogle/api/annotations.proto\x1a#google/longrunning/operations.proto\x1a\x19google/protobuf/any.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17google/rpc/status.proto\"\x86\x01\n\x10RecognizeRequest\x12\x39\n\x06\x63onfig\x18\x01 \x01(\x0b\x32).google.cloud.speech.v1.RecognitionConfig\x12\x37\n\x05\x61udio\x18\x02 \x01(\x0b\x32(.google.cloud.speech.v1.RecognitionAudio\"\x91\x01\n\x1bLongRunningRecognizeRequest\x12\x39\n\x06\x63onfig\x18\x01 \x01(\x0b\x32).google.cloud.speech.v1.RecognitionConfig\x12\x37\n\x05\x61udio\x18\x02 \x01(\x0b\x32(.google.cloud.speech.v1.RecognitionAudio\"\x99\x01\n\x19StreamingRecognizeRequest\x12N\n\x10streaming_config\x18\x01 \x01(\x0b\x32\x32.google.cloud.speech.v1.StreamingRecognitionConfigH\x00\x12\x17\n\raudio_content\x18\x02 \x01(\x0cH\x00\x42\x13\n\x11streaming_request\"\x8a\x01\n\x1aStreamingRecognitionConfig\x12\x39\n\x06\x63onfig\x18\x01 \x01(\x0b\x32).google.cloud.speech.v1.RecognitionConfig\x12\x18\n\x10single_utterance\x18\x02 \x01(\x08\x12\x17\n\x0finterim_results\x18\x03 \x01(\x08\"\x92\x03\n\x11RecognitionConfig\x12I\n\x08\x65ncoding\x18\x01 \x01(\x0e\x32\x37.google.cloud.speech.v1.RecognitionConfig.AudioEncoding\x12\x19\n\x11sample_rate_hertz\x18\x02 \x01(\x05\x12\x15\n\rlanguage_code\x18\x03 \x01(\t\x12\x18\n\x10max_alternatives\x18\x04 \x01(\x05\x12\x18\n\x10profanity_filter\x18\x05 \x01(\x08\x12>\n\x0fspeech_contexts\x18\x06 \x03(\x0b\x32%.google.cloud.speech.v1.SpeechContext\"\x8b\x01\n\rAudioEncoding\x12\x18\n\x14\x45NCODING_UNSPECIFIED\x10\x00\x12\x0c\n\x08LINEAR16\x10\x01\x12\x08\n\x04\x46LAC\x10\x02\x12\t\n\x05MULAW\x10\x03\x12\x07\n\x03\x41MR\x10\x04\x12\n\n\x06\x41MR_WB\x10\x05\x12\x0c\n\x08OGG_OPUS\x10\x06\x12\x1a\n\x16SPEEX_WITH_HEADER_BYTE\x10\x07\" \n\rSpeechContext\x12\x0f\n\x07phrases\x18\x01 \x03(\t\"D\n\x10RecognitionAudio\x12\x11\n\x07\x63ontent\x18\x01 \x01(\x0cH\x00\x12\r\n\x03uri\x18\x02 \x01(\tH\x00\x42\x0e\n\x0c\x61udio_source\"U\n\x11RecognizeResponse\x12@\n\x07results\x18\x02 \x03(\x0b\x32/.google.cloud.speech.v1.SpeechRecognitionResult\"`\n\x1cLongRunningRecognizeResponse\x12@\n\x07results\x18\x02 \x03(\x0b\x32/.google.cloud.speech.v1.SpeechRecognitionResult\"\x9e\x01\n\x1cLongRunningRecognizeMetadata\x12\x18\n\x10progress_percent\x18\x01 \x01(\x05\x12.\n\nstart_time\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x34\n\x10last_update_time\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\"\xb1\x02\n\x1aStreamingRecognizeResponse\x12!\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x12.google.rpc.Status\x12\x43\n\x07results\x18\x02 \x03(\x0b\x32\x32.google.cloud.speech.v1.StreamingRecognitionResult\x12]\n\x11speech_event_type\x18\x04 \x01(\x0e\x32\x42.google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType\"L\n\x0fSpeechEventType\x12\x1c\n\x18SPEECH_EVENT_UNSPECIFIED\x10\x00\x12\x1b\n\x17\x45ND_OF_SINGLE_UTTERANCE\x10\x01\"\x8d\x01\n\x1aStreamingRecognitionResult\x12J\n\x0c\x61lternatives\x18\x01 \x03(\x0b\x32\x34.google.cloud.speech.v1.SpeechRecognitionAlternative\x12\x10\n\x08is_final\x18\x02 \x01(\x08\x12\x11\n\tstability\x18\x03 \x01(\x02\"e\n\x17SpeechRecognitionResult\x12J\n\x0c\x61lternatives\x18\x01 \x03(\x0b\x32\x34.google.cloud.speech.v1.SpeechRecognitionAlternative\"F\n\x1cSpeechRecognitionAlternative\x12\x12\n\ntranscript\x18\x01 \x01(\t\x12\x12\n\nconfidence\x18\x02 \x01(\x02\x32\xa6\x03\n\x06Speech\x12\x81\x01\n\tRecognize\x12(.google.cloud.speech.v1.RecognizeRequest\x1a).google.cloud.speech.v1.RecognizeResponse\"\x1f\x82\xd3\xe4\x93\x02\x19\"\x14/v1/speech:recognize:\x01*\x12\x96\x01\n\x14LongRunningRecognize\x12\x33.google.cloud.speech.v1.LongRunningRecognizeRequest\x1a\x1d.google.longrunning.Operation\"*\x82\xd3\xe4\x93\x02$\"\x1f/v1/speech:longrunningrecognize:\x01*\x12\x7f\n\x12StreamingRecognize\x12\x31.google.cloud.speech.v1.StreamingRecognizeRequest\x1a\x32.google.cloud.speech.v1.StreamingRecognizeResponse(\x01\x30\x01\x42i\n\x1a\x63om.google.cloud.speech.v1B\x0bSpeechProtoP\x01Z<google.golang.org/genproto/googleapis/cloud/speech/v1;speechb\x06proto3')
+  serialized_pb=_b('\n/google/cloud/proto/speech/v1/cloud_speech.proto\x12\x16google.cloud.speech.v1\x1a\x1cgoogle/api/annotations.proto\x1a#google/longrunning/operations.proto\x1a\x19google/protobuf/any.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17google/rpc/status.proto\"\x86\x01\n\x10RecognizeRequest\x12\x39\n\x06\x63onfig\x18\x01 \x01(\x0b\x32).google.cloud.speech.v1.RecognitionConfig\x12\x37\n\x05\x61udio\x18\x02 \x01(\x0b\x32(.google.cloud.speech.v1.RecognitionAudio\"\x91\x01\n\x1bLongRunningRecognizeRequest\x12\x39\n\x06\x63onfig\x18\x01 \x01(\x0b\x32).google.cloud.speech.v1.RecognitionConfig\x12\x37\n\x05\x61udio\x18\x02 \x01(\x0b\x32(.google.cloud.speech.v1.RecognitionAudio\"\x99\x01\n\x19StreamingRecognizeRequest\x12N\n\x10streaming_config\x18\x01 \x01(\x0b\x32\x32.google.cloud.speech.v1.StreamingRecognitionConfigH\x00\x12\x17\n\raudio_content\x18\x02 \x01(\x0cH\x00\x42\x13\n\x11streaming_request\"\x8a\x01\n\x1aStreamingRecognitionConfig\x12\x39\n\x06\x63onfig\x18\x01 \x01(\x0b\x32).google.cloud.speech.v1.RecognitionConfig\x12\x18\n\x10single_utterance\x18\x02 \x01(\x08\x12\x17\n\x0finterim_results\x18\x03 \x01(\x08\"\xb4\x03\n\x11RecognitionConfig\x12I\n\x08\x65ncoding\x18\x01 \x01(\x0e\x32\x37.google.cloud.speech.v1.RecognitionConfig.AudioEncoding\x12\x19\n\x11sample_rate_hertz\x18\x02 \x01(\x05\x12\x15\n\rlanguage_code\x18\x03 \x01(\t\x12\x18\n\x10max_alternatives\x18\x04 \x01(\x05\x12\x18\n\x10profanity_filter\x18\x05 \x01(\x08\x12>\n\x0fspeech_contexts\x18\x06 \x03(\x0b\x32%.google.cloud.speech.v1.SpeechContext\x12 \n\x18\x65nable_word_time_offsets\x18\x08 \x01(\x08\"\x8b\x01\n\rAudioEncoding\x12\x18\n\x14\x45NCODING_UNSPECIFIED\x10\x00\x12\x0c\n\x08LINEAR16\x10\x01\x12\x08\n\x04\x46LAC\x10\x02\x12\t\n\x05MULAW\x10\x03\x12\x07\n\x03\x41MR\x10\x04\x12\n\n\x06\x41MR_WB\x10\x05\x12\x0c\n\x08OGG_OPUS\x10\x06\x12\x1a\n\x16SPEEX_WITH_HEADER_BYTE\x10\x07\" \n\rSpeechContext\x12\x0f\n\x07phrases\x18\x01 \x03(\t\"D\n\x10RecognitionAudio\x12\x11\n\x07\x63ontent\x18\x01 \x01(\x0cH\x00\x12\r\n\x03uri\x18\x02 \x01(\tH\x00\x42\x0e\n\x0c\x61udio_source\"U\n\x11RecognizeResponse\x12@\n\x07results\x18\x02 \x03(\x0b\x32/.google.cloud.speech.v1.SpeechRecognitionResult\"`\n\x1cLongRunningRecognizeResponse\x12@\n\x07results\x18\x02 \x03(\x0b\x32/.google.cloud.speech.v1.SpeechRecognitionResult\"\x9e\x01\n\x1cLongRunningRecognizeMetadata\x12\x18\n\x10progress_percent\x18\x01 \x01(\x05\x12.\n\nstart_time\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x34\n\x10last_update_time\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\"\xb1\x02\n\x1aStreamingRecognizeResponse\x12!\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x12.google.rpc.Status\x12\x43\n\x07results\x18\x02 \x03(\x0b\x32\x32.google.cloud.speech.v1.StreamingRecognitionResult\x12]\n\x11speech_event_type\x18\x04 \x01(\x0e\x32\x42.google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType\"L\n\x0fSpeechEventType\x12\x1c\n\x18SPEECH_EVENT_UNSPECIFIED\x10\x00\x12\x1b\n\x17\x45ND_OF_SINGLE_UTTERANCE\x10\x01\"\x8d\x01\n\x1aStreamingRecognitionResult\x12J\n\x0c\x61lternatives\x18\x01 \x03(\x0b\x32\x34.google.cloud.speech.v1.SpeechRecognitionAlternative\x12\x10\n\x08is_final\x18\x02 \x01(\x08\x12\x11\n\tstability\x18\x03 \x01(\x02\"e\n\x17SpeechRecognitionResult\x12J\n\x0c\x61lternatives\x18\x01 \x03(\x0b\x32\x34.google.cloud.speech.v1.SpeechRecognitionAlternative\"w\n\x1cSpeechRecognitionAlternative\x12\x12\n\ntranscript\x18\x01 \x01(\t\x12\x12\n\nconfidence\x18\x02 \x01(\x02\x12/\n\x05words\x18\x03 \x03(\x0b\x32 .google.cloud.speech.v1.WordInfo\"t\n\x08WordInfo\x12-\n\nstart_time\x18\x01 \x01(\x0b\x32\x19.google.protobuf.Duration\x12+\n\x08\x65nd_time\x18\x02 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x0c\n\x04word\x18\x03 \x01(\t2\xa6\x03\n\x06Speech\x12\x81\x01\n\tRecognize\x12(.google.cloud.speech.v1.RecognizeRequest\x1a).google.cloud.speech.v1.RecognizeResponse\"\x1f\x82\xd3\xe4\x93\x02\x19\"\x14/v1/speech:recognize:\x01*\x12\x96\x01\n\x14LongRunningRecognize\x12\x33.google.cloud.speech.v1.LongRunningRecognizeRequest\x1a\x1d.google.longrunning.Operation\"*\x82\xd3\xe4\x93\x02$\"\x1f/v1/speech:longrunningrecognize:\x01*\x12\x7f\n\x12StreamingRecognize\x12\x31.google.cloud.speech.v1.StreamingRecognizeRequest\x1a\x32.google.cloud.speech.v1.StreamingRecognizeResponse(\x01\x30\x01\x42l\n\x1a\x63om.google.cloud.speech.v1B\x0bSpeechProtoP\x01Z<google.golang.org/genproto/googleapis/cloud/speech/v1;speech\xf8\x01\x01\x62\x06proto3')
   ,
   dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_longrunning_dot_operations__pb2.DESCRIPTOR,google_dot_protobuf_dot_any__pb2.DESCRIPTOR,google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,google_dot_rpc_dot_status__pb2.DESCRIPTOR,])
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
@@ -73,8 +73,8 @@
   ],
   containing_type=None,
   options=None,
-  serialized_start=1105,
-  serialized_end=1244,
+  serialized_start=1139,
+  serialized_end=1278,
 )
 _sym_db.RegisterEnumDescriptor(_RECOGNITIONCONFIG_AUDIOENCODING)
 
@@ -95,8 +95,8 @@
   ],
   containing_type=None,
   options=None,
-  serialized_start=1926,
-  serialized_end=2002,
+  serialized_start=1960,
+  serialized_end=2036,
 )
 _sym_db.RegisterEnumDescriptor(_STREAMINGRECOGNIZERESPONSE_SPEECHEVENTTYPE)
 
@@ -312,6 +312,13 @@
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
+    _descriptor.FieldDescriptor(
+      name='enable_word_time_offsets', full_name='google.cloud.speech.v1.RecognitionConfig.enable_word_time_offsets', index=6,
+      number=8, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
   ],
   extensions=[
   ],
@@ -326,7 +333,7 @@
   oneofs=[
   ],
   serialized_start=842,
-  serialized_end=1244,
+  serialized_end=1278,
 )
 
 
@@ -356,8 +363,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1246,
-  serialized_end=1278,
+  serialized_start=1280,
+  serialized_end=1312,
 )
 
 
@@ -397,8 +404,8 @@
       name='audio_source', full_name='google.cloud.speech.v1.RecognitionAudio.audio_source',
       index=0, containing_type=None, fields=[]),
   ],
-  serialized_start=1280,
-  serialized_end=1348,
+  serialized_start=1314,
+  serialized_end=1382,
 )
 
 
@@ -428,8 +435,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1350,
-  serialized_end=1435,
+  serialized_start=1384,
+  serialized_end=1469,
 )
 
 
@@ -459,8 +466,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1437,
-  serialized_end=1533,
+  serialized_start=1471,
+  serialized_end=1567,
 )
 
 
@@ -504,8 +511,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1536,
-  serialized_end=1694,
+  serialized_start=1570,
+  serialized_end=1728,
 )
 
 
@@ -550,8 +557,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1697,
-  serialized_end=2002,
+  serialized_start=1731,
+  serialized_end=2036,
 )
 
 
@@ -595,8 +602,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2005,
-  serialized_end=2146,
+  serialized_start=2039,
+  serialized_end=2180,
 )
 
 
@@ -626,8 +633,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2148,
-  serialized_end=2249,
+  serialized_start=2182,
+  serialized_end=2283,
 )
 
 
@@ -652,6 +659,13 @@
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
+    _descriptor.FieldDescriptor(
+      name='words', full_name='google.cloud.speech.v1.SpeechRecognitionAlternative.words', index=2,
+      number=3, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
   ],
   extensions=[
   ],
@@ -664,8 +678,53 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=2251,
-  serialized_end=2321,
+  serialized_start=2285,
+  serialized_end=2404,
+)
+
+
+_WORDINFO = _descriptor.Descriptor(
+  name='WordInfo',
+  full_name='google.cloud.speech.v1.WordInfo',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='start_time', full_name='google.cloud.speech.v1.WordInfo.start_time', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='end_time', full_name='google.cloud.speech.v1.WordInfo.end_time', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='word', full_name='google.cloud.speech.v1.WordInfo.word', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=2406,
+  serialized_end=2522,
 )
 
 _RECOGNIZEREQUEST.fields_by_name['config'].message_type = _RECOGNITIONCONFIG
@@ -699,6 +758,9 @@
 _STREAMINGRECOGNIZERESPONSE_SPEECHEVENTTYPE.containing_type = _STREAMINGRECOGNIZERESPONSE
 _STREAMINGRECOGNITIONRESULT.fields_by_name['alternatives'].message_type = _SPEECHRECOGNITIONALTERNATIVE
 _SPEECHRECOGNITIONRESULT.fields_by_name['alternatives'].message_type = _SPEECHRECOGNITIONALTERNATIVE
+_SPEECHRECOGNITIONALTERNATIVE.fields_by_name['words'].message_type = _WORDINFO
+_WORDINFO.fields_by_name['start_time'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION
+_WORDINFO.fields_by_name['end_time'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION
 DESCRIPTOR.message_types_by_name['RecognizeRequest'] = _RECOGNIZEREQUEST
 DESCRIPTOR.message_types_by_name['LongRunningRecognizeRequest'] = _LONGRUNNINGRECOGNIZEREQUEST
 DESCRIPTOR.message_types_by_name['StreamingRecognizeRequest'] = _STREAMINGRECOGNIZEREQUEST
@@ -713,6 +775,7 @@
 DESCRIPTOR.message_types_by_name['StreamingRecognitionResult'] = _STREAMINGRECOGNITIONRESULT
 DESCRIPTOR.message_types_by_name['SpeechRecognitionResult'] = _SPEECHRECOGNITIONRESULT
 DESCRIPTOR.message_types_by_name['SpeechRecognitionAlternative'] = _SPEECHRECOGNITIONALTERNATIVE
+DESCRIPTOR.message_types_by_name['WordInfo'] = _WORDINFO
 
 RecognizeRequest = _reflection.GeneratedProtocolMessageType('RecognizeRequest', (_message.Message,), dict(
   DESCRIPTOR = _RECOGNIZEREQUEST,
@@ -763,6 +826,9 @@
   
   
   Attributes:
+      streaming_request:
+          The streaming request, which is either a streaming config or
+          audio content.
       streaming_config:
           Provides information to the recognizer that specifies how to
           process the request. The first ``StreamingRecognizeRequest``
@@ -861,6 +927,11 @@
       speech_contexts:
           *Optional* A means to provide context to assist the speech
           recognition.
+      enable_word_time_offsets:
+          *Optional* If ``true``, the top result includes a list of
+          words and the start and end time offsets (timestamps) for
+          those words. If ``false``, no word-level time offset
+          information is returned. The default is ``false``.
   """,
   # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.RecognitionConfig)
   ))
@@ -895,11 +966,15 @@
   ,
   __doc__ = """Contains audio data in the encoding specified in the
   ``RecognitionConfig``. Either ``content`` or ``uri`` must be supplied.
-  Supplying both or neither returns [google.rpc.Code.INVALID\_ARGUMENT][].
+  Supplying both or neither returns
+  [google.rpc.Code.INVALID\_ARGUMENT][google.rpc.Code.INVALID\_ARGUMENT].
   See `audio limits <https://cloud.google.com/speech/limits#content>`__.
   
   
   Attributes:
+      audio_source:
+          The audio source, which is either inline content or a Google
+          Cloud Storage uri.
       content:
           The audio data bytes encoded as specified in
           ``RecognitionConfig``. Note: as with all bytes fields,
@@ -910,8 +985,9 @@
           specified in ``RecognitionConfig``. Currently, only Google
           Cloud Storage URIs are supported, which must be specified in
           the following format: ``gs://bucket_name/object_name`` (other
-          URI formats return [google.rpc.Code.INVALID\_ARGUMENT][]). For
-          more information, see `Request URIs
+          URI formats return [google.rpc.Code.INVALID\_ARGUMENT][google.
+          rpc.Code.INVALID\_ARGUMENT]). For more information, see
+          `Request URIs
           <https://cloud.google.com/storage/docs/reference-uris>`__.
   """,
   # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.RecognitionAudio)
@@ -1010,15 +1086,13 @@
      results { alternatives { transcript: " the question" } stability:
      0.01 }
   
-  7. speech\_event\_type: END\_OF\_SINGLE\_UTTERANCE
-  
-  8. results { alternatives { transcript: " that is the question"
+  7. results { alternatives { transcript: " that is the question"
      confidence: 0.98 } alternatives { transcript: " that was the
      question" } is\_final: true }
   
   Notes:
   
-  -  Only two of the above responses #4 and #8 contain final results; they
+  -  Only two of the above responses #4 and #7 contain final results; they
      are indicated by ``is_final: true``. Concatenating these together
      generates the full transcript: "to be or not to be that is the
      question".
@@ -1040,8 +1114,9 @@
   
   Attributes:
       error:
-          *Output-only* If set, returns a [google.rpc.Status][] message
-          that specifies the error for the operation.
+          *Output-only* If set, returns a
+          [google.rpc.Status][google.rpc.Status] message that specifies
+          the error for the operation.
       results:
           *Output-only* This repeated list contains zero or more results
           that correspond to consecutive portions of the audio currently
@@ -1097,7 +1172,10 @@
   Attributes:
       alternatives:
           *Output-only* May contain one or more recognition hypotheses
-          (up to the maximum specified in ``max_alternatives``).
+          (up to the maximum specified in ``max_alternatives``). These
+          alternatives are ordered in terms of accuracy, with the top
+          (first) alternative being the most probable, as ranked by the
+          recognizer.
   """,
   # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.SpeechRecognitionResult)
   ))
@@ -1120,17 +1198,50 @@
           the recognized words are correct. This field is typically
           provided only for the top hypothesis, and only for
           ``is_final=true`` results. Clients should not rely on the
-          ``confidence`` field as it is not guaranteed to be accurate,
-          or even set, in any of the results. The default of 0.0 is a
-          sentinel value indicating ``confidence`` was not set.
+          ``confidence`` field as it is not guaranteed to be accurate or
+          consistent. The default of 0.0 is a sentinel value indicating
+          ``confidence`` was not set.
+      words:
+          *Output-only* A list of word-specific information for each
+          recognized word.
   """,
   # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.SpeechRecognitionAlternative)
   ))
 _sym_db.RegisterMessage(SpeechRecognitionAlternative)
 
+WordInfo = _reflection.GeneratedProtocolMessageType('WordInfo', (_message.Message,), dict(
+  DESCRIPTOR = _WORDINFO,
+  __module__ = 'google.cloud.proto.speech.v1.cloud_speech_pb2'
+  ,
+  __doc__ = """Word-specific information for recognized words. Word information is only
+  included in the response when certain request parameters are set, such
+  as ``enable_word_time_offsets``.
+  
+  
+  Attributes:
+      start_time:
+          *Output-only* Time offset relative to the beginning of the
+          audio, and corresponding to the start of the spoken word. This
+          field is only set if ``enable_word_time_offsets=true`` and
+          only in the top hypothesis. This is an experimental feature
+          and the accuracy of the time offset can vary.
+      end_time:
+          *Output-only* Time offset relative to the beginning of the
+          audio, and corresponding to the end of the spoken word. This
+          field is only set if ``enable_word_time_offsets=true`` and
+          only in the top hypothesis. This is an experimental feature
+          and the accuracy of the time offset can vary.
+      word:
+          *Output-only* The word corresponding to this set of
+          information.
+  """,
+  # @@protoc_insertion_point(class_scope:google.cloud.speech.v1.WordInfo)
+  ))
+_sym_db.RegisterMessage(WordInfo)
+
 
 DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\032com.google.cloud.speech.v1B\013SpeechProtoP\001Z<google.golang.org/genproto/googleapis/cloud/speech/v1;speech'))
+DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\032com.google.cloud.speech.v1B\013SpeechProtoP\001Z<google.golang.org/genproto/googleapis/cloud/speech/v1;speech\370\001\001'))
 try:
   # THESE ELEMENTS WILL BE DEPRECATED.
   # Please use the generated *_pb2_grpc.py files instead.

From ce9cd83e6a65212c7e26a41344d38a53c770c2b7 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 28 Jul 2017 13:42:08 -0700
Subject: [PATCH 139/211] Bump Speech to 0.27.1 (#3702)

This release adds `WordTimeOffset`, the ability to have timestamps on the output.
---
 speech/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/speech/setup.py b/speech/setup.py
index 1075df8371410..0be72b13f14a8 100644
--- a/speech/setup.py
+++ b/speech/setup.py
@@ -59,7 +59,7 @@
 
 setup(
     name='google-cloud-speech',
-    version='0.27.0',
+    version='0.27.1',
     description='Python Client for Google Cloud Speech',
     long_description=README,
     namespace_packages=[

From 963d997b37f4336fe831238dd8b641a17dd050ae Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Mon, 31 Jul 2017 09:24:26 -0700
Subject: [PATCH 140/211] Allowing logging system tests to fail. (#3691)

These hose our builds.
---
 logging/nox.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/logging/nox.py b/logging/nox.py
index ce8d1c0afbce8..ea3621040796c 100644
--- a/logging/nox.py
+++ b/logging/nox.py
@@ -71,7 +71,13 @@ def system_tests(session, python_version):
     session.install('.')
 
     # Run py.test against the system tests.
-    session.run('py.test', '-vvv', 'tests/system.py', *session.posargs)
+    session.run(
+        'py.test',
+        '-vvv',
+        'tests/system.py',
+        *session.posargs,
+        success_codes=range(0, 100),
+    )
 
 
 @nox.session

From 6dc55fd8070d265d0f8254aff706a259f2e2a393 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Mon, 31 Jul 2017 12:29:57 -0700
Subject: [PATCH 141/211] BigQuery & Storage: use client http for resumable
 media (#3705)

* BigQuery: Use client transport for resumable media
* Storage: Use client transport for resumable media
---
 bigquery/google/cloud/bigquery/table.py |  14 +--
 bigquery/tests/unit/test_table.py       |  65 ++++++-----
 storage/google/cloud/storage/blob.py    |  16 ++-
 storage/tests/unit/test_blob.py         | 136 +++++++++---------------
 4 files changed, 93 insertions(+), 138 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/table.py b/bigquery/google/cloud/bigquery/table.py
index c32832a926ced..9960b560624d0 100644
--- a/bigquery/google/cloud/bigquery/table.py
+++ b/bigquery/google/cloud/bigquery/table.py
@@ -19,7 +19,6 @@
 
 import six
 
-import google.auth.transport.requests
 from google import resumable_media
 from google.resumable_media.requests import MultipartUpload
 from google.resumable_media.requests import ResumableUpload
@@ -823,8 +822,8 @@ def insert_data(self,
 
         return errors
 
-    def _make_transport(self, client):
-        """Make an authenticated transport with a client's credentials.
+    def _get_transport(self, client):
+        """Return the client's transport.
 
         :type client: :class:`~google.cloud.bigquery.client.Client`
         :param client: The client to use.
@@ -834,10 +833,7 @@ def _make_transport(self, client):
         :returns: The transport (with credentials) that will
                   make authenticated requests.
         """
-        # Create a ``requests`` transport with the client's credentials.
-        transport = google.auth.transport.requests.AuthorizedSession(
-            client._credentials)
-        return transport
+        return client._http
 
     def _initiate_resumable_upload(self, client, stream,
                                    metadata, num_retries):
@@ -865,7 +861,7 @@ def _initiate_resumable_upload(self, client, stream,
             * The ``transport`` used to initiate the upload.
         """
         chunk_size = _DEFAULT_CHUNKSIZE
-        transport = self._make_transport(client)
+        transport = self._get_transport(client)
         headers = _get_upload_headers(client._connection.USER_AGENT)
         upload_url = _RESUMABLE_URL_TEMPLATE.format(project=self.project)
         upload = ResumableUpload(upload_url, chunk_size, headers=headers)
@@ -941,7 +937,7 @@ def _do_multipart_upload(self, client, stream, metadata,
             msg = _READ_LESS_THAN_SIZE.format(size, len(data))
             raise ValueError(msg)
 
-        transport = self._make_transport(client)
+        transport = self._get_transport(client)
         headers = _get_upload_headers(client._connection.USER_AGENT)
 
         upload_url = _MULTIPART_URL_TEMPLATE.format(project=self.project)
diff --git a/bigquery/tests/unit/test_table.py b/bigquery/tests/unit/test_table.py
index eebb40a2e7361..3bab58b6c8f84 100644
--- a/bigquery/tests/unit/test_table.py
+++ b/bigquery/tests/unit/test_table.py
@@ -1561,14 +1561,14 @@ def _row_data(row):
         self.assertEqual(req['path'], '/%s' % PATH)
         self.assertEqual(req['data'], SENT)
 
-    @mock.patch('google.auth.transport.requests.AuthorizedSession')
-    def test__make_transport(self, session_factory):
-        client = mock.Mock(spec=[u'_credentials'])
+    def test__get_transport(self):
+        client = mock.Mock(spec=[u'_credentials', '_http'])
+        client._http = mock.sentinel.http
         table = self._make_one(self.TABLE_NAME, None)
-        transport = table._make_transport(client)
 
-        self.assertIs(transport, session_factory.return_value)
-        session_factory.assert_called_once_with(client._credentials)
+        transport = table._get_transport(client)
+
+        self.assertIs(transport, mock.sentinel.http)
 
     @staticmethod
     def _mock_requests_response(status_code, headers, content=b''):
@@ -1600,8 +1600,7 @@ def _initiate_resumable_upload_helper(self, num_retries=None):
         response_headers = {'location': resumable_url}
         fake_transport = self._mock_transport(
             http_client.OK, response_headers)
-        table._make_transport = mock.Mock(
-            return_value=fake_transport, spec=[])
+        client._http = fake_transport
 
         # Create some mock arguments and call the method under test.
         data = b'goodbye gudbi gootbee'
@@ -1640,7 +1639,6 @@ def _initiate_resumable_upload_helper(self, num_retries=None):
         self.assertEqual(stream.tell(), 0)
 
         # Check the mocks.
-        table._make_transport.assert_called_once_with(client)
         request_headers = expected_headers.copy()
         request_headers['x-upload-content-type'] = _GENERIC_CONTENT_TYPE
         fake_transport.request.assert_called_once_with(
@@ -1668,7 +1666,7 @@ def _do_multipart_upload_success_helper(
 
         # Create mocks to be checked for doing transport.
         fake_transport = self._mock_transport(http_client.OK, {})
-        table._make_transport = mock.Mock(return_value=fake_transport, spec=[])
+        client._http = fake_transport
 
         # Create some mock arguments.
         data = b'Bzzzz-zap \x00\x01\xf4'
@@ -1682,7 +1680,6 @@ def _do_multipart_upload_success_helper(
         # Check the mocks and the returned value.
         self.assertIs(response, fake_transport.request.return_value)
         self.assertEqual(stream.tell(), size)
-        table._make_transport.assert_called_once_with(client)
         get_boundary.assert_called_once_with()
 
         upload_url = (
@@ -1723,7 +1720,7 @@ class TestTableUpload(object):
     #       rather than `unittest`-style.
 
     @staticmethod
-    def _make_table():
+    def _make_table(transport=None):
         from google.cloud.bigquery import _http
         from google.cloud.bigquery import client
         from google.cloud.bigquery import dataset
@@ -1733,6 +1730,7 @@ def _make_table():
         client = mock.create_autospec(client.Client, instance=True)
         client._connection = connection
         client._credentials = mock.sentinel.credentials
+        client._http = transport
         client.project = 'project_id'
 
         dataset = dataset.Dataset('test_dataset', client)
@@ -1955,57 +1953,54 @@ def _make_resumable_upload_responses(cls, size):
         return [initial_response, data_response, final_response]
 
     @staticmethod
-    def _make_transport_patch(table, responses=None):
-        """Patch a table's _make_transport method to return given responses."""
+    def _make_transport(responses=None):
         import google.auth.transport.requests
 
         transport = mock.create_autospec(
             google.auth.transport.requests.AuthorizedSession, instance=True)
         transport.request.side_effect = responses
-        return mock.patch.object(
-            table, '_make_transport', return_value=transport, autospec=True)
+        return transport
 
     def test__do_resumable_upload(self):
-        table = self._make_table()
         file_obj = self._make_file_obj()
         file_obj_len = len(file_obj.getvalue())
-        responses = self._make_resumable_upload_responses(file_obj_len)
+        transport = self._make_transport(
+            self._make_resumable_upload_responses(file_obj_len))
+        table = self._make_table(transport)
 
-        with self._make_transport_patch(table, responses) as transport:
-            result = table._do_resumable_upload(
-                table._dataset._client,
-                file_obj,
-                self.EXPECTED_CONFIGURATION,
-                None)
+        result = table._do_resumable_upload(
+            table._dataset._client,
+            file_obj,
+            self.EXPECTED_CONFIGURATION,
+            None)
 
         content = result.content.decode('utf-8')
         assert json.loads(content) == {'size': file_obj_len}
 
         # Verify that configuration data was passed in with the initial
         # request.
-        transport.return_value.request.assert_any_call(
+        transport.request.assert_any_call(
             'POST',
             mock.ANY,
             data=json.dumps(self.EXPECTED_CONFIGURATION).encode('utf-8'),
             headers=mock.ANY)
 
     def test__do_multipart_upload(self):
-        table = self._make_table()
+        transport = self._make_transport([self._make_response(http_client.OK)])
+        table = self._make_table(transport)
         file_obj = self._make_file_obj()
         file_obj_len = len(file_obj.getvalue())
-        responses = [self._make_response(http_client.OK)]
 
-        with self._make_transport_patch(table, responses) as transport:
-            table._do_multipart_upload(
-                table._dataset._client,
-                file_obj,
-                self.EXPECTED_CONFIGURATION,
-                file_obj_len,
-                None)
+        table._do_multipart_upload(
+            table._dataset._client,
+            file_obj,
+            self.EXPECTED_CONFIGURATION,
+            file_obj_len,
+            None)
 
         # Verify that configuration data was passed in with the initial
         # request.
-        request_args = transport.return_value.request.mock_calls[0][2]
+        request_args = transport.request.mock_calls[0][2]
         request_data = request_args['data'].decode('utf-8')
         request_headers = request_args['headers']
 
diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index b515d1e2c8c2a..836cfb645f42f 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -36,7 +36,6 @@
 
 from six.moves.urllib.parse import quote
 
-import google.auth.transport.requests
 from google import resumable_media
 from google.resumable_media.requests import ChunkedDownload
 from google.resumable_media.requests import Download
@@ -361,8 +360,8 @@ def delete(self, client=None):
         """
         return self.bucket.delete_blob(self.name, client=client)
 
-    def _make_transport(self, client):
-        """Make an authenticated transport with a client's credentials.
+    def _get_transport(self, client):
+        """Return the client's transport.
 
         :type client: :class:`~google.cloud.storage.client.Client`
         :param client: (Optional) The client to use.  If not passed, falls back
@@ -374,10 +373,7 @@ def _make_transport(self, client):
                   make authenticated requests.
         """
         client = self._require_client(client)
-        # Create a ``requests`` transport with the client's credentials.
-        transport = google.auth.transport.requests.AuthorizedSession(
-            client._credentials)
-        return transport
+        return client._http
 
     def _get_download_url(self):
         """Get the download URL for the current blob.
@@ -463,7 +459,7 @@ def download_to_file(self, file_obj, client=None):
         """
         download_url = self._get_download_url()
         headers = _get_encryption_headers(self._encryption_key)
-        transport = self._make_transport(client)
+        transport = self._get_transport(client)
 
         try:
             self._do_download(transport, file_obj, download_url, headers)
@@ -638,7 +634,7 @@ def _do_multipart_upload(self, client, stream, content_type,
                 msg = _READ_LESS_THAN_SIZE.format(size, len(data))
                 raise ValueError(msg)
 
-        transport = self._make_transport(client)
+        transport = self._get_transport(client)
         info = self._get_upload_arguments(content_type)
         headers, object_metadata, content_type = info
 
@@ -708,7 +704,7 @@ def _initiate_resumable_upload(self, client, stream, content_type,
         if chunk_size is None:
             chunk_size = self.chunk_size
 
-        transport = self._make_transport(client)
+        transport = self._get_transport(client)
         info = self._get_upload_arguments(content_type)
         headers, object_metadata, content_type = info
         if extra_headers is not None:
diff --git a/storage/tests/unit/test_blob.py b/storage/tests/unit/test_blob.py
index 7904ce86e89bc..7cc0dadc26912 100644
--- a/storage/tests/unit/test_blob.py
+++ b/storage/tests/unit/test_blob.py
@@ -327,14 +327,14 @@ def test_delete(self):
         self.assertFalse(blob.exists())
         self.assertEqual(bucket._deleted, [(BLOB_NAME, None)])
 
-    @mock.patch('google.auth.transport.requests.AuthorizedSession')
-    def test__make_transport(self, fake_session_factory):
-        client = mock.Mock(spec=[u'_credentials'])
+    def test__get_transport(self):
+        client = mock.Mock(spec=[u'_credentials', '_http'])
+        client._http = mock.sentinel.transport
         blob = self._make_one(u'blob-name', bucket=None)
-        transport = blob._make_transport(client)
 
-        self.assertIs(transport, fake_session_factory.return_value)
-        fake_session_factory.assert_called_once_with(client._credentials)
+        transport = blob._get_transport(client)
+
+        self.assertIs(transport, mock.sentinel.transport)
 
     def test__get_download_url_with_media_link(self):
         blob_name = 'something.txt'
@@ -400,13 +400,10 @@ def _mock_download_transport(self):
         fake_transport.request.side_effect = [chunk1_response, chunk2_response]
         return fake_transport
 
-    def _check_session_mocks(self, client, fake_session_factory,
+    def _check_session_mocks(self, client, transport,
                              expected_url, headers=None):
-        # Check that exactly one transport was created.
-        fake_session_factory.assert_called_once_with(client._credentials)
-        fake_transport = fake_session_factory.return_value
         # Check that the transport was called exactly twice.
-        self.assertEqual(fake_transport.request.call_count, 2)
+        self.assertEqual(transport.request.call_count, 2)
         if headers is None:
             headers = {}
         # NOTE: bytes=0-2 never shows up because the mock was called with
@@ -415,7 +412,7 @@ def _check_session_mocks(self, client, fake_session_factory,
         headers['range'] = 'bytes=3-5'
         call = mock.call(
             'GET', expected_url, data=None, headers=headers)
-        self.assertEqual(fake_transport.request.mock_calls, [call, call])
+        self.assertEqual(transport.request.mock_calls, [call, call])
 
     def test__do_download_simple(self):
         blob_name = 'blob-name'
@@ -471,8 +468,7 @@ def test__do_download_chunked(self):
             'GET', download_url, data=None, headers=headers)
         self.assertEqual(transport.request.mock_calls, [call, call])
 
-    @mock.patch('google.auth.transport.requests.AuthorizedSession')
-    def test_download_to_file_with_failure(self, fake_session_factory):
+    def test_download_to_file_with_failure(self):
         from google.cloud import exceptions
 
         blob_name = 'blob-name'
@@ -483,10 +479,8 @@ def test_download_to_file_with_failure(self, fake_session_factory):
         }
         transport.request.return_value = self._mock_requests_response(
             http_client.NOT_FOUND, bad_response_headers, content=b'Not found')
-        fake_session_factory.return_value = transport
         # Create a fake client/bucket and use them in the Blob() constructor.
-        client = mock.Mock(
-            _credentials=_make_credentials(), spec=['_credentials'])
+        client = mock.Mock(_http=transport, spec=[u'_http'])
         bucket = _Bucket(client)
         blob = self._make_one(blob_name, bucket=bucket)
         # Set the media link on the blob
@@ -497,19 +491,15 @@ def test_download_to_file_with_failure(self, fake_session_factory):
             blob.download_to_file(file_obj)
 
         self.assertEqual(file_obj.tell(), 0)
-        # Check that exactly one transport was created.
-        fake_session_factory.assert_called_once_with(client._credentials)
         # Check that the transport was called once.
         transport.request.assert_called_once_with(
             'GET', blob.media_link, data=None, headers={})
 
-    @mock.patch('google.auth.transport.requests.AuthorizedSession')
-    def test_download_to_file_wo_media_link(self, fake_session_factory):
+    def test_download_to_file_wo_media_link(self):
         blob_name = 'blob-name'
-        fake_session_factory.return_value = self._mock_download_transport()
+        transport = self._mock_download_transport()
         # Create a fake client/bucket and use them in the Blob() constructor.
-        client = mock.Mock(
-            _credentials=_make_credentials(), spec=['_credentials'])
+        client = mock.Mock(_http=transport, spec=[u'_http'])
         bucket = _Bucket(client)
         blob = self._make_one(blob_name, bucket=bucket)
         # Modify the blob so there there will be 2 chunks of size 3.
@@ -525,16 +515,13 @@ def test_download_to_file_wo_media_link(self, fake_session_factory):
         expected_url = (
             'https://www.googleapis.com/download/storage/v1/b/'
             'name/o/blob-name?alt=media')
-        self._check_session_mocks(client, fake_session_factory, expected_url)
+        self._check_session_mocks(client, transport, expected_url)
 
-    @mock.patch('google.auth.transport.requests.AuthorizedSession')
-    def _download_to_file_helper(self, fake_session_factory, use_chunks=False):
+    def _download_to_file_helper(self, use_chunks=False):
         blob_name = 'blob-name'
-        fake_transport = self._mock_download_transport()
-        fake_session_factory.return_value = fake_transport
+        transport = self._mock_download_transport()
         # Create a fake client/bucket and use them in the Blob() constructor.
-        client = mock.Mock(
-            _credentials=_make_credentials(), spec=['_credentials'])
+        client = mock.Mock(_http=transport, spec=[u'_http'])
         bucket = _Bucket(client)
         media_link = 'http://example.com/media/'
         properties = {'mediaLink': media_link}
@@ -549,18 +536,16 @@ def _download_to_file_helper(self, fake_session_factory, use_chunks=False):
                 http_client.OK,
                 {'content-length': '6', 'content-range': 'bytes 0-5/6'},
                 content=b'abcdef')
-            fake_transport.request.side_effect = [single_chunk_response]
+            transport.request.side_effect = [single_chunk_response]
 
         file_obj = io.BytesIO()
         blob.download_to_file(file_obj)
         self.assertEqual(file_obj.getvalue(), b'abcdef')
 
         if use_chunks:
-            self._check_session_mocks(client, fake_session_factory, media_link)
+            self._check_session_mocks(client, transport, media_link)
         else:
-            # Check that exactly one transport was created.
-            fake_session_factory.assert_called_once_with(client._credentials)
-            fake_transport.request.assert_called_once_with(
+            transport.request.assert_called_once_with(
                 'GET', media_link, data=None, headers={})
 
     def test_download_to_file_default(self):
@@ -569,16 +554,15 @@ def test_download_to_file_default(self):
     def test_download_to_file_with_chunk_size(self):
         self._download_to_file_helper(use_chunks=True)
 
-    def _download_to_filename_helper(self, fake_session_factory, updated=None):
+    def _download_to_filename_helper(self, updated=None):
         import os
         import time
         from google.cloud._testing import _NamedTemporaryFile
 
         blob_name = 'blob-name'
-        fake_session_factory.return_value = self._mock_download_transport()
+        transport = self._mock_download_transport()
         # Create a fake client/bucket and use them in the Blob() constructor.
-        client = mock.Mock(
-            _credentials=_make_credentials(), spec=['_credentials'])
+        client = mock.Mock(_http=transport, spec=['_http'])
         bucket = _Bucket(client)
         media_link = 'http://example.com/media/'
         properties = {'mediaLink': media_link}
@@ -603,29 +587,24 @@ def _download_to_filename_helper(self, fake_session_factory, updated=None):
 
         self.assertEqual(wrote, b'abcdef')
 
-        self._check_session_mocks(client, fake_session_factory, media_link)
+        self._check_session_mocks(client, transport, media_link)
 
-    @mock.patch('google.auth.transport.requests.AuthorizedSession')
-    def test_download_to_filename(self, fake_session_factory):
+    def test_download_to_filename(self):
         updated = '2014-12-06T13:13:50.690Z'
-        self._download_to_filename_helper(
-            fake_session_factory, updated=updated)
+        self._download_to_filename_helper(updated=updated)
 
-    @mock.patch('google.auth.transport.requests.AuthorizedSession')
-    def test_download_to_filename_wo_updated(self, fake_session_factory):
-        self._download_to_filename_helper(fake_session_factory)
+    def test_download_to_filename_wo_updated(self):
+        self._download_to_filename_helper()
 
-    @mock.patch('google.auth.transport.requests.AuthorizedSession')
-    def test_download_to_filename_w_key(self, fake_session_factory):
+    def test_download_to_filename_w_key(self):
         import os
         import time
         from google.cloud._testing import _NamedTemporaryFile
 
         blob_name = 'blob-name'
-        fake_session_factory.return_value = self._mock_download_transport()
+        transport = self._mock_download_transport()
         # Create a fake client/bucket and use them in the Blob() constructor.
-        client = mock.Mock(
-            _credentials=_make_credentials(), spec=['_credentials'])
+        client = mock.Mock(_http=transport, spec=['_http'])
         bucket = _Bucket(client)
         media_link = 'http://example.com/media/'
         properties = {'mediaLink': media_link,
@@ -655,15 +634,13 @@ def test_download_to_filename_w_key(self, fake_session_factory):
             'X-Goog-Encryption-Key': header_key_value,
         }
         self._check_session_mocks(
-            client, fake_session_factory, media_link, headers=key_headers)
+            client, transport, media_link, headers=key_headers)
 
-    @mock.patch('google.auth.transport.requests.AuthorizedSession')
-    def test_download_as_string(self, fake_session_factory):
+    def test_download_as_string(self):
         blob_name = 'blob-name'
-        fake_session_factory.return_value = self._mock_download_transport()
+        transport = self._mock_download_transport()
         # Create a fake client/bucket and use them in the Blob() constructor.
-        client = mock.Mock(
-            _credentials=_make_credentials(), spec=['_credentials'])
+        client = mock.Mock(_http=transport, spec=['_http'])
         bucket = _Bucket(client)
         media_link = 'http://example.com/media/'
         properties = {'mediaLink': media_link}
@@ -675,7 +652,7 @@ def test_download_as_string(self, fake_session_factory):
         fetched = blob.download_as_string()
         self.assertEqual(fetched, b'abcdef')
 
-        self._check_session_mocks(client, fake_session_factory, media_link)
+        self._check_session_mocks(client, transport, media_link)
 
     def test__get_content_type_explicit(self):
         blob = self._make_one(u'blob-name', bucket=None)
@@ -777,11 +754,10 @@ def _do_multipart_success(self, mock_get_boundary, size=None,
         self.assertIsNone(blob.chunk_size)
 
         # Create mocks to be checked for doing transport.
-        fake_transport = self._mock_transport(http_client.OK, {})
-        blob._make_transport = mock.Mock(return_value=fake_transport, spec=[])
+        transport = self._mock_transport(http_client.OK, {})
 
         # Create some mock arguments.
-        client = mock.sentinel.client
+        client = mock.Mock(_http=transport, spec=['_http'])
         data = b'data here hear hier'
         stream = io.BytesIO(data)
         content_type = u'application/xml'
@@ -789,7 +765,7 @@ def _do_multipart_success(self, mock_get_boundary, size=None,
             client, stream, content_type, size, num_retries)
 
         # Check the mocks and the returned value.
-        self.assertIs(response, fake_transport.request.return_value)
+        self.assertIs(response, transport.request.return_value)
         if size is None:
             data_read = data
             self.assertEqual(stream.tell(), len(data))
@@ -797,7 +773,6 @@ def _do_multipart_success(self, mock_get_boundary, size=None,
             data_read = data[:size]
             self.assertEqual(stream.tell(), size)
 
-        blob._make_transport.assert_called_once_with(client)
         mock_get_boundary.assert_called_once_with()
 
         upload_url = (
@@ -813,7 +788,7 @@ def _do_multipart_success(self, mock_get_boundary, size=None,
             data_read +
             b'\r\n--==0==--')
         headers = {'content-type': b'multipart/related; boundary="==0=="'}
-        fake_transport.request.assert_called_once_with(
+        transport.request.assert_called_once_with(
             'POST', upload_url, data=payload, headers=headers)
 
     @mock.patch(u'google.resumable_media._upload.get_boundary',
@@ -866,12 +841,10 @@ def _initiate_resumable_helper(self, size=None, extra_headers=None,
         # Create mocks to be checked for doing transport.
         resumable_url = 'http://test.invalid?upload_id=hey-you'
         response_headers = {'location': resumable_url}
-        fake_transport = self._mock_transport(
-            http_client.OK, response_headers)
-        blob._make_transport = mock.Mock(return_value=fake_transport, spec=[])
+        transport = self._mock_transport(http_client.OK, response_headers)
 
         # Create some mock arguments and call the method under test.
-        client = mock.sentinel.client
+        client = mock.Mock(_http=transport, spec=[u'_http'])
         data = b'hello hallo halo hi-low'
         stream = io.BytesIO(data)
         content_type = u'text/plain'
@@ -912,13 +885,12 @@ def _initiate_resumable_helper(self, size=None, extra_headers=None,
         else:
             self.assertIsNone(retry_strategy.max_cumulative_retry)
             self.assertEqual(retry_strategy.max_retries, num_retries)
-        self.assertIs(transport, fake_transport)
+        self.assertIs(transport, transport)
         # Make sure we never read from the stream.
         self.assertEqual(stream.tell(), 0)
 
         # Check the mocks.
         blob._get_writable_metadata.assert_called_once_with()
-        blob._make_transport.assert_called_once_with(client)
         payload = json.dumps(object_metadata).encode('utf-8')
         expected_headers = {
             'content-type': 'application/json; charset=UTF-8',
@@ -928,7 +900,7 @@ def _initiate_resumable_helper(self, size=None, extra_headers=None,
             expected_headers['x-upload-content-length'] = str(size)
         if extra_headers is not None:
             expected_headers.update(extra_headers)
-        fake_transport.request.assert_called_once_with(
+        transport.request.assert_called_once_with(
             'POST', upload_url, data=payload, headers=expected_headers)
 
     def test__initiate_resumable_upload_no_size(self):
@@ -1034,12 +1006,11 @@ def _do_resumable_helper(self, use_size=False, num_retries=None):
         resumable_url = 'http://test.invalid?upload_id=and-then-there-was-1'
         headers1 = {'location': resumable_url}
         headers2 = {'range': 'bytes=0-{:d}'.format(blob.chunk_size - 1)}
-        fake_transport, responses = self._make_resumable_transport(
+        transport, responses = self._make_resumable_transport(
             headers1, headers2, {}, total_bytes)
-        blob._make_transport = mock.Mock(return_value=fake_transport, spec=[])
 
         # Create some mock arguments and call the method under test.
-        client = mock.sentinel.client
+        client = mock.Mock(_http=transport, spec=['_http'])
         stream = io.BytesIO(data)
         content_type = u'text/html'
         response = blob._do_resumable_upload(
@@ -1050,14 +1021,13 @@ def _do_resumable_helper(self, use_size=False, num_retries=None):
         self.assertEqual(stream.tell(), total_bytes)
 
         # Check the mocks.
-        blob._make_transport.assert_called_once_with(client)
         call0 = self._do_resumable_upload_call0(blob, content_type, size=size)
         call1 = self._do_resumable_upload_call1(
             blob, content_type, data, resumable_url, size=size)
         call2 = self._do_resumable_upload_call2(
             blob, content_type, data, resumable_url, total_bytes)
         self.assertEqual(
-            fake_transport.request.mock_calls, [call0, call1, call2])
+            transport.request.mock_calls, [call0, call1, call2])
 
     def test__do_resumable_upload_no_size(self):
         self._do_resumable_helper()
@@ -1272,16 +1242,15 @@ def _create_resumable_upload_session_helper(self, origin=None,
         # Create mocks to be checked for doing transport.
         resumable_url = 'http://test.invalid?upload_id=clean-up-everybody'
         response_headers = {'location': resumable_url}
-        fake_transport = self._mock_transport(
+        transport = self._mock_transport(
             http_client.OK, response_headers)
-        blob._make_transport = mock.Mock(return_value=fake_transport, spec=[])
         if side_effect is not None:
-            fake_transport.request.side_effect = side_effect
+            transport.request.side_effect = side_effect
 
         # Create some mock arguments and call the method under test.
         content_type = u'text/plain'
         size = 10000
-        client = mock.sentinel.client
+        client = mock.Mock(_http=transport, spec=[u'_http'])
         new_url = blob.create_resumable_upload_session(
             content_type=content_type, size=size,
             origin=origin, client=client)
@@ -1291,7 +1260,6 @@ def _create_resumable_upload_session_helper(self, origin=None,
         self.assertEqual(blob.chunk_size, chunk_size)
 
         # Check the mocks.
-        blob._make_transport.assert_called_once_with(client)
         upload_url = (
             'https://www.googleapis.com/upload/storage/v1' +
             bucket.path +
@@ -1304,7 +1272,7 @@ def _create_resumable_upload_session_helper(self, origin=None,
         }
         if origin is not None:
             expected_headers['Origin'] = origin
-        fake_transport.request.assert_called_once_with(
+        transport.request.assert_called_once_with(
             'POST', upload_url, data=payload, headers=expected_headers)
 
     def test_create_resumable_upload_session(self):

From 96f0cc34dfe81372dddc3a8e332e11c546ad1259 Mon Sep 17 00:00:00 2001
From: Angela Li <yanhuil@google.com>
Date: Tue, 1 Aug 2017 10:36:40 -0700
Subject: [PATCH 142/211] Reduce the max tries for logging system tests (#3708)

---
 logging/nox.py          | 3 ++-
 logging/tests/system.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/logging/nox.py b/logging/nox.py
index ea3621040796c..f1a1e5516e608 100644
--- a/logging/nox.py
+++ b/logging/nox.py
@@ -74,9 +74,10 @@ def system_tests(session, python_version):
     session.run(
         'py.test',
         '-vvv',
+        '-s',
         'tests/system.py',
         *session.posargs,
-        success_codes=range(0, 100),
+        success_codes=range(0, 100)
     )
 
 
diff --git a/logging/tests/system.py b/logging/tests/system.py
index 70a950f15b919..0e2cb3ab9a32c 100644
--- a/logging/tests/system.py
+++ b/logging/tests/system.py
@@ -116,7 +116,7 @@ def setUp(self):
         self._handlers_cache = logging.getLogger().handlers[:]
 
     def tearDown(self):
-        retry = RetryErrors(NotFound, max_tries=10)
+        retry = RetryErrors(NotFound, max_tries=9)
         for doomed in self.to_delete:
             retry(doomed.delete)()
         logging.getLogger().handlers = self._handlers_cache[:]

From ac23b77f45381ba992e637d194d193810acee5f0 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Tue, 1 Aug 2017 16:01:31 -0400
Subject: [PATCH 143/211] Document deepcopy semantics of complex bucket
 properties. (#3712)

'cors', 'labels', and 'lifecycle_rules' all return copies of the
values:  changes to them have no effect until the copy is reassigned
via the property's setter.

Closes #3710
---
 storage/google/cloud/storage/bucket.py | 41 ++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index 35ba593374902..f9ff7219f4b81 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -544,6 +544,19 @@ def cors(self):
         See http://www.w3.org/TR/cors/ and
              https://cloud.google.com/storage/docs/json_api/v1/buckets
 
+        .. note::
+
+           The getter for this property returns a list which contains
+           *copies* of the bucket's CORS policy mappings.  Mutating the list
+           or one of its dicts has no effect unless you then re-assign the
+           dict via the setter.  E.g.:
+
+           >>> policies = bucket.cors
+           >>> policies.append({'origin': '/foo', ...})
+           >>> policies[1]['maxAgeSeconds'] = 3600
+           >>> del policies[0]
+           >>> bucket.cors = policies
+
         :setter: Set CORS policies for this bucket.
         :getter: Gets the CORS policies for this bucket.
 
@@ -567,11 +580,22 @@ def cors(self, entries):
 
     @property
     def labels(self):
-        """Retrieve or set CORS policies configured for this bucket.
+        """Retrieve or set labels assigned to this bucket.
 
         See
         https://cloud.google.com/storage/docs/json_api/v1/buckets#labels
 
+        .. note::
+
+           The getter for this property returns a dict which is a *copy*
+           of the bucket's labels.  Mutating that dict has no effect unless
+           you then re-assign the dict via the setter.  E.g.:
+
+           >>> labels = bucket.labels
+           >>> labels['new_key'] = 'some-label'
+           >>> del labels['old_key']
+           >>> bucket.labels = labels
+
         :setter: Set labels for this bucket.
         :getter: Gets the labels for this bucket.
 
@@ -585,7 +609,7 @@ def labels(self):
 
     @labels.setter
     def labels(self, mapping):
-        """Set CORS policies configured for this bucket.
+        """Set labels assigned to this bucket.
 
         See
         https://cloud.google.com/storage/docs/json_api/v1/buckets#labels
@@ -627,6 +651,19 @@ def lifecycle_rules(self):
         See https://cloud.google.com/storage/docs/lifecycle and
              https://cloud.google.com/storage/docs/json_api/v1/buckets
 
+        .. note::
+
+           The getter for this property returns a list which contains
+           *copies* of the bucket's lifecycle rules mappings.  Mutating the
+           list or one of its dicts has no effect unless you then re-assign
+           the dict via the setter.  E.g.:
+
+           >>> rules = bucket.lifecycle_rules
+           >>> rules.append({'origin': '/foo', ...})
+           >>> rules[1]['rule']['action']['type'] = 'Delete'
+           >>> del rules[0]
+           >>> bucket.lifecycle_rules = rules
+
         :setter: Set lifestyle rules for this bucket.
         :getter: Gets the lifestyle rules for this bucket.
 

From 4de2450ee4741e6fae811218ce3f99c3eef85471 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Tue, 1 Aug 2017 13:53:02 -0700
Subject: [PATCH 144/211] Streaming directly into file on storage downloads.
 (#3713)

---
 storage/google/cloud/storage/blob.py |  5 ++---
 storage/setup.py                     |  2 +-
 storage/tests/unit/test_blob.py      | 25 ++++++++++++++++++-------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index 836cfb645f42f..dd76def82ba78 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -414,9 +414,8 @@ def _do_download(self, transport, file_obj, download_url, headers):
         :param headers: Optional headers to be sent with the request(s).
         """
         if self.chunk_size is None:
-            download = Download(download_url, headers=headers)
-            response = download.consume(transport)
-            file_obj.write(response.content)
+            download = Download(download_url, stream=file_obj, headers=headers)
+            download.consume(transport)
         else:
             download = ChunkedDownload(
                 download_url, self.chunk_size, file_obj, headers=headers)
diff --git a/storage/setup.py b/storage/setup.py
index 8d11055fac77c..0cf3de9cab4ac 100644
--- a/storage/setup.py
+++ b/storage/setup.py
@@ -53,7 +53,7 @@
 REQUIREMENTS = [
     'google-cloud-core >= 0.25.0, < 0.26dev',
     'google-auth >= 1.0.0',
-    'google-resumable-media >= 0.2.1',
+    'google-resumable-media >= 0.2.2',
     'requests >= 2.0.0',
 ]
 
diff --git a/storage/tests/unit/test_blob.py b/storage/tests/unit/test_blob.py
index 7cc0dadc26912..e0a41ee793d2b 100644
--- a/storage/tests/unit/test_blob.py
+++ b/storage/tests/unit/test_blob.py
@@ -375,13 +375,20 @@ def test__get_download_url_on_the_fly_with_generation(self):
         self.assertEqual(download_url, expected_url)
 
     @staticmethod
-    def _mock_requests_response(status_code, headers, content=b''):
+    def _mock_requests_response(
+            status_code, headers, content=b'', stream=False):
         import requests
 
         response = requests.Response()
         response.status_code = status_code
         response.headers.update(headers)
-        response._content = content
+        if stream:
+            response.raw = io.BytesIO(content)
+            response._content = False
+        else:
+            response.raw = None
+            response._content = content
+
         response.request = requests.Request(
             'POST', 'http://example.com').prepare()
         return response
@@ -429,7 +436,9 @@ def test__do_download_simple(self):
         transport.request.return_value = self._mock_requests_response(
             http_client.OK,
             {'content-length': '6', 'content-range': 'bytes 0-5/6'},
-            content=b'abcdef')
+            content=b'abcdef',
+            stream=True,
+        )
         file_obj = io.BytesIO()
         download_url = 'http://test.invalid'
         headers = {}
@@ -438,7 +447,7 @@ def test__do_download_simple(self):
         self.assertEqual(file_obj.getvalue(), b'abcdef')
 
         transport.request.assert_called_once_with(
-            'GET', download_url, data=None, headers=headers)
+            'GET', download_url, data=None, headers=headers, stream=True)
 
     def test__do_download_chunked(self):
         blob_name = 'blob-name'
@@ -493,7 +502,7 @@ def test_download_to_file_with_failure(self):
         self.assertEqual(file_obj.tell(), 0)
         # Check that the transport was called once.
         transport.request.assert_called_once_with(
-            'GET', blob.media_link, data=None, headers={})
+            'GET', blob.media_link, data=None, headers={}, stream=True)
 
     def test_download_to_file_wo_media_link(self):
         blob_name = 'blob-name'
@@ -535,7 +544,9 @@ def _download_to_file_helper(self, use_chunks=False):
             single_chunk_response = self._mock_requests_response(
                 http_client.OK,
                 {'content-length': '6', 'content-range': 'bytes 0-5/6'},
-                content=b'abcdef')
+                content=b'abcdef',
+                stream=True,
+            )
             transport.request.side_effect = [single_chunk_response]
 
         file_obj = io.BytesIO()
@@ -546,7 +557,7 @@ def _download_to_file_helper(self, use_chunks=False):
             self._check_session_mocks(client, transport, media_link)
         else:
             transport.request.assert_called_once_with(
-                'GET', media_link, data=None, headers={})
+                'GET', media_link, data=None, headers={}, stream=True)
 
     def test_download_to_file_default(self):
         self._download_to_file_helper()

From d0cfeb772fd612179984a191be1d8189b369a2c5 Mon Sep 17 00:00:00 2001
From: Kenneth MacArthur <kenneth.mac@gmail.com>
Date: Wed, 2 Aug 2017 16:33:36 +0100
Subject: [PATCH 145/211] gcloud auth application-default is out of beta
 (#3716)

---
 docs/core/auth.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/core/auth.rst b/docs/core/auth.rst
index 3c2cc2b0c4ca7..065fa304e2a2b 100644
--- a/docs/core/auth.rst
+++ b/docs/core/auth.rst
@@ -14,7 +14,7 @@ Overview
 
     .. code-block:: bash
 
-        $ gcloud beta auth application-default login
+        $ gcloud auth application-default login
 
     Note that this command generates credentials for client libraries. To authenticate the CLI itself, use:
 

From 3e8d53c02ec658faa0b72667cbd2cff492ee3278 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Wed, 2 Aug 2017 16:20:00 -0400
Subject: [PATCH 146/211] Sprinkle majyk retry fairy dust. (#3720)

Closes #3510
---
 pubsub/tests/system.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pubsub/tests/system.py b/pubsub/tests/system.py
index fd70f44165de7..bbc4b527db8eb 100644
--- a/pubsub/tests/system.py
+++ b/pubsub/tests/system.py
@@ -348,7 +348,8 @@ def test_create_snapshot(self):
 
         # There is no GET method for snapshot, so check existence using
         # list
-        after_snapshots = _consume_snapshots(Config.CLIENT)
+        retry = RetryResult(lambda result: result, max_tries=4)
+        after_snapshots = retry(_consume_snapshots)(Config.CLIENT)
         self.assertEqual(len(before_snapshots) + 1, len(after_snapshots))
 
         def full_name(obj):

From 076ff00c7e3aec8c1edda720a50ccd67d38775c8 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 4 Aug 2017 08:35:49 -0700
Subject: [PATCH 147/211] Do not show Trace documentation. (#3719)

---
 README.rst           | 2 +-
 docs/index.rst       | 1 -
 docs/trace/index.rst | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 008b9cad6454d..65e07164bac5b 100644
--- a/README.rst
+++ b/README.rst
@@ -33,6 +33,7 @@ The following client libraries have **beta** support:
 
 -  `Google BigQuery`_ (`BigQuery README`_)
 -  `Google Cloud Natural Language`_ (`Natural Language README`_)
+-  `Google Cloud Speech`_ (`Speech README`_)
 -  `Google Cloud Video Intelligence`_ (`Video Intelligence README`_)
 -  `Google Cloud Vision`_ (`Vision README`_)
 
@@ -50,7 +51,6 @@ Cloud Platform services:
 -  `Google Cloud Resource Manager`_ (`Resource Manager README`_)
 -  `Google Cloud Runtime Configuration`_ (`Runtime Config README`_)
 -  `Google Cloud Spanner`_ (`Spanner README`_)
--  `Google Cloud Speech`_ (`Speech README`_)
 -  `Stackdriver Error Reporting`_ (`Error Reporting README`_)
 -  `Stackdriver Monitoring`_ (`Monitoring README`_)
 
diff --git a/docs/index.rst b/docs/index.rst
index b9fdb6bc20a2f..ee47a2ac378f7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -17,7 +17,6 @@
   monitoring/usage
   logging/usage
   storage/client
-  trace/index
   translate/usage
   vision/index
 
diff --git a/docs/trace/index.rst b/docs/trace/index.rst
index 08044709bcc66..682e985ac43dd 100644
--- a/docs/trace/index.rst
+++ b/docs/trace/index.rst
@@ -1,5 +1,6 @@
 .. gapic-google-cloud-trace-v1 sphinx documentation master file
 
+:orphan:
 
 GAPIC library for the Stackdriver Trace API
 =============================================================================================================

From 6d7fae96d25a0a468683a5ab25a2f48014a16378 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 4 Aug 2017 09:50:46 -0700
Subject: [PATCH 148/211] Add a function to complain about obselete packages.
 (#3724)

---
 core/google/cloud/obselete.py    | 40 ++++++++++++++++++++++++++++++++
 core/tests/unit/test_obselete.py | 31 +++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 core/google/cloud/obselete.py
 create mode 100644 core/tests/unit/test_obselete.py

diff --git a/core/google/cloud/obselete.py b/core/google/cloud/obselete.py
new file mode 100644
index 0000000000000..9af28cd85d526
--- /dev/null
+++ b/core/google/cloud/obselete.py
@@ -0,0 +1,40 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import warnings
+
+import pkg_resources
+
+
+def complain(distribution_name):
+    """Issue a warning if `distribution_name` is installed.
+
+    In a future release, this method will be updated to raise ImportError
+    rather than just send a warning.
+
+    Args:
+        distribution_name (str): The name of the obselete distribution.
+    """
+    try:
+        pkg_resources.get_distribution(distribution_name)
+        warnings.warn(
+            'The {pkg} distribution is now obselete. '
+            'Please `pip uninstall {pkg}`. '
+            'In the future, this warning will become an ImportError.'.format(
+                pkg=distribution_name,
+            ),
+            DeprecationWarning,
+        )
+    except pkg_resources.DistributionNotFound:
+        pass
diff --git a/core/tests/unit/test_obselete.py b/core/tests/unit/test_obselete.py
new file mode 100644
index 0000000000000..78764c749490f
--- /dev/null
+++ b/core/tests/unit/test_obselete.py
@@ -0,0 +1,31 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import warnings
+
+import mock
+
+from google.cloud import obselete
+
+
+def test_complain_noop():
+    with mock.patch.object(warnings, 'warn', autospec=True) as warn:
+        obselete.complain('bogus_package')
+        assert warn.call_count == 0
+
+
+def test_complain():
+    with mock.patch.object(warnings, 'warn', autospec=True) as warn:
+        obselete.complain('google-cloud-core')
+        warn.assert_called_once_with(mock.ANY, DeprecationWarning)

From 22252895b203e72ad19a362b4181be4297a7d5f4 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Fri, 4 Aug 2017 14:56:10 -0700
Subject: [PATCH 149/211] Cutting release google-cloud-core==0.26.0. (#3727)

---
 core/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/setup.py b/core/setup.py
index 2a221ffe04b9c..52ea0c253d8d0 100644
--- a/core/setup.py
+++ b/core/setup.py
@@ -61,7 +61,7 @@
 
 setup(
     name='google-cloud-core',
-    version='0.25.0',
+    version='0.26.0',
     description='API Client library for Google Cloud: Core Helpers',
     long_description=README,
     namespace_packages=[

From 41f2d8d6859d2b0f998cfa4f01b288402358e4cc Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Fri, 4 Aug 2017 15:20:58 -0700
Subject: [PATCH 150/211] Expanding the allowable descriptions for vision
 system tests. (#3729)

Fixes #3681.

Also updating the `nox` configuration to allow posargs pass
through and be a little more Windows path friendly.
---
 vision/nox.py              | 28 ++++++++++++++++++++++------
 vision/setup.py            |  2 +-
 vision/tests/system_old.py | 18 ++++++++++++------
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/vision/nox.py b/vision/nox.py
index a030b7a9e5bbe..f16771018a476 100644
--- a/vision/nox.py
+++ b/vision/nox.py
@@ -35,10 +35,16 @@ def unit_tests(session, python_version):
     session.install('-e', '.')
 
     # Run py.test against the unit tests.
-    session.run('py.test', '--quiet',
-        '--cov=google.cloud.vision', '--cov=google.cloud.vision_v1',
-        '--cov-append', '--cov-config=.coveragerc', '--cov-report=',
-        'tests/',
+    session.run(
+        'py.test',
+        '--quiet',
+        '--cov=google.cloud.vision',
+        '--cov=google.cloud.vision_v1',
+        '--cov-append',
+        '--cov-config=.coveragerc',
+        '--cov-report=',
+        'tests',
+        *session.posargs
     )
 
 
@@ -63,7 +69,12 @@ def system_tests(session, python_version):
     session.install('-e', '.')
 
     # Run py.test against the unit tests.
-    session.run('py.test', '--quiet', 'tests/system.py')
+    session.run(
+        'py.test',
+        '--quiet',
+        os.path.join('tests', 'system.py'),
+        *session.posargs
+    )
 
 
 @nox.session
@@ -84,7 +95,12 @@ def system_tests_manual_layer(session, python_version):
     session.install('-e', '.')
 
     # Run py.test against the unit tests.
-    session.run('py.test', '--quiet', 'tests/system_old.py')
+    session.run(
+        'py.test',
+        '--quiet',
+        os.path.join('tests', 'system_old.py'),
+        *session.posargs
+    )
 
 
 @nox.session
diff --git a/vision/setup.py b/vision/setup.py
index ad485c0e8642a..4847c0c2c7f5f 100644
--- a/vision/setup.py
+++ b/vision/setup.py
@@ -25,7 +25,7 @@
     readme = readme_file.read()
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
     'google-gax >= 0.15.13, < 0.16dev',
     'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',
 ]
diff --git a/vision/tests/system_old.py b/vision/tests/system_old.py
index cddf399ddf5f0..99893dad2340d 100644
--- a/vision/tests/system_old.py
+++ b/vision/tests/system_old.py
@@ -332,17 +332,23 @@ def test_detect_faces_filename(self):
 
 
 class TestVisionClientLabel(BaseVisionTestCase):
+
     DESCRIPTIONS = (
+        'automobile make',
+        'automotive design',
+        'automotive exterior',
+        'automotive wheel system',
         'car',
-        'vehicle',
         'land vehicle',
-        'automotive design',
-        'wheel',
-        'automobile make',
         'luxury vehicle',
-        'sports car',
+        'motor vehicle',
+        'muscle car',
         'performance car',
-        'automotive exterior',
+        'personal luxury car',
+        'rim',
+        'sports car',
+        'vehicle',
+        'wheel',
     )
 
     def setUp(self):

From a31dd96f37b165df941c6b5a90dd69ab3417edeb Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Fri, 4 Aug 2017 15:26:26 -0700
Subject: [PATCH 151/211] Add missing "packages" to sentence in ``core``
 README. (#3728)

---
 core/README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/README.rst b/core/README.rst
index 53cbd311a50e0..0685a028dbb1f 100644
--- a/core/README.rst
+++ b/core/README.rst
@@ -2,8 +2,8 @@ Core Helpers for Google Cloud Python Client Library
 ===================================================
 
 This library is not meant to stand-alone. Instead it defines
-common helpers (e.g. base ``Client`` and ``Connection`` classes)
-used by all of the ``google-cloud-*``.
+common helpers (e.g. base ``Client`` classes) used by all of the
+``google-cloud-*`` packages.
 
 |pypi| |versions|
 

From e835957bd8e530c31a2f54a7a2e9864d2cf3b2d7 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Fri, 4 Aug 2017 16:45:43 -0700
Subject: [PATCH 152/211] Updating all affected packages after
 google-cloud-core update. (#3730)

* Updating all affected packages after google-cloud-core update.

* Moving 'pip install .' **after** subpackages in nox docs.

@lukesneeringer still hasn't explained why it was moved. In
it's current location, the depencencies are first retrieved
from PyPI (which fails here for the unreleased versions), e.g.

https://circleci.com/gh/GoogleCloudPlatform/google-cloud-python/2716
---
 bigquery/setup.py         |  4 ++--
 bigtable/setup.py         |  4 ++--
 datastore/setup.py        |  4 ++--
 dns/setup.py              |  4 ++--
 error_reporting/setup.py  |  6 +++---
 language/setup.py         |  4 ++--
 logging/setup.py          |  4 ++--
 monitoring/setup.py       |  4 ++--
 nox.py                    |  2 +-
 pubsub/setup.py           |  6 +++---
 resource_manager/setup.py |  4 ++--
 runtimeconfig/setup.py    |  4 ++--
 setup.py                  | 36 ++++++++++++++++++------------------
 spanner/setup.py          |  4 ++--
 speech/setup.py           |  4 ++--
 storage/setup.py          |  4 ++--
 translate/setup.py        |  4 ++--
 vision/setup.py           |  2 +-
 18 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/bigquery/setup.py b/bigquery/setup.py
index eeb2d90549d8b..69fbb9cc5eb6f 100644
--- a/bigquery/setup.py
+++ b/bigquery/setup.py
@@ -51,7 +51,7 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
     'google-auth >= 1.0.0',
     'google-resumable-media >= 0.2.1',
     'requests >= 2.0.0',
@@ -59,7 +59,7 @@
 
 setup(
     name='google-cloud-bigquery',
-    version='0.25.0',
+    version='0.26.0',
     description='Python Client for Google BigQuery',
     long_description=README,
     namespace_packages=[
diff --git a/bigtable/setup.py b/bigtable/setup.py
index 8d5bad6a1ffdd..3b164fe8e12fd 100644
--- a/bigtable/setup.py
+++ b/bigtable/setup.py
@@ -51,13 +51,13 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
     'google-gax>=0.15.7, <0.16dev',
 ]
 
 setup(
     name='google-cloud-bigtable',
-    version='0.25.0',
+    version='0.26.0',
     description='Python Client for Google Cloud Bigtable',
     long_description=README,
     namespace_packages=[
diff --git a/datastore/setup.py b/datastore/setup.py
index 692dd109a4810..675e58bcc22d2 100644
--- a/datastore/setup.py
+++ b/datastore/setup.py
@@ -51,14 +51,14 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
     'google-gax>=0.15.7, <0.16dev',
     'gapic-google-cloud-datastore-v1 >= 0.15.0, < 0.16dev',
 ]
 
 setup(
     name='google-cloud-datastore',
-    version='1.1.0',
+    version='1.2.0',
     description='Python Client for Google Cloud Datastore',
     long_description=README,
     namespace_packages=[
diff --git a/dns/setup.py b/dns/setup.py
index 62af1fe9ddc53..362af54476840 100644
--- a/dns/setup.py
+++ b/dns/setup.py
@@ -51,12 +51,12 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
 ]
 
 setup(
     name='google-cloud-dns',
-    version='0.25.0',
+    version='0.26.0',
     description='Python Client for Google Cloud DNS',
     long_description=README,
     namespace_packages=[
diff --git a/error_reporting/setup.py b/error_reporting/setup.py
index 807af3b97907e..67714ee92e1da 100644
--- a/error_reporting/setup.py
+++ b/error_reporting/setup.py
@@ -51,14 +51,14 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
-    'google-cloud-logging >= 1.1.0, < 1.2dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
+    'google-cloud-logging >= 1.2.0, < 1.3dev',
     'gapic-google-cloud-error-reporting-v1beta1 >= 0.15.0, < 0.16dev'
 ]
 
 setup(
     name='google-cloud-error-reporting',
-    version='0.25.1',
+    version='0.26.0',
     description='Python Client for Stackdriver Error Reporting',
     long_description=README,
     namespace_packages=[
diff --git a/language/setup.py b/language/setup.py
index ed57aeff87551..0b7152fd89fd9 100644
--- a/language/setup.py
+++ b/language/setup.py
@@ -51,7 +51,7 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
     'google-gax >= 0.15.13, < 0.16dev',
     'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',
 ]
@@ -61,7 +61,7 @@
 
 setup(
     name='google-cloud-language',
-    version='0.26.1',
+    version='0.27.0',
     description='Python Client for Google Cloud Natural Language',
     long_description=README,
     namespace_packages=[
diff --git a/logging/setup.py b/logging/setup.py
index 82dc4f1fcf8a9..37350d8b95380 100644
--- a/logging/setup.py
+++ b/logging/setup.py
@@ -51,14 +51,14 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
     'grpcio >= 1.2.0, < 2.0dev',
     'gapic-google-cloud-logging-v2 >= 0.91.0, < 0.92dev',
 ]
 
 setup(
     name='google-cloud-logging',
-    version='1.1.0',
+    version='1.2.0',
     description='Python Client for Stackdriver Logging',
     long_description=README,
     namespace_packages=[
diff --git a/monitoring/setup.py b/monitoring/setup.py
index bfb8ca155d825..8d48f11b92da9 100644
--- a/monitoring/setup.py
+++ b/monitoring/setup.py
@@ -51,12 +51,12 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
 ]
 
 setup(
     name='google-cloud-monitoring',
-    version='0.25.0',
+    version='0.26.0',
     description='Python Client for Stackdriver Monitoring',
     long_description=README,
     namespace_packages=[
diff --git a/nox.py b/nox.py
index bf4a5d57d6c11..664ab65992ac0 100644
--- a/nox.py
+++ b/nox.py
@@ -30,13 +30,13 @@ def docs(session):
     # Install Sphinx and also all of the google-cloud-* packages.
     session.chdir(os.path.realpath(os.path.dirname(__file__)))
     session.install('Sphinx >= 1.6.2', 'sphinx_rtd_theme')
-    session.install('.')
     session.install(
         'core/', 'bigquery/', 'bigtable/', 'datastore/', 'dns/', 'language/',
         'logging/', 'error_reporting/', 'monitoring/', 'pubsub/',
         'resource_manager/', 'runtimeconfig/', 'spanner/', 'speech/',
         'storage/', 'trace/', 'translate/', 'vision/',
     )
+    session.install('.')
 
     # Build the docs!
     session.run('bash', './test_utils/scripts/update_docs.sh')
diff --git a/pubsub/setup.py b/pubsub/setup.py
index 856a59824a605..71fee1dd7b8fb 100644
--- a/pubsub/setup.py
+++ b/pubsub/setup.py
@@ -51,14 +51,14 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
-    'grpcio >= 1.0.2, < 2.0dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
+    'grpcio >= 1.2.0, < 2.0dev',
     'gapic-google-cloud-pubsub-v1 >= 0.15.0, < 0.16dev',
 ]
 
 setup(
     name='google-cloud-pubsub',
-    version='0.26.0',
+    version='0.27.0',
     description='Python Client for Google Cloud Pub/Sub',
     long_description=README,
     namespace_packages=[
diff --git a/resource_manager/setup.py b/resource_manager/setup.py
index dd295b2973a54..3c224b3bd972f 100644
--- a/resource_manager/setup.py
+++ b/resource_manager/setup.py
@@ -51,12 +51,12 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
 ]
 
 setup(
     name='google-cloud-resource-manager',
-    version='0.25.0',
+    version='0.26.0',
     description='Python Client for Google Cloud Resource Manager',
     long_description=README,
     namespace_packages=[
diff --git a/runtimeconfig/setup.py b/runtimeconfig/setup.py
index f874d07f29bcf..6f94cdb93eaf3 100644
--- a/runtimeconfig/setup.py
+++ b/runtimeconfig/setup.py
@@ -51,12 +51,12 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
 ]
 
 setup(
     name='google-cloud-runtimeconfig',
-    version='0.25.0',
+    version='0.26.0',
     description='Python Client for Google Cloud RuntimeConfig',
     long_description=README,
     namespace_packages=[
diff --git a/setup.py b/setup.py
index ca6491ec530e4..9bc227dad8836 100644
--- a/setup.py
+++ b/setup.py
@@ -50,29 +50,29 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-bigquery >= 0.25.0, < 0.26dev',
-    'google-cloud-bigtable >= 0.25.0, < 0.26dev',
-    'google-cloud-core >= 0.25.0, < 0.26dev',
-    'google-cloud-datastore >= 1.1.0, < 1.2dev',
-    'google-cloud-dns >= 0.25.0, < 0.26dev',
-    'google-cloud-error-reporting >= 0.25.1, < 0.26dev',
-    'google-cloud-language >= 0.25.0, < 0.26dev',
-    'google-cloud-logging >= 1.1.0, < 1.2dev',
-    'google-cloud-monitoring >= 0.25.0, < 0.26dev',
-    'google-cloud-pubsub >= 0.26.0, < 0.27dev',
-    'google-cloud-resource-manager >= 0.25.0, < 0.26dev',
-    'google-cloud-runtimeconfig >= 0.25.0, < 0.26dev',
-    'google-cloud-spanner >= 0.25.0, < 0.26dev',
-    'google-cloud-speech >= 0.27.0, < 0.28dev',
-    'google-cloud-storage >= 1.2.0, < 1.3dev',
-    'google-cloud-translate >= 0.25.0, < 0.26dev',
+    'google-cloud-bigquery >= 0.26.0, < 0.27dev',
+    'google-cloud-bigtable >= 0.26.0, < 0.27dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
+    'google-cloud-datastore >= 1.2.0, < 1.3dev',
+    'google-cloud-dns >= 0.26.0, < 0.27dev',
+    'google-cloud-error-reporting >= 0.26.0, < 0.27dev',
+    'google-cloud-language >= 0.27.0, < 0.28dev',
+    'google-cloud-logging >= 1.2.0, < 1.3dev',
+    'google-cloud-monitoring >= 0.26.0, < 0.27dev',
+    'google-cloud-pubsub >= 0.27.0, < 0.28dev',
+    'google-cloud-resource-manager >= 0.26.0, < 0.27dev',
+    'google-cloud-runtimeconfig >= 0.26.0, < 0.27dev',
+    'google-cloud-spanner >= 0.26.0, < 0.27dev',
+    'google-cloud-speech >= 0.28.0, < 0.29dev',
+    'google-cloud-storage >= 1.3.0, < 1.4dev',
+    'google-cloud-translate >= 1.1.0, < 1.2dev',
     'google-cloud-videointelligence >= 0.25.0, < 0.26dev',
-    'google-cloud-vision >= 0.25.0, < 0.26dev',
+    'google-cloud-vision >= 0.26.0, < 0.27dev',
 ]
 
 setup(
     name='google-cloud',
-    version='0.26.2',
+    version='0.27.0',
     description='API Client library for Google Cloud',
     long_description=README,
     install_requires=REQUIREMENTS,
diff --git a/spanner/setup.py b/spanner/setup.py
index 0808c1309b6ad..616d543916278 100644
--- a/spanner/setup.py
+++ b/spanner/setup.py
@@ -51,7 +51,7 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
     'grpcio >= 1.2.0, < 2.0dev',
     'gapic-google-cloud-spanner-v1 >= 0.15.0, < 0.16dev',
     'gapic-google-cloud-spanner-admin-database-v1 >= 0.15.0, < 0.16dev',
@@ -60,7 +60,7 @@
 
 setup(
     name='google-cloud-spanner',
-    version='0.25.0',
+    version='0.26.0',
     description='Python Client for Cloud Spanner',
     long_description=README,
     namespace_packages=[
diff --git a/speech/setup.py b/speech/setup.py
index 0be72b13f14a8..6587ceec47790 100644
--- a/speech/setup.py
+++ b/speech/setup.py
@@ -52,14 +52,14 @@
 }
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
     'google-gax >= 0.15.13, < 0.16dev',
     'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',
 ]
 
 setup(
     name='google-cloud-speech',
-    version='0.27.1',
+    version='0.28.0',
     description='Python Client for Google Cloud Speech',
     long_description=README,
     namespace_packages=[
diff --git a/storage/setup.py b/storage/setup.py
index 0cf3de9cab4ac..d1364f691b05f 100644
--- a/storage/setup.py
+++ b/storage/setup.py
@@ -51,7 +51,7 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
     'google-auth >= 1.0.0',
     'google-resumable-media >= 0.2.2',
     'requests >= 2.0.0',
@@ -59,7 +59,7 @@
 
 setup(
     name='google-cloud-storage',
-    version='1.2.0',
+    version='1.3.0',
     description='Python Client for Google Cloud Storage',
     long_description=README,
     namespace_packages=[
diff --git a/translate/setup.py b/translate/setup.py
index 12934c6b4e964..7dbd712d7733d 100644
--- a/translate/setup.py
+++ b/translate/setup.py
@@ -51,12 +51,12 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.25.0, < 0.26dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
 ]
 
 setup(
     name='google-cloud-translate',
-    version='1.0.0',
+    version='1.1.0',
     description='Python Client for Google Cloud Translation API',
     long_description=README,
     namespace_packages=[
diff --git a/vision/setup.py b/vision/setup.py
index 4847c0c2c7f5f..7567a30d0e53d 100644
--- a/vision/setup.py
+++ b/vision/setup.py
@@ -37,7 +37,7 @@
     author='Google Cloud Platform',
     author_email='googleapis-publisher@google.com',
     name='google-cloud-vision',
-    version='0.25.1',
+    version='0.26.0',
     description='Python Client for Google Cloud Vision',
     long_description=readme,
     namespace_packages=[

From 3012b5ef45d41cff8476a4dcc397a3012b3e240d Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Fri, 4 Aug 2017 17:16:16 -0700
Subject: [PATCH 153/211] Using HTTPS wikipedia links in language system tests.
 (#3732)

Fixes #3731.

Also relaxing the sentiment score expected range for
"Jogging is fun" (the same backend update that changed HTTP to
HTTPS changed the score from 0.5 to 0.7).

Also updating the language usage doc with the correct (and HTTPS)
URLs for the 3 examples.
---
 docs/language/usage.rst  | 6 +++---
 language/tests/system.py | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/language/usage.rst b/docs/language/usage.rst
index 31d4bb20b95ca..e49bf49675c7d 100644
--- a/docs/language/usage.rst
+++ b/docs/language/usage.rst
@@ -144,17 +144,17 @@ returns a :class:`~.language_v1.types.AnalyzeEntitiesResponse`.
      ====================
               name: Michelangelo Caravaggio
               type: PERSON
-          metadata: {'wikipedia_url': 'http://en.wikipedia.org/wiki/Caravaggio'}
+          metadata: {'wikipedia_url': 'https://en.wikipedia.org/wiki/Caravaggio'}
           salience: 0.7615959
      ====================
               name: Italian
               type: LOCATION
-          metadata: {'wikipedia_url': 'http://en.wikipedia.org/wiki/Caravaggio'}
+          metadata: {'wikipedia_url': 'https://en.wikipedia.org/wiki/Italy'}
           salience: 0.19960518
      ====================
               name: The Calling of Saint Matthew
               type: EVENT
-          metadata: {'wikipedia_url': 'http://en.wikipedia.org/wiki/Caravaggio'}
+          metadata: {'wikipedia_url': 'https://en.wikipedia.org/wiki/The_Calling_of_St_Matthew_(Caravaggio)'}
           salience: 0.038798928
 
 .. note::
diff --git a/language/tests/system.py b/language/tests/system.py
index a3c98803c137a..0d1321aff2686 100644
--- a/language/tests/system.py
+++ b/language/tests/system.py
@@ -77,7 +77,7 @@ def _check_analyze_entities_result(self, entities):
         # Other mentions may occur, e.g. "painter".
         self.assertIn(entity1.name, [str(i) for i in entity1.mentions])
         self.assertEqual(entity1.metadata['wikipedia_url'],
-                         'http://en.wikipedia.org/wiki/Caravaggio')
+                         'https://en.wikipedia.org/wiki/Caravaggio')
         self.assertIsInstance(entity1.metadata, dict)
         # Verify entity 2.
         self.assertEqual(entity2.name, self.NAME2)
@@ -85,7 +85,7 @@ def _check_analyze_entities_result(self, entities):
         self.assertGreater(entity2.salience, 0.0)
         self.assertEqual([str(i) for i in entity2.mentions], [entity2.name])
         self.assertEqual(entity2.metadata['wikipedia_url'],
-                         'http://en.wikipedia.org/wiki/Italy')
+                         'https://en.wikipedia.org/wiki/Italy')
         self.assertIsInstance(entity2.metadata, dict)
         # Verify entity 3.
         self.assertEqual(entity3.name, self.NAME3)
@@ -93,7 +93,7 @@ def _check_analyze_entities_result(self, entities):
         self.assertIn(entity3.entity_type, choices)
         self.assertGreater(entity3.salience, 0.0)
         self.assertEqual([str(i) for i in entity3.mentions], [entity3.name])
-        wiki_url = ('http://en.wikipedia.org/wiki/'
+        wiki_url = ('https://en.wikipedia.org/wiki/'
                     'The_Calling_of_St_Matthew_(Caravaggio)')
         self.assertEqual(entity3.metadata['wikipedia_url'], wiki_url)
         self.assertIsInstance(entity3.metadata, dict)
@@ -122,7 +122,7 @@ def test_analyze_sentiment(self):
         positive_msg = 'Jogging is fun'
         document = Config.CLIENT.document_from_text(positive_msg)
         sentiment = document.analyze_sentiment().sentiment
-        self.assertEqual(sentiment.score, 0.5)
+        self.assertTrue(0.0 < sentiment.score < 1.0)
         self.assertTrue(0.0 < sentiment.magnitude < 1.5)
 
     def _verify_token(self, token, text_content, part_of_speech, lemma):

From 289a9617d7f583305b094729c9a93b1d7d4a39cf Mon Sep 17 00:00:00 2001
From: Bryan Yang <kenshin2004528@hotmail.com>
Date: Mon, 7 Aug 2017 09:01:49 -0500
Subject: [PATCH 154/211] fixed typo DETECTION (#3734)

---
 docs/vision/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/vision/index.rst b/docs/vision/index.rst
index c69240f792bde..96ca97ec7f975 100644
--- a/docs/vision/index.rst
+++ b/docs/vision/index.rst
@@ -62,7 +62,7 @@ You can call the :meth:`annotate_image` method directly:
     >>> client = vision.ImageAnnotatorClient()
     >>> response = client.annotate_image({
     ...   'image': {'source': {'image_uri': 'gs://my-test-bucket/image.jpg'}},
-    ...   'features': [{'type': vision.enums.Feature.Type.FACE_DETECTOIN}],
+    ...   'features': [{'type': vision.enums.Feature.Type.FACE_DETECTION}],
     ... })
     >>> len(response.annotations)
     2

From da8a9606fde1559c7add7a8b5200dbca74551675 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Mon, 7 Aug 2017 09:05:32 -0700
Subject: [PATCH 155/211] Add google.api.core package (#3726)

---
 core/google/api/__init__.py      | 22 ++++++++++++++++++++++
 core/google/api/core/__init__.py | 18 ++++++++++++++++++
 core/setup.py                    |  1 +
 3 files changed, 41 insertions(+)
 create mode 100644 core/google/api/__init__.py
 create mode 100644 core/google/api/core/__init__.py

diff --git a/core/google/api/__init__.py b/core/google/api/__init__.py
new file mode 100644
index 0000000000000..2648890d2599b
--- /dev/null
+++ b/core/google/api/__init__.py
@@ -0,0 +1,22 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Google API namespace package."""
+
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    import pkgutil
+    __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/core/google/api/core/__init__.py b/core/google/api/core/__init__.py
new file mode 100644
index 0000000000000..123d3e291c704
--- /dev/null
+++ b/core/google/api/core/__init__.py
@@ -0,0 +1,18 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Google API Core.
+
+This package contains common code and utilties used by Google client libraries.
+"""
diff --git a/core/setup.py b/core/setup.py
index 52ea0c253d8d0..5cc4a9c8141b3 100644
--- a/core/setup.py
+++ b/core/setup.py
@@ -67,6 +67,7 @@
     namespace_packages=[
         'google',
         'google.cloud',
+        'google.api',
     ],
     packages=find_packages(exclude=('tests*',)),
     install_requires=REQUIREMENTS,

From ac1b23b23ad0b9a31a0076b9cbba8815a02e0ab4 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 7 Aug 2017 12:11:37 -0400
Subject: [PATCH 156/211] Add 'update' API wrapper for buckets/blobs (#3714,
 #3715)

Turns out some properties (i.e., 'labels', see #3711) behave differently under 'patch semantics'[1], which makes 'update' useful.

[1] https://cloud.google.com/storage/docs/json_api/v1/how-tos/performance#patch

Closes #7311
---
 storage/google/cloud/storage/_helpers.py | 16 ++++++++++++++++
 storage/google/cloud/storage/bucket.py   |  3 +++
 storage/tests/system.py                  | 20 ++++++++++++++++++++
 storage/tests/unit/test__helpers.py      | 20 ++++++++++++++++++++
 4 files changed, 59 insertions(+)

diff --git a/storage/google/cloud/storage/_helpers.py b/storage/google/cloud/storage/_helpers.py
index 88f9b8dc0ca7e..56a75c684f4c5 100644
--- a/storage/google/cloud/storage/_helpers.py
+++ b/storage/google/cloud/storage/_helpers.py
@@ -147,6 +147,22 @@ def patch(self, client=None):
             query_params={'projection': 'full'}, _target_object=self)
         self._set_properties(api_response)
 
+    def update(self, client=None):
+        """Sends all properties in a PUT request.
+
+        Updates the ``_properties`` with the response from the backend.
+
+        :type client: :class:`~google.cloud.storage.client.Client` or
+                      ``NoneType``
+        :param client: the client to use.  If not passed, falls back to the
+                       ``client`` stored on the current object.
+        """
+        client = self._require_client(client)
+        api_response = client._connection.api_request(
+            method='PUT', path=self.path, data=self._properties,
+            query_params={'projection': 'full'}, _target_object=self)
+        self._set_properties(api_response)
+
 
 def _scalar_property(fieldname):
     """Create a property descriptor around the :class:`_PropertyMixin` helpers.
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index f9ff7219f4b81..06550b09ffcbf 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -556,6 +556,7 @@ def cors(self):
            >>> policies[1]['maxAgeSeconds'] = 3600
            >>> del policies[0]
            >>> bucket.cors = policies
+           >>> bucket.update()
 
         :setter: Set CORS policies for this bucket.
         :getter: Gets the CORS policies for this bucket.
@@ -595,6 +596,7 @@ def labels(self):
            >>> labels['new_key'] = 'some-label'
            >>> del labels['old_key']
            >>> bucket.labels = labels
+           >>> bucket.update()
 
         :setter: Set labels for this bucket.
         :getter: Gets the labels for this bucket.
@@ -663,6 +665,7 @@ def lifecycle_rules(self):
            >>> rules[1]['rule']['action']['type'] = 'Delete'
            >>> del rules[0]
            >>> bucket.lifecycle_rules = rules
+           >>> bucket.update()
 
         :setter: Set lifestyle rules for this bucket.
         :getter: Gets the lifestyle rules for this bucket.
diff --git a/storage/tests/system.py b/storage/tests/system.py
index a89c45edbf256..bc8169c356b38 100644
--- a/storage/tests/system.py
+++ b/storage/tests/system.py
@@ -114,6 +114,26 @@ def test_list_buckets(self):
                            if bucket.name in buckets_to_create]
         self.assertEqual(len(created_buckets), len(buckets_to_create))
 
+    def test_bucket_update_labels(self):
+        bucket_name = 'update-labels' + unique_resource_id('-')
+        bucket = retry_429(Config.CLIENT.create_bucket)(bucket_name)
+        self.case_buckets_to_delete.append(bucket_name)
+        self.assertTrue(bucket.exists())
+
+        updated_labels = {'test-label': 'label-value'}
+        bucket.labels = updated_labels
+        bucket.update()
+        self.assertEqual(bucket.labels, updated_labels)
+
+        new_labels = {'another-label': 'another-value'}
+        bucket.labels = new_labels
+        bucket.update()
+        self.assertEqual(bucket.labels, new_labels)
+
+        bucket.labels = {}
+        bucket.update()
+        self.assertEqual(bucket.labels, {})
+
 
 class TestStorageFiles(unittest.TestCase):
 
diff --git a/storage/tests/unit/test__helpers.py b/storage/tests/unit/test__helpers.py
index 89967f3a0db09..90def48672681 100644
--- a/storage/tests/unit/test__helpers.py
+++ b/storage/tests/unit/test__helpers.py
@@ -95,6 +95,26 @@ def test_patch(self):
         # Make sure changes get reset by patch().
         self.assertEqual(derived._changes, set())
 
+    def test_update(self):
+        connection = _Connection({'foo': 'Foo'})
+        client = _Client(connection)
+        derived = self._derivedClass('/path')()
+        # Make sure changes is non-empty, so we can observe a change.
+        BAR = object()
+        BAZ = object()
+        derived._properties = {'bar': BAR, 'baz': BAZ}
+        derived._changes = set(['bar'])  # Update sends 'baz' anyway.
+        derived.update(client=client)
+        self.assertEqual(derived._properties, {'foo': 'Foo'})
+        kw = connection._requested
+        self.assertEqual(len(kw), 1)
+        self.assertEqual(kw[0]['method'], 'PUT')
+        self.assertEqual(kw[0]['path'], '/path')
+        self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
+        self.assertEqual(kw[0]['data'], {'bar': BAR, 'baz': BAZ})
+        # Make sure changes get reset by patch().
+        self.assertEqual(derived._changes, set())
+
 
 class Test__scalar_property(unittest.TestCase):
 

From b09eda9e70eb4c731be17d5c6f4cb01943b12709 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Mon, 7 Aug 2017 09:16:23 -0700
Subject: [PATCH 157/211] BigQuery: Remove client-side enum validation. (#3735)

---
 bigquery/google/cloud/bigquery/_helpers.py | 10 ----------
 bigquery/google/cloud/bigquery/job.py      |  7 -------
 bigquery/tests/unit/test__helpers.py       |  5 +----
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/_helpers.py b/bigquery/google/cloud/bigquery/_helpers.py
index 6641fbe01b422..4da9be9f07233 100644
--- a/bigquery/google/cloud/bigquery/_helpers.py
+++ b/bigquery/google/cloud/bigquery/_helpers.py
@@ -306,19 +306,9 @@ def _validate(self, value):
 class _EnumProperty(_ConfigurationProperty):
     """Pseudo-enumeration class.
 
-    Subclasses must define ``ALLOWED`` as a class-level constant:  it must
-    be a sequence of strings.
-
     :type name: str
     :param name:  name of the property.
     """
-    def _validate(self, value):
-        """Check that ``value`` is one of the allowed values.
-
-        :raises: ValueError if value is not allowed.
-        """
-        if value not in self.ALLOWED:
-            raise ValueError('Pass one of: %s' % ', '.join(self.ALLOWED))
 
 
 class UDFResource(object):
diff --git a/bigquery/google/cloud/bigquery/job.py b/bigquery/google/cloud/bigquery/job.py
index 953a2c2655802..1519e2a0cf6e8 100644
--- a/bigquery/google/cloud/bigquery/job.py
+++ b/bigquery/google/cloud/bigquery/job.py
@@ -98,14 +98,12 @@ class Compression(_EnumProperty):
     """Pseudo-enum for ``compression`` properties."""
     GZIP = 'GZIP'
     NONE = 'NONE'
-    ALLOWED = (GZIP, NONE)
 
 
 class CreateDisposition(_EnumProperty):
     """Pseudo-enum for ``create_disposition`` properties."""
     CREATE_IF_NEEDED = 'CREATE_IF_NEEDED'
     CREATE_NEVER = 'CREATE_NEVER'
-    ALLOWED = (CREATE_IF_NEEDED, CREATE_NEVER)
 
 
 class DestinationFormat(_EnumProperty):
@@ -113,21 +111,18 @@ class DestinationFormat(_EnumProperty):
     CSV = 'CSV'
     NEWLINE_DELIMITED_JSON = 'NEWLINE_DELIMITED_JSON'
     AVRO = 'AVRO'
-    ALLOWED = (CSV, NEWLINE_DELIMITED_JSON, AVRO)
 
 
 class Encoding(_EnumProperty):
     """Pseudo-enum for ``encoding`` properties."""
     UTF_8 = 'UTF-8'
     ISO_8559_1 = 'ISO-8559-1'
-    ALLOWED = (UTF_8, ISO_8559_1)
 
 
 class QueryPriority(_EnumProperty):
     """Pseudo-enum for ``QueryJob.priority`` property."""
     INTERACTIVE = 'INTERACTIVE'
     BATCH = 'BATCH'
-    ALLOWED = (INTERACTIVE, BATCH)
 
 
 class SourceFormat(_EnumProperty):
@@ -136,7 +131,6 @@ class SourceFormat(_EnumProperty):
     DATASTORE_BACKUP = 'DATASTORE_BACKUP'
     NEWLINE_DELIMITED_JSON = 'NEWLINE_DELIMITED_JSON'
     AVRO = 'AVRO'
-    ALLOWED = (CSV, DATASTORE_BACKUP, NEWLINE_DELIMITED_JSON, AVRO)
 
 
 class WriteDisposition(_EnumProperty):
@@ -144,7 +138,6 @@ class WriteDisposition(_EnumProperty):
     WRITE_APPEND = 'WRITE_APPEND'
     WRITE_TRUNCATE = 'WRITE_TRUNCATE'
     WRITE_EMPTY = 'WRITE_EMPTY'
-    ALLOWED = (WRITE_APPEND, WRITE_TRUNCATE, WRITE_EMPTY)
 
 
 class _AsyncJob(google.cloud.future.polling.PollingFuture):
diff --git a/bigquery/tests/unit/test__helpers.py b/bigquery/tests/unit/test__helpers.py
index a2b561e36e88b..7648ed5bee18b 100644
--- a/bigquery/tests/unit/test__helpers.py
+++ b/bigquery/tests/unit/test__helpers.py
@@ -765,7 +765,7 @@ def _get_target_class():
     def test_it(self):
 
         class Sub(self._get_target_class()):
-            ALLOWED = ('FOO', 'BAR', 'BAZ')
+            pass
 
         class Configuration(object):
             _attr = None
@@ -777,9 +777,6 @@ def __init__(self):
                 self._configuration = Configuration()
 
         wrapper = Wrapper()
-        with self.assertRaises(ValueError):
-            wrapper.attr = 'BOGUS'
-
         wrapper.attr = 'FOO'
         self.assertEqual(wrapper.attr, 'FOO')
         self.assertEqual(wrapper._configuration._attr, 'FOO')

From f034c6121dabfb20cb1cf6b6ae6985b236bfef11 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Mon, 7 Aug 2017 11:03:18 -0700
Subject: [PATCH 158/211] Update storage to 1.3.1. (#3741)

Did this to update the google-resumable-media dependency to
allow for empty files.
---
 storage/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/storage/setup.py b/storage/setup.py
index d1364f691b05f..9365b0175087b 100644
--- a/storage/setup.py
+++ b/storage/setup.py
@@ -53,13 +53,13 @@
 REQUIREMENTS = [
     'google-cloud-core >= 0.26.0, < 0.27dev',
     'google-auth >= 1.0.0',
-    'google-resumable-media >= 0.2.2',
+    'google-resumable-media >= 0.2.3',
     'requests >= 2.0.0',
 ]
 
 setup(
     name='google-cloud-storage',
-    version='1.3.0',
+    version='1.3.1',
     description='Python Client for Google Cloud Storage',
     long_description=README,
     namespace_packages=[

From c2104945248e4d46281f77326509ab9e347e3569 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Mon, 7 Aug 2017 13:31:10 -0700
Subject: [PATCH 159/211] Allow Table.read_rows to take an inclusive end key.
 (#3744)

This commit adds the `end_inclusive` keyword argument, which can be explicitly passed to get `[start:end]` rather than `[start:end)`.
---
 bigtable/google/cloud/bigtable/table.py | 19 +++++++++++++++----
 bigtable/tests/unit/test_table.py       | 16 ++++++++++++++--
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/bigtable/google/cloud/bigtable/table.py b/bigtable/google/cloud/bigtable/table.py
index 40ef3a2ca2fb9..64fbcc93771ed 100644
--- a/bigtable/google/cloud/bigtable/table.py
+++ b/bigtable/google/cloud/bigtable/table.py
@@ -257,7 +257,7 @@ def read_row(self, row_key, filter_=None):
         return rows_data.rows[row_key]
 
     def read_rows(self, start_key=None, end_key=None, limit=None,
-                  filter_=None):
+                  filter_=None, end_inclusive=False):
         """Read rows from this table.
 
         :type start_key: bytes
@@ -280,13 +280,17 @@ def read_rows(self, start_key=None, end_key=None, limit=None,
                         specified row(s). If unset, reads every column in
                         each row.
 
+        :type end_inclusive: bool
+        :param end_inclusive: (Optional) Whether the ``end_key`` should be
+                      considered inclusive. The default is False (exclusive).
+
         :rtype: :class:`.PartialRowsData`
         :returns: A :class:`.PartialRowsData` convenience wrapper for consuming
                   the streamed results.
         """
         request_pb = _create_row_request(
             self.name, start_key=start_key, end_key=end_key, filter_=filter_,
-            limit=limit)
+            limit=limit, end_inclusive=end_inclusive)
         client = self._instance._client
         response_iterator = client._data_stub.ReadRows(request_pb)
         # We expect an iterator of `data_messages_v2_pb2.ReadRowsResponse`
@@ -360,7 +364,7 @@ def sample_row_keys(self):
 
 
 def _create_row_request(table_name, row_key=None, start_key=None, end_key=None,
-                        filter_=None, limit=None):
+                        filter_=None, limit=None, end_inclusive=False):
     """Creates a request to read rows in a table.
 
     :type table_name: str
@@ -388,6 +392,10 @@ def _create_row_request(table_name, row_key=None, start_key=None, end_key=None,
                   rows' worth of results. The default (zero) is to return
                   all results.
 
+    :type end_inclusive: bool
+    :param end_inclusive: (Optional) Whether the ``end_key`` should be
+                  considered inclusive. The default is False (exclusive).
+
     :rtype: :class:`data_messages_v2_pb2.ReadRowsRequest`
     :returns: The ``ReadRowsRequest`` protobuf corresponding to the inputs.
     :raises: :class:`ValueError <exceptions.ValueError>` if both
@@ -403,7 +411,10 @@ def _create_row_request(table_name, row_key=None, start_key=None, end_key=None,
         if start_key is not None:
             range_kwargs['start_key_closed'] = _to_bytes(start_key)
         if end_key is not None:
-            range_kwargs['end_key_open'] = _to_bytes(end_key)
+            end_key_key = 'end_key_open'
+            if end_inclusive:
+                end_key_key = 'end_key_closed'
+            range_kwargs[end_key_key] = _to_bytes(end_key)
     if filter_ is not None:
         request_kwargs['filter'] = filter_.to_pb()
     if limit is not None:
diff --git a/bigtable/tests/unit/test_table.py b/bigtable/tests/unit/test_table.py
index dc4d2b5bbad08..3890d097f572f 100644
--- a/bigtable/tests/unit/test_table.py
+++ b/bigtable/tests/unit/test_table.py
@@ -537,6 +537,7 @@ def mock_create_row_request(table_name, **kwargs):
             'end_key': end_key,
             'filter_': filter_obj,
             'limit': limit,
+            'end_inclusive': False,
         }
         self.assertEqual(mock_created, [(table.name, created_kwargs)])
 
@@ -572,12 +573,12 @@ def test_sample_row_keys(self):
 class Test__create_row_request(unittest.TestCase):
 
     def _call_fut(self, table_name, row_key=None, start_key=None, end_key=None,
-                  filter_=None, limit=None):
+                  filter_=None, limit=None, end_inclusive=False):
         from google.cloud.bigtable.table import _create_row_request
 
         return _create_row_request(
             table_name, row_key=row_key, start_key=start_key, end_key=end_key,
-            filter_=filter_, limit=limit)
+            filter_=filter_, limit=limit, end_inclusive=end_inclusive)
 
     def test_table_name_only(self):
         table_name = 'table_name'
@@ -627,6 +628,17 @@ def test_row_range_both_keys(self):
             start_key_closed=start_key, end_key_open=end_key)
         self.assertEqual(result, expected_result)
 
+    def test_row_range_both_keys_inclusive(self):
+        table_name = 'table_name'
+        start_key = b'start_key'
+        end_key = b'end_key'
+        result = self._call_fut(table_name, start_key=start_key,
+                                end_key=end_key, end_inclusive=True)
+        expected_result = _ReadRowsRequestPB(table_name=table_name)
+        expected_result.rows.row_ranges.add(
+            start_key_closed=start_key, end_key_closed=end_key)
+        self.assertEqual(result, expected_result)
+
     def test_with_filter(self):
         from google.cloud.bigtable.row_filters import RowSampleFilter
 

From 4bbdc6f452f16b748e487d4f8111ce2837cefccc Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Mon, 7 Aug 2017 14:41:06 -0700
Subject: [PATCH 160/211] Explicitly depend on setuptools >= 34 (#3745)

---
 core/setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/setup.py b/core/setup.py
index 5cc4a9c8141b3..f697e385494bd 100644
--- a/core/setup.py
+++ b/core/setup.py
@@ -55,6 +55,7 @@
     'protobuf >= 3.0.0',
     'google-auth >= 0.4.0, < 2.0.0dev',
     'requests >= 2.4.0, < 3.0.0dev',
+    'setuptools >= 34.0.0',
     'six',
     'tenacity >= 4.0.0, <5.0.0dev'
 ]

From 1656ffce2dce8c241defd342233639c195b522cd Mon Sep 17 00:00:00 2001
From: Magnus Wahlberg <endast@gmail.com>
Date: Mon, 7 Aug 2017 23:47:14 +0200
Subject: [PATCH 161/211] Update broken links to video intelligence docs in
 package README (#3458)

---
 videointelligence/README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/videointelligence/README.rst b/videointelligence/README.rst
index fff70efacf7b4..850521994146b 100644
--- a/videointelligence/README.rst
+++ b/videointelligence/README.rst
@@ -33,8 +33,8 @@ API enables developers to
 understand the content of a video by encapsulating powerful machine
 learning models in an easy to use REST API.
 
-.. _Video Intelligence: https://cloud.google.com/videointelligence/
-.. _Video Intelligence API docs: https://cloud.google.com/videointelligence/reference/rest/
+.. _Video Intelligence: https://cloud.google.com/video-intelligence/
+.. _Video Intelligence API docs: https://cloud.google.com/video-intelligence/docs/reference/rest/
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-videointelligence.svg
    :target: https://pypi.org/project/google-cloud-videointelligence/

From 10466d10406533af84ab121f10d37d93ff8a68a5 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Mon, 7 Aug 2017 14:49:41 -0700
Subject: [PATCH 162/211] Bump requests minimum bound to 2.18.0 (#3748)

---
 bigquery/setup.py | 2 +-
 core/setup.py     | 2 +-
 storage/setup.py  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bigquery/setup.py b/bigquery/setup.py
index 69fbb9cc5eb6f..98dc37c8cc7a2 100644
--- a/bigquery/setup.py
+++ b/bigquery/setup.py
@@ -54,7 +54,7 @@
     'google-cloud-core >= 0.26.0, < 0.27dev',
     'google-auth >= 1.0.0',
     'google-resumable-media >= 0.2.1',
-    'requests >= 2.0.0',
+    'requests >= 2.18.0',
 ]
 
 setup(
diff --git a/core/setup.py b/core/setup.py
index f697e385494bd..96d7567b9de63 100644
--- a/core/setup.py
+++ b/core/setup.py
@@ -54,7 +54,7 @@
     'googleapis-common-protos >= 1.3.4',
     'protobuf >= 3.0.0',
     'google-auth >= 0.4.0, < 2.0.0dev',
-    'requests >= 2.4.0, < 3.0.0dev',
+    'requests >= 2.18.0, < 3.0.0dev',
     'setuptools >= 34.0.0',
     'six',
     'tenacity >= 4.0.0, <5.0.0dev'
diff --git a/storage/setup.py b/storage/setup.py
index 9365b0175087b..90d7c87699b07 100644
--- a/storage/setup.py
+++ b/storage/setup.py
@@ -54,7 +54,7 @@
     'google-cloud-core >= 0.26.0, < 0.27dev',
     'google-auth >= 1.0.0',
     'google-resumable-media >= 0.2.3',
-    'requests >= 2.0.0',
+    'requests >= 2.18.0',
 ]
 
 setup(

From 1b764b80e2aa8f42ec60a67ba1dce45abae9ae79 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 7 Aug 2017 17:50:10 -0400
Subject: [PATCH 163/211] Add 'Table.row_from_mapping' helper. (#3425)

---
 bigquery/google/cloud/bigquery/table.py | 29 ++++++++++++
 bigquery/tests/unit/test_table.py       | 61 +++++++++++++++++++++++--
 2 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/table.py b/bigquery/google/cloud/bigquery/table.py
index 9960b560624d0..ffbd47ca6c4c2 100644
--- a/bigquery/google/cloud/bigquery/table.py
+++ b/bigquery/google/cloud/bigquery/table.py
@@ -733,6 +733,35 @@ def fetch_data(self, max_results=None, page_token=None, client=None):
         iterator._NEXT_TOKEN = 'pageToken'
         return iterator
 
+    def row_from_mapping(self, mapping):
+        """Convert a mapping to a row tuple using the schema.
+
+        :type mapping: dict
+        :param mapping: Mapping of row data: must contain keys for all
+               required fields in the schema.  Keys which do not correspond
+               to a field in the schema are ignored.
+
+        :rtype: tuple
+        :returns: Tuple whose elements are ordered according to the table's
+                  schema.
+        :raises: ValueError if table's schema is not set
+        """
+        if len(self._schema) == 0:
+            raise ValueError(_TABLE_HAS_NO_SCHEMA)
+
+        row = []
+        for field in self.schema:
+            if field.mode == 'REQUIRED':
+                row.append(mapping[field.name])
+            elif field.mode == 'REPEATED':
+                row.append(mapping.get(field.name, ()))
+            elif field.mode == 'NULLABLE':
+                row.append(mapping.get(field.name))
+            else:
+                raise ValueError(
+                    "Unknown field mode: {}".format(field.mode))
+        return tuple(row)
+
     def insert_data(self,
                     rows,
                     row_ids=None,
diff --git a/bigquery/tests/unit/test_table.py b/bigquery/tests/unit/test_table.py
index 3bab58b6c8f84..125114b6f3acc 100644
--- a/bigquery/tests/unit/test_table.py
+++ b/bigquery/tests/unit/test_table.py
@@ -1347,6 +1347,61 @@ def test_fetch_data_w_record_schema(self):
         self.assertEqual(req['method'], 'GET')
         self.assertEqual(req['path'], '/%s' % PATH)
 
+    def test_row_from_mapping_wo_schema(self):
+        from google.cloud.bigquery.table import _TABLE_HAS_NO_SCHEMA
+        MAPPING = {'full_name': 'Phred Phlyntstone', 'age': 32}
+        client = _Client(project=self.PROJECT)
+        dataset = _Dataset(client)
+        table = self._make_one(self.TABLE_NAME, dataset=dataset)
+
+        with self.assertRaises(ValueError) as exc:
+            table.row_from_mapping(MAPPING)
+
+        self.assertEqual(exc.exception.args, (_TABLE_HAS_NO_SCHEMA,))
+
+    def test_row_from_mapping_w_invalid_schema(self):
+        from google.cloud.bigquery.table import SchemaField
+        MAPPING = {
+            'full_name': 'Phred Phlyntstone',
+            'age': 32,
+            'colors': ['red', 'green'],
+            'bogus': 'WHATEVER',
+        }
+        client = _Client(project=self.PROJECT)
+        dataset = _Dataset(client)
+        full_name = SchemaField('full_name', 'STRING', mode='REQUIRED')
+        age = SchemaField('age', 'INTEGER', mode='REQUIRED')
+        colors = SchemaField('colors', 'DATETIME', mode='REPEATED')
+        bogus = SchemaField('joined', 'STRING', mode='BOGUS')
+        table = self._make_one(self.TABLE_NAME, dataset=dataset,
+                               schema=[full_name, age, colors, bogus])
+
+        with self.assertRaises(ValueError) as exc:
+            table.row_from_mapping(MAPPING)
+
+        self.assertIn('Unknown field mode: BOGUS', str(exc.exception))
+
+    def test_row_from_mapping_w_schema(self):
+        from google.cloud.bigquery.table import SchemaField
+        MAPPING = {
+            'full_name': 'Phred Phlyntstone',
+            'age': 32,
+            'colors': ['red', 'green'],
+            'extra': 'IGNORED',
+        }
+        client = _Client(project=self.PROJECT)
+        dataset = _Dataset(client)
+        full_name = SchemaField('full_name', 'STRING', mode='REQUIRED')
+        age = SchemaField('age', 'INTEGER', mode='REQUIRED')
+        colors = SchemaField('colors', 'DATETIME', mode='REPEATED')
+        joined = SchemaField('joined', 'STRING', mode='NULLABLE')
+        table = self._make_one(self.TABLE_NAME, dataset=dataset,
+                               schema=[full_name, age, colors, joined])
+
+        self.assertEqual(
+            table.row_from_mapping(MAPPING),
+            ('Phred Phlyntstone', 32, ['red', 'green'], None))
+
     def test_insert_data_wo_schema(self):
         from google.cloud.bigquery.table import _TABLE_HAS_NO_SCHEMA
 
@@ -2055,7 +2110,7 @@ def test__parse_schema_resource_subfields(self):
         RESOURCE['schema']['fields'].append(
             {'name': 'phone',
              'type': 'RECORD',
-             'mode': 'REPEATABLE',
+             'mode': 'REPEATED',
              'fields': [{'name': 'type',
                          'type': 'STRING',
                          'mode': 'REQUIRED'},
@@ -2123,7 +2178,7 @@ def test_w_subfields(self):
         full_name = SchemaField('full_name', 'STRING', mode='REQUIRED')
         ph_type = SchemaField('type', 'STRING', 'REQUIRED')
         ph_num = SchemaField('number', 'STRING', 'REQUIRED')
-        phone = SchemaField('phone', 'RECORD', mode='REPEATABLE',
+        phone = SchemaField('phone', 'RECORD', mode='REPEATED',
                             fields=[ph_type, ph_num])
         resource = self._call_fut([full_name, phone])
         self.assertEqual(len(resource), 2)
@@ -2134,7 +2189,7 @@ def test_w_subfields(self):
         self.assertEqual(resource[1],
                          {'name': 'phone',
                           'type': 'RECORD',
-                          'mode': 'REPEATABLE',
+                          'mode': 'REPEATED',
                           'fields': [{'name': 'type',
                                       'type': 'STRING',
                                       'mode': 'REQUIRED'},

From 45ee4bdd430439174c82b3c2bdfff48b6371d367 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 7 Aug 2017 18:00:17 -0400
Subject: [PATCH 164/211] Reuse explicit credentials when creating
 'database.spanner_api'. (#3722)

- Preserves "custom" credentials (existing code worked only with
  implicit credentials from the environment).

- Add tests ensuring scopes are set for correctly for all GAX apis
  (client uses admin scope, which do not grant data access, while
  database uses data scope, which does not grant admin access).
---
 spanner/google/cloud/spanner/database.py | 12 +++-
 spanner/tests/unit/test_client.py        | 58 ++++++++-------
 spanner/tests/unit/test_database.py      | 89 +++++++++++++++++++-----
 3 files changed, 117 insertions(+), 42 deletions(-)

diff --git a/spanner/google/cloud/spanner/database.py b/spanner/google/cloud/spanner/database.py
index 9b838bfaa8780..acfcefdce891a 100644
--- a/spanner/google/cloud/spanner/database.py
+++ b/spanner/google/cloud/spanner/database.py
@@ -16,6 +16,7 @@
 
 import re
 
+import google.auth.credentials
 from google.gax.errors import GaxError
 from google.gax.grpc import exc_to_code
 from google.cloud.gapic.spanner.v1.spanner_client import SpannerClient
@@ -35,6 +36,9 @@
 # pylint: enable=ungrouped-imports
 
 
+SPANNER_DATA_SCOPE = 'https://www.googleapis.com/auth/spanner.data'
+
+
 _DATABASE_NAME_RE = re.compile(
     r'^projects/(?P<project>[^/]+)/'
     r'instances/(?P<instance_id>[a-z][-a-z0-9]*)/'
@@ -154,8 +158,14 @@ def ddl_statements(self):
     def spanner_api(self):
         """Helper for session-related API calls."""
         if self._spanner_api is None:
+            credentials = self._instance._client.credentials
+            if isinstance(credentials, google.auth.credentials.Scoped):
+                credentials = credentials.with_scopes((SPANNER_DATA_SCOPE,))
             self._spanner_api = SpannerClient(
-                lib_name='gccl', lib_version=__version__)
+                lib_name='gccl',
+                lib_version=__version__,
+                credentials=credentials,
+            )
         return self._spanner_api
 
     def __eq__(self, other):
diff --git a/spanner/tests/unit/test_client.py b/spanner/tests/unit/test_client.py
index 28eee9b78f56f..5fd79ab86ebb4 100644
--- a/spanner/tests/unit/test_client.py
+++ b/spanner/tests/unit/test_client.py
@@ -145,46 +145,56 @@ def test_admin_api_lib_name(self):
                              __version__)
 
     def test_instance_admin_api(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.spanner import client as MUT
+        from google.cloud.spanner import __version__
+        from google.cloud.spanner.client import SPANNER_ADMIN_SCOPE
 
-        creds = _make_credentials()
-        client = self._make_one(project=self.PROJECT, credentials=creds)
+        credentials = _make_credentials()
+        client = self._make_one(project=self.PROJECT, credentials=credentials)
+        expected_scopes = (SPANNER_ADMIN_SCOPE,)
 
-        class _Client(object):
-            def __init__(self, *args, **kwargs):
-                self.args = args
-                self.kwargs = kwargs
+        patch = mock.patch('google.cloud.spanner.client.InstanceAdminClient')
 
-        with _Monkey(MUT, InstanceAdminClient=_Client):
+        with patch as instance_admin_client:
             api = client.instance_admin_api
 
-        self.assertTrue(isinstance(api, _Client))
+        self.assertIs(api, instance_admin_client.return_value)
+
+        # API instance is cached
         again = client.instance_admin_api
         self.assertIs(again, api)
-        self.assertEqual(api.kwargs['lib_name'], 'gccl')
-        self.assertIs(api.kwargs['credentials'], client.credentials)
+
+        instance_admin_client.assert_called_once_with(
+            lib_name='gccl',
+            lib_version=__version__,
+            credentials=credentials.with_scopes.return_value)
+
+        credentials.with_scopes.assert_called_once_with(expected_scopes)
 
     def test_database_admin_api(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.spanner import client as MUT
+        from google.cloud.spanner import __version__
+        from google.cloud.spanner.client import SPANNER_ADMIN_SCOPE
 
-        creds = _make_credentials()
-        client = self._make_one(project=self.PROJECT, credentials=creds)
+        credentials = _make_credentials()
+        client = self._make_one(project=self.PROJECT, credentials=credentials)
+        expected_scopes = (SPANNER_ADMIN_SCOPE,)
 
-        class _Client(object):
-            def __init__(self, *args, **kwargs):
-                self.args = args
-                self.kwargs = kwargs
+        patch = mock.patch('google.cloud.spanner.client.DatabaseAdminClient')
 
-        with _Monkey(MUT, DatabaseAdminClient=_Client):
+        with patch as database_admin_client:
             api = client.database_admin_api
 
-        self.assertTrue(isinstance(api, _Client))
+        self.assertIs(api, database_admin_client.return_value)
+
+        # API instance is cached
         again = client.database_admin_api
         self.assertIs(again, api)
-        self.assertEqual(api.kwargs['lib_name'], 'gccl')
-        self.assertIs(api.kwargs['credentials'], client.credentials)
+
+        database_admin_client.assert_called_once_with(
+            lib_name='gccl',
+            lib_version=__version__,
+            credentials=credentials.with_scopes.return_value)
+
+        credentials.with_scopes.assert_called_once_with(expected_scopes)
 
     def test_copy(self):
         credentials = _make_credentials()
diff --git a/spanner/tests/unit/test_database.py b/spanner/tests/unit/test_database.py
index aa1643ed75824..ec94e0198c777 100644
--- a/spanner/tests/unit/test_database.py
+++ b/spanner/tests/unit/test_database.py
@@ -15,10 +15,23 @@
 
 import unittest
 
-from google.cloud.spanner import __version__
+import mock
 
 from google.cloud._testing import _GAXBaseAPI
 
+from google.cloud.spanner import __version__
+
+
+def _make_credentials():
+    import google.auth.credentials
+
+    class _CredentialsWithScopes(
+            google.auth.credentials.Credentials,
+            google.auth.credentials.Scoped):
+        pass
+
+    return mock.Mock(spec=_CredentialsWithScopes)
+
 
 class _BaseTest(unittest.TestCase):
 
@@ -176,30 +189,72 @@ def test_name_property(self):
         expected_name = self.DATABASE_NAME
         self.assertEqual(database.name, expected_name)
 
-    def test_spanner_api_property(self):
-        from google.cloud._testing import _Monkey
-        from google.cloud.spanner import database as MUT
-
+    def test_spanner_api_property_w_scopeless_creds(self):
         client = _Client()
+        credentials = client.credentials = object()
         instance = _Instance(self.INSTANCE_NAME, client=client)
         pool = _Pool()
         database = self._make_one(self.DATABASE_ID, instance, pool=pool)
 
-        _client = object()
-        _clients = [_client]
+        patch = mock.patch('google.cloud.spanner.database.SpannerClient')
+
+        with patch as spanner_client:
+            api = database.spanner_api
+
+        self.assertIs(api, spanner_client.return_value)
+
+        # API instance is cached
+        again = database.spanner_api
+        self.assertIs(again, api)
+
+        spanner_client.assert_called_once_with(
+            lib_name='gccl',
+            lib_version=__version__,
+            credentials=credentials)
 
-        def _mock_spanner_client(*args, **kwargs):
-            self.assertIsInstance(args, tuple)
-            self.assertEqual(kwargs['lib_name'], 'gccl')
-            self.assertEqual(kwargs['lib_version'], __version__)
-            return _clients.pop(0)
+    def test_spanner_api_w_scoped_creds(self):
+        import google.auth.credentials
+        from google.cloud.spanner.database import SPANNER_DATA_SCOPE
 
-        with _Monkey(MUT, SpannerClient=_mock_spanner_client):
+        class _CredentialsWithScopes(
+                google.auth.credentials.Scoped):
+
+            def __init__(self, scopes=(), source=None):
+                self._scopes = scopes
+                self._source = source
+
+            def requires_scopes(self):
+                return True
+
+            def with_scopes(self, scopes):
+                return self.__class__(scopes, self)
+
+        expected_scopes = (SPANNER_DATA_SCOPE,)
+        client = _Client()
+        credentials = client.credentials = _CredentialsWithScopes()
+        instance = _Instance(self.INSTANCE_NAME, client=client)
+        pool = _Pool()
+        database = self._make_one(self.DATABASE_ID, instance, pool=pool)
+
+        patch = mock.patch('google.cloud.spanner.database.SpannerClient')
+
+        with patch as spanner_client:
             api = database.spanner_api
-            self.assertIs(api,  _client)
-            # API instance is cached
-            again = database.spanner_api
-            self.assertIs(again, api)
+
+        self.assertIs(api, spanner_client.return_value)
+
+        # API instance is cached
+        again = database.spanner_api
+        self.assertIs(again, api)
+
+        self.assertEqual(len(spanner_client.call_args_list), 1)
+        called_args, called_kw = spanner_client.call_args
+        self.assertEqual(called_args, ())
+        self.assertEqual(called_kw['lib_name'], 'gccl')
+        self.assertEqual(called_kw['lib_version'], __version__)
+        scoped = called_kw['credentials']
+        self.assertEqual(scoped._scopes, expected_scopes)
+        self.assertIs(scoped._source, credentials)
 
     def test___eq__(self):
         instance = _Instance(self.INSTANCE_NAME)

From 26214d229860c5ec128d0d767f1d302f588d49ec Mon Sep 17 00:00:00 2001
From: Angela Li <yanhuil@google.com>
Date: Mon, 7 Aug 2017 15:07:07 -0700
Subject: [PATCH 165/211] Update trace dependencies to fix the unit test
 (#3749)

* Fix trace unit test

* Fix stuff
---
 trace/nox.py                  | 4 +++-
 trace/setup.py                | 2 +-
 trace/tests/unit/test__gax.py | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/trace/nox.py b/trace/nox.py
index 08c69cb85df56..4133913d931ba 100644
--- a/trace/nox.py
+++ b/trace/nox.py
@@ -14,6 +14,8 @@
 
 from __future__ import absolute_import
 
+import os
+
 import nox
 
 
@@ -41,7 +43,7 @@ def unit_tests(session, python_version):
         '--cov-config=.coveragerc',
         '--cov-report=',
         '--cov-fail-under=97',
-        'tests/',
+        os.path.join('tests', 'unit'),
         *session.posargs
     )
 
diff --git a/trace/setup.py b/trace/setup.py
index aeeae31756e42..d6759ccb11796 100644
--- a/trace/setup.py
+++ b/trace/setup.py
@@ -10,7 +10,7 @@
 install_requires = [
     'google-gax>=0.15.7, <0.16dev',
     'googleapis-common-protos[grpc]>=1.5.2, <2.0dev',
-    'google-cloud-core >= 0.24.0, < 0.25dev',
+    'google-cloud-core >= 0.26.0, < 0.27dev',
 ]
 
 setup(
diff --git a/trace/tests/unit/test__gax.py b/trace/tests/unit/test__gax.py
index 3f950021b85e1..f4b87472e0cfb 100644
--- a/trace/tests/unit/test__gax.py
+++ b/trace/tests/unit/test__gax.py
@@ -16,8 +16,6 @@
 
 import mock
 
-from google.cloud._testing import _GAXBaseAPI
-
 
 class _Base(object):
     project = 'PROJECT'

From b96eaca9a7c4e3d2e8db29fbe080c01f3495e811 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Tue, 8 Aug 2017 09:38:08 -0700
Subject: [PATCH 166/211] Make CONTRIBUTING.rst be up to date. (#3750)

---
 CONTRIBUTING.rst | 229 +++++++++++++----------------------------------
 1 file changed, 60 insertions(+), 169 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 95a4dd13cfdb9..25c449a2bad56 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -21,7 +21,7 @@ In order to add a feature to ``google-cloud-python``:
   documentation (in ``docs/``).
 
 - The feature must work fully on the following CPython versions:  2.7,
-  3.4, and 3.5 on both UNIX and Windows.
+  3.4, 3.5, and 3.6 on both UNIX and Windows.
 
 - The feature must not add unnecessary dependencies (where
   "unnecessary" is of course subjective, but new dependencies should
@@ -57,7 +57,7 @@ You'll have to create a development environment to hack on
 Now your local repo is set up such that you will push changes to your GitHub
 repo, from which you can submit a pull request.
 
-To work on the codebase and run the tests, we recommend using ``tox``,
+To work on the codebase and run the tests, we recommend using ``nox``,
 but you can also use a ``virtualenv`` of your own creation.
 
 .. _repo: https://github.com/GoogleCloudPlatform/google-cloud-python
@@ -68,11 +68,15 @@ Using a custom ``virtualenv``
 - To create a virtualenv in which to install ``google-cloud-python``::
 
     $ cd ${HOME}/hack-on-google-cloud-python
-    $ virtualenv --python python2.7 ${ENV_NAME}
+    $ virtualenv --python python3.6 ${ENV_NAME}
 
   You can choose which Python version you want to use by passing a ``--python``
-  flag to ``virtualenv``.  For example, ``virtualenv --python python2.7``
-  chooses the Python 2.7 interpreter to be installed.
+  flag to ``virtualenv``.  For example, ``virtualenv --python python3.6``
+  chooses the Python 3.6 interpreter to be installed.
+
+  .. note::
+      We recommend developing in Python 3, and using the test suite to
+      ensure compatibility with Python 2.
 
 - From here on in within these instructions, the
   ``${HOME}/hack-on-google-cloud-python/${ENV_NAME}`` virtual environment you
@@ -91,43 +95,32 @@ Using a custom ``virtualenv``
   Unfortunately using ``setup.py develop`` is not possible with this
   project, because it uses `namespace packages`_.
 
-Using ``tox``
+Using ``nox``
 =============
 
-- To test your changes, run unit tests with ``tox``::
-
-    $ tox -e py27
-    $ tox -e py34
-    $ ...
-
-- If you'd like to poke around your code in an interpreter, let
-  ``tox`` install the environment of your choice::
-
-    $ # Install only; without running tests
-    $ tox -e ${ENV} --recreate --notest
+We use `nox`_ to instrument our tests.
 
-  After doing this, you can activate the virtual environment and
-  use the interpreter from that environment::
+- To test your changes, run unit tests with ``nox``::
 
-    $ source .tox/${ENV}/bin/activate
-    (ENV) $ .tox/${ENV}/bin/python
+    $ nox -f datastore/nox.py -s "unit_tests(python_version='2.7')"
+    $ nox -f datastore/nox.py -s "unit_tests(python_version='3.4')"
+    $ ...
 
-  Unfortunately, your changes to the source tree won't be picked up
-  by the ``tox`` environment, so if you make changes, you'll need
-  to again ``--recreate`` the environment.
+  .. note::
 
-- To run unit tests on a restricted set of packages::
+    The unit tests and system tests are contained in the individual
+    ``nox.py`` files in each directory; substitute ``datastore`` in the
+    example above with the package of your choice.
 
-    $ tox -e py27 -- core datastore
 
   Alternatively, you can just navigate directly to the package you are
   currently developing and run tests there::
 
     $ export GIT_ROOT=$(pwd)
-    $ cd ${GIT_ROOT}/core/
-    $ tox -e py27
     $ cd ${GIT_ROOT}/datastore/
-    $ tox -e py27
+    $ nox -s "unit_tests(python_version='3.6')"
+
+.. nox: https://pypi.org/project/nox-automation/
 
 Note on Editable Installs / Develop Mode
 ========================================
@@ -162,13 +155,13 @@ On Debian/Ubuntu::
 Coding Style
 ************
 
-- PEP8 compliance, with exceptions defined in ``tox.ini``.
-  If you have ``tox`` installed, you can test that you have not introduced
+- PEP8 compliance, with exceptions defined in the linter configuration.
+  If you have ``nox`` installed, you can test that you have not introduced
   any non-compliant code via::
 
-   $ tox -e lint
+   $ nox -s lint
 
-- In order to make ``tox -e lint`` run faster, you can set some environment
+- In order to make ``nox -s lint`` run faster, you can set some environment
   variables::
 
    export GOOGLE_CLOUD_TESTING_REMOTE="upstream"
@@ -185,49 +178,20 @@ Exceptions to PEP8:
   "Function-Under-Test"), which is PEP8-incompliant, but more readable.
   Some also use a local variable, ``MUT`` (short for "Module-Under-Test").
 
-*************
-Running Tests
-*************
-
-- To run all tests for ``google-cloud-python`` on a single Python version, run
-  ``py.test`` from your development virtualenv (See
-  `Using a Development Checkout`_ above).
-
-.. _Using a Development Checkout: #using-a-development-checkout
-
-- To run the full set of ``google-cloud-python`` tests on all platforms, install
-  ``tox`` (https://tox.readthedocs.io/en/latest/) into a system Python.  The
-  ``tox`` console script will be installed into the scripts location for that
-  Python.  While ``cd``'-ed to the ``google-cloud-python`` checkout root
-  directory (it contains ``tox.ini``), invoke the ``tox`` console script.
-  This will read the ``tox.ini`` file and execute the tests on multiple
-  Python versions and platforms; while it runs, it creates a ``virtualenv`` for
-  each version/platform combination.  For example::
-
-   $ sudo --set-home /usr/bin/pip install tox
-   $ cd ${HOME}/hack-on-google-cloud-python/
-   $ /usr/bin/tox
-
-.. _Using a Development Checkout: #using-a-development-checkout
-
 ********************
 Running System Tests
 ********************
 
-- To run system tests you can execute::
-
-   $ tox -e system-tests
-   $ tox -e system-tests3
-
-  or run only system tests for a particular package via::
+- To run system tests for a given package, you can execute::
 
-   $ python system_tests/run_system_test.py --package {package}
-   $ python3 system_tests/run_system_test.py --package {package}
+   $ nox -f datastore/nox.py -s "system_tests(python_version='3.6')"
+   $ nox -f datastore/nox.py -s "system_tests(python_version='2.7')"
 
-  To run a subset of the system tests::
+  .. note::
 
-   $ tox -e system-tests -- datastore storage
-   $ python system_tests/attempt_system_tests.py datastore storage
+      System tests are only configured to run under Python 2.7 and
+      Python 3.6. For expediency, we do not run them in older versions
+      of Python 3.
 
   This alone will not run the tests. You'll need to change some local
   auth settings and change some configuration in your project to
@@ -270,90 +234,21 @@ Running System Tests
 - For datastore query tests, you'll need stored data in your dataset.
   To populate this data, run::
 
-   $ python system_tests/populate_datastore.py
+   $ python datastore/tests/system/utils/populate_datastore.py
 
 - If you make a mistake during development (i.e. a failing test that
   prevents clean-up) you can clear all system test data from your
   datastore instance via::
 
-   $ python system_tests/clear_datastore.py
-
-System Test Emulators
-=====================
-
-- System tests can also be run against local `emulators`_ that mock
-  the production services. To run the system tests with the
-  ``datastore`` emulator::
-
-   $ tox -e datastore-emulator
-   $ GOOGLE_CLOUD_DISABLE_GRPC=true tox -e datastore-emulator
-
-  This also requires that the ``gcloud`` command line tool is
-  installed. If you'd like to run them directly (outside of a
-  ``tox`` environment), first start the emulator and
-  take note of the process ID::
-
-   $ gcloud beta emulators datastore start --no-legacy 2>&1 > log.txt &
-   [1] 33333
+   $ python datastore/tests/system/utils/clear_datastore.py
 
-  then determine the environment variables needed to interact with
-  the emulator::
-
-   $ gcloud beta emulators datastore env-init
-   export DATASTORE_LOCAL_HOST=localhost:8417
-   export DATASTORE_HOST=http://localhost:8417
-   export DATASTORE_DATASET=google-cloud-settings-app-id
-   export DATASTORE_PROJECT_ID=google-cloud-settings-app-id
-
-  using these environment variables run the emulator::
-
-   $ DATASTORE_HOST=http://localhost:8471 \
-   >   DATASTORE_DATASET=google-cloud-settings-app-id \
-   >   GOOGLE_CLOUD_NO_PRINT=true \
-   >   python system_tests/run_system_test.py \
-   >   --package=datastore --ignore-requirements
-
-  and after completion stop the emulator and any child
-  processes it spawned::
-
-   $ kill -- -33333
-
-.. _emulators: https://cloud.google.com/sdk/gcloud/reference/beta/emulators/
-
-- To run the system tests with the ``pubsub`` emulator::
-
-   $ tox -e pubsub-emulator
-   $ GOOGLE_CLOUD_DISABLE_GRPC=true tox -e pubsub-emulator
-
-  If you'd like to run them directly (outside of a ``tox`` environment), first
-  start the emulator and take note of the process ID::
-
-   $ gcloud beta emulators pubsub start 2>&1 > log.txt &
-   [1] 44444
-
-  then determine the environment variables needed to interact with
-  the emulator::
-
-   $ gcloud beta emulators pubsub env-init
-   export PUBSUB_EMULATOR_HOST=localhost:8897
-
-  using these environment variables run the emulator::
-
-   $ PUBSUB_EMULATOR_HOST=localhost:8897 \
-   >   python system_tests/run_system_test.py \
-   >   --package=pubsub
-
-  and after completion stop the emulator and any child
-  processes it spawned::
-
-   $ kill -- -44444
 
 *************
 Test Coverage
 *************
 
 - The codebase *must* have 100% test statement coverage after each commit.
-  You can test coverage via ``tox -e cover``.
+  You can test coverage via ``nox -s cover``.
 
 ******************************************************
 Documentation Coverage and Building HTML Documentation
@@ -386,10 +281,10 @@ using to develop ``google-cloud-python``):
 #. Open the ``docs/_build/html/index.html`` file to see the resulting HTML
    rendering.
 
-As an alternative to 1. and 2. above, if you have ``tox`` installed, you
+As an alternative to 1. and 2. above, if you have ``nox`` installed, you
 can build the docs via::
 
-   $ tox -e docs
+   $ nox -s docs
 
 ********************************************
 Note About ``README`` as it pertains to PyPI
@@ -404,27 +299,15 @@ may cause problems creating links or rendering the description.
 
 .. _description on PyPI: https://pypi.org/project/google-cloud/
 
-********************************************
-Travis Configuration and Build Optimizations
-********************************************
+**********************
+CircleCI Configuration
+**********************
 
-All build scripts in the ``.travis.yml`` configuration file which have
-Python dependencies are specified in the ``tox.ini`` configuration.
-They are executed in the Travis build via ``tox -e ${ENV}`` where
+All build scripts in the ``.circleci/config.yml`` configuration file which have
+Python dependencies are specified in the ``nox.py`` configuration.
+They are executed in the Travis build via ``nox -s ${ENV}`` where
 ``${ENV}`` is the environment being tested.
 
-If new ``tox`` environments are added to be run in a Travis build, they
-should be listed in ``[tox].envlist`` as a default environment.
-
-We speed up builds by using the Travis `caching feature`_.
-
-.. _caching feature: https://docs.travis-ci.com/user/caching/#pip-cache
-
-We intentionally **do not** cache the ``.tox/`` directory. Instead, we
-allow the ``tox`` environments to be re-built for every build. This
-way, we'll always get the latest versions of our dependencies and any
-caching or wheel optimization to be done will be handled automatically
-by ``pip``.
 
 *************************
 Supported Python Versions
@@ -435,14 +318,16 @@ We support:
 -  `Python 2.7`_
 -  `Python 3.4`_
 -  `Python 3.5`_
+-  `Python 3.6`_
 
 .. _Python 2.7: https://docs.python.org/2.7/
 .. _Python 3.4: https://docs.python.org/3.4/
 .. _Python 3.5: https://docs.python.org/3.5/
+.. _Python 3.6: https://docs.python.org/3.6/
 
-Supported versions can be found in our ``tox.ini`` `config`_.
+Supported versions can be found in our ``nox.py`` `config`_.
 
-.. _config: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/tox.ini
+.. _config: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/nox.py
 
 We explicitly decided not to support `Python 2.5`_ due to `decreased usage`_
 and lack of continuous integration `support`_.
@@ -475,17 +360,23 @@ This library follows `Semantic Versioning`_.
 
 .. _Semantic Versioning: http://semver.org/
 
-It is currently in major version zero (``0.y.z``), which means that anything
-may change at any time and the public API should not be considered
+Some packages are currently in major version zero (``0.y.z``), which means that
+anything may change at any time and the public API should not be considered
 stable.
 
 ******************************
 Contributor License Agreements
 ******************************
 
-Before we can accept your pull requests you'll need to sign a Contributor License Agreement (CLA):
+Before we can accept your pull requests you'll need to sign a Contributor
+License Agreement (CLA):
 
-- **If you are an individual writing original source code** and **you own the intellectual property**, then you'll need to sign an `individual CLA <https://developers.google.com/open-source/cla/individual>`__.
-- **If you work for a company that wants to allow you to contribute your work**, then you'll need to sign a `corporate CLA <https://developers.google.com/open-source/cla/corporate>`__.
+- **If you are an individual writing original source code** and **you own the
+  intellectual property**, then you'll need to sign an
+  `individual CLA <https://developers.google.com/open-source/cla/individual>`__.
+- **If you work for a company that wants to allow you to contribute your work**,
+  then you'll need to sign a
+  `corporate CLA <https://developers.google.com/open-source/cla/corporate>`__.
 
-You can sign these electronically (just scroll to the bottom). After that, we'll be able to accept your pull requests.
+You can sign these electronically (just scroll to the bottom). After that,
+we'll be able to accept your pull requests.

From fe757be48c29ad325a7f89c04f97e022a0f1fbea Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Tue, 8 Aug 2017 10:05:34 -0700
Subject: [PATCH 167/211] session.run_in_transaction returns the callback's
 return value. (#3753)

---
 spanner/google/cloud/spanner/session.py | 10 +++++-----
 spanner/tests/unit/test_database.py     |  4 ++--
 spanner/tests/unit/test_session.py      | 24 +++++++++---------------
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/spanner/google/cloud/spanner/session.py b/spanner/google/cloud/spanner/session.py
index 953ab62993ccd..04fcacea38ee8 100644
--- a/spanner/google/cloud/spanner/session.py
+++ b/spanner/google/cloud/spanner/session.py
@@ -268,8 +268,9 @@ def run_in_transaction(self, func, *args, **kw):
                    If passed, "timeout_secs" will be removed and used to
                    override the default timeout.
 
-        :rtype: :class:`datetime.datetime`
-        :returns: timestamp of committed transaction
+        :rtype: Any
+        :returns: The return value of ``func``.
+
         :raises Exception:
             reraises any non-ABORT execptions raised by ``func``.
         """
@@ -284,7 +285,7 @@ def run_in_transaction(self, func, *args, **kw):
             if txn._transaction_id is None:
                 txn.begin()
             try:
-                func(txn, *args, **kw)
+                return_value = func(txn, *args, **kw)
             except GaxError as exc:
                 _delay_until_retry(exc, deadline)
                 del self._transaction
@@ -299,8 +300,7 @@ def run_in_transaction(self, func, *args, **kw):
                 _delay_until_retry(exc, deadline)
                 del self._transaction
             else:
-                committed = txn.committed
-                return committed
+                return return_value
 
 
 # pylint: disable=misplaced-bare-raise
diff --git a/spanner/tests/unit/test_database.py b/spanner/tests/unit/test_database.py
index ec94e0198c777..40e10ec971a99 100644
--- a/spanner/tests/unit/test_database.py
+++ b/spanner/tests/unit/test_database.py
@@ -22,7 +22,7 @@
 from google.cloud.spanner import __version__
 
 
-def _make_credentials():
+def _make_credentials():  # pragma: NO COVER
     import google.auth.credentials
 
     class _CredentialsWithScopes(
@@ -223,7 +223,7 @@ def __init__(self, scopes=(), source=None):
                 self._scopes = scopes
                 self._source = source
 
-            def requires_scopes(self):
+            def requires_scopes(self): # pragma: NO COVER
                 return True
 
             def with_scopes(self, scopes):
diff --git a/spanner/tests/unit/test_session.py b/spanner/tests/unit/test_session.py
index 100555c8e49f8..826369079d29e 100644
--- a/spanner/tests/unit/test_session.py
+++ b/spanner/tests/unit/test_session.py
@@ -513,16 +513,16 @@ def test_run_in_transaction_w_args_w_kwargs_wo_abort(self):
         def unit_of_work(txn, *args, **kw):
             called_with.append((txn, args, kw))
             txn.insert(TABLE_NAME, COLUMNS, VALUES)
+            return 42
 
-        committed = session.run_in_transaction(
+        return_value = session.run_in_transaction(
             unit_of_work, 'abc', some_arg='def')
 
-        self.assertEqual(committed, now)
         self.assertIsNone(session._transaction)
         self.assertEqual(len(called_with), 1)
         txn, args, kw = called_with[0]
         self.assertIsInstance(txn, Transaction)
-        self.assertEqual(txn.committed, committed)
+        self.assertEqual(return_value, 42)
         self.assertEqual(args, ('abc',))
         self.assertEqual(kw, {'some_arg': 'def'})
 
@@ -561,18 +561,15 @@ def test_run_in_transaction_w_abort_no_retry_metadata(self):
         def unit_of_work(txn, *args, **kw):
             called_with.append((txn, args, kw))
             txn.insert(TABLE_NAME, COLUMNS, VALUES)
+            return 'answer'
 
-        committed = session.run_in_transaction(
+        return_value = session.run_in_transaction(
             unit_of_work, 'abc', some_arg='def')
 
-        self.assertEqual(committed, now)
         self.assertEqual(len(called_with), 2)
         for index, (txn, args, kw) in enumerate(called_with):
             self.assertIsInstance(txn, Transaction)
-            if index == 1:
-                self.assertEqual(txn.committed, committed)
-            else:
-                self.assertIsNone(txn.committed)
+            self.assertEqual(return_value, 'answer')
             self.assertEqual(args, ('abc',))
             self.assertEqual(kw, {'some_arg': 'def'})
 
@@ -621,17 +618,15 @@ def unit_of_work(txn, *args, **kw):
         time_module = _FauxTimeModule()
 
         with _Monkey(MUT, time=time_module):
-            committed = session.run_in_transaction(
-                unit_of_work, 'abc', some_arg='def')
+            session.run_in_transaction(unit_of_work, 'abc', some_arg='def')
 
         self.assertEqual(time_module._slept,
                          RETRY_SECONDS + RETRY_NANOS / 1.0e9)
-        self.assertEqual(committed, now)
         self.assertEqual(len(called_with), 2)
         for index, (txn, args, kw) in enumerate(called_with):
             self.assertIsInstance(txn, Transaction)
             if index == 1:
-                self.assertEqual(txn.committed, committed)
+                self.assertEqual(txn.committed, now)
             else:
                 self.assertIsNone(txn.committed)
             self.assertEqual(args, ('abc',))
@@ -688,9 +683,8 @@ def unit_of_work(txn, *args, **kw):
         time_module = _FauxTimeModule()
 
         with _Monkey(MUT, time=time_module):
-            committed = session.run_in_transaction(unit_of_work)
+            session.run_in_transaction(unit_of_work)
 
-        self.assertEqual(committed, now)
         self.assertEqual(time_module._slept,
                          RETRY_SECONDS + RETRY_NANOS / 1.0e9)
         self.assertEqual(len(called_with), 2)

From abfec7008e6040136a16a3a0f7dc72b5579c721e Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Tue, 8 Aug 2017 10:32:00 -0700
Subject: [PATCH 168/211] Add google.api.core.exceptions (#3738)

* Add google.api.core.exceptions

* Add google.api.core to coverage report

* Alias google.cloud.exceptions to google.api.core.exceptions

* Fix lint

* Address review comments

* Fix typo
---
 core/google/api/core/exceptions.py          | 420 ++++++++++++++++++++
 core/google/cloud/exceptions.py             | 254 ++----------
 core/google/cloud/obselete.py               |   2 +
 core/nox.py                                 |   1 +
 core/tests/unit/api_core/__init__.py        |   0
 core/tests/unit/api_core/test_exceptions.py | 201 ++++++++++
 6 files changed, 655 insertions(+), 223 deletions(-)
 create mode 100644 core/google/api/core/exceptions.py
 create mode 100644 core/tests/unit/api_core/__init__.py
 create mode 100644 core/tests/unit/api_core/test_exceptions.py

diff --git a/core/google/api/core/exceptions.py b/core/google/api/core/exceptions.py
new file mode 100644
index 0000000000000..c25816abce341
--- /dev/null
+++ b/core/google/api/core/exceptions.py
@@ -0,0 +1,420 @@
+# Copyright 2014 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Exceptions raised by Google API core & clients.
+
+This module provides base classes for all errors raised by libraries based
+on :mod:`google.api.core`, including both HTTP and gRPC clients.
+"""
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import six
+from six.moves import http_client
+
+try:
+    import grpc
+except ImportError:  # pragma: NO COVER
+    grpc = None
+
+# Lookup tables for mapping exceptions from HTTP and gRPC transports.
+# Populated by _APICallErrorMeta
+_HTTP_CODE_TO_EXCEPTION = {}
+_GRPC_CODE_TO_EXCEPTION = {}
+
+
+class GoogleAPIError(Exception):
+    """Base class for all exceptions raised by Google API Clients."""
+    pass
+
+
+class _GoogleAPICallErrorMeta(type):
+    """Metaclass for registering GoogleAPICallError subclasses."""
+    def __new__(mcs, name, bases, class_dict):
+        cls = type.__new__(mcs, name, bases, class_dict)
+        if cls.code is not None:
+            _HTTP_CODE_TO_EXCEPTION.setdefault(cls.code, cls)
+        if cls.grpc_status_code is not None:
+            _GRPC_CODE_TO_EXCEPTION.setdefault(cls.grpc_status_code, cls)
+        return cls
+
+
+@six.python_2_unicode_compatible
+@six.add_metaclass(_GoogleAPICallErrorMeta)
+class GoogleAPICallError(GoogleAPIError):
+    """Base class for exceptions raised by calling API methods.
+
+    Args:
+        message (str): The exception message.
+        errors (Sequence[Any]): An optional list of error details.
+        response (Union[requests.Request, grpc.Call]): The response or
+            gRPC call metadata.
+    """
+
+    code = None
+    """Optional[int]: The HTTP status code associated with this error.
+
+    This may be ``None`` if the exception does not have a direct mapping
+    to an HTTP error.
+
+    See http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
+    """
+
+    grpc_status_code = None
+    """Optional[grpc.StatusCode]: The gRPC status code associated with this
+    error.
+
+    This may be ``None`` if the exception does not match up to a gRPC error.
+    """
+
+    def __init__(self, message, errors=(), response=None):
+        super(GoogleAPICallError, self).__init__(message)
+        self.message = message
+        """str: The exception message."""
+        self._errors = errors
+        self._response = response
+
+    def __str__(self):
+        return '{} {}'.format(self.code, self.message)
+
+    @property
+    def errors(self):
+        """Detailed error information.
+
+        Returns:
+            Sequence[Any]: A list of additional error details.
+        """
+        return list(self._errors)
+
+    @property
+    def response(self):
+        """Optional[Union[requests.Request, grpc.Call]]: The response or
+        gRPC call metadata."""
+        return self._response
+
+
+class Redirection(GoogleAPICallError):
+    """Base class for for all redirection (HTTP 3xx) responses."""
+
+
+class MovedPermanently(Redirection):
+    """Exception mapping a ``301 Moved Permanently`` response."""
+    code = http_client.MOVED_PERMANENTLY
+
+
+class NotModified(Redirection):
+    """Exception mapping a ``304 Not Modified`` response."""
+    code = http_client.NOT_MODIFIED
+
+
+class TemporaryRedirect(Redirection):
+    """Exception mapping a ``307 Temporary Redirect`` response."""
+    code = http_client.TEMPORARY_REDIRECT
+
+
+class ResumeIncomplete(Redirection):
+    """Exception mapping a ``308 Resume Incomplete`` response.
+
+    .. note:: :ref:`http_client.PERMANENT_REDIRECT` is ``308``, but Google APIs
+        differ in their use of this status code.
+    """
+    code = 308
+
+
+class ClientError(GoogleAPICallError):
+    """Base class for all client error (HTTP 4xx) responses."""
+
+
+class BadRequest(ClientError):
+    """Exception mapping a ``400 Bad Request`` response."""
+    code = http_client.BAD_REQUEST
+
+
+class InvalidArgument(BadRequest):
+    """Exception mapping a :prop:`grpc.StatusCode.INVALID_ARGUMENT` error."""
+    grpc_status_code = (
+        grpc.StatusCode.INVALID_ARGUMENT if grpc is not None else None)
+
+
+class FailedPrecondition(BadRequest):
+    """Exception mapping a :prop:`grpc.StatusCode.FAILED_PRECONDITION`
+    error."""
+    grpc_status_code = (
+        grpc.StatusCode.FAILED_PRECONDITION if grpc is not None else None)
+
+
+class OutOfRange(BadRequest):
+    """Exception mapping a :prop:`grpc.StatusCode.OUT_OF_RANGE` error."""
+    grpc_status_code = (
+        grpc.StatusCode.OUT_OF_RANGE if grpc is not None else None)
+
+
+class Unauthorized(ClientError):
+    """Exception mapping a ``401 Unauthorized`` response."""
+    code = http_client.UNAUTHORIZED
+
+
+class Unauthenticated(Unauthorized):
+    """Exception mapping a :prop:`grpc.StatusCode.UNAUTHENTICATED` error."""
+    grpc_status_code = (
+        grpc.StatusCode.UNAUTHENTICATED if grpc is not None else None)
+
+
+class Forbidden(ClientError):
+    """Exception mapping a ``403 Forbidden`` response."""
+    code = http_client.FORBIDDEN
+
+
+class PermissionDenied(Forbidden):
+    """Exception mapping a :prop:`grpc.StatusCode.PERMISSION_DENIED` error."""
+    grpc_status_code = (
+        grpc.StatusCode.PERMISSION_DENIED if grpc is not None else None)
+
+
+class NotFound(ClientError):
+    """Exception mapping a ``404 Not Found`` response or a
+    :prop:`grpc.StatusCode.NOT_FOUND` error."""
+    code = http_client.NOT_FOUND
+    grpc_status_code = (
+        grpc.StatusCode.NOT_FOUND if grpc is not None else None)
+
+
+class MethodNotAllowed(ClientError):
+    """Exception mapping a ``405 Method Not Allowed`` response."""
+    code = http_client.METHOD_NOT_ALLOWED
+
+
+class Conflict(ClientError):
+    """Exception mapping a ``409 Conflict`` response."""
+    code = http_client.CONFLICT
+
+
+class AlreadyExists(Conflict):
+    """Exception mapping a :prop:`grpc.StatusCode.ALREADY_EXISTS` error."""
+    grpc_status_code = (
+        grpc.StatusCode.ALREADY_EXISTS if grpc is not None else None)
+
+
+class Aborted(Conflict):
+    """Exception mapping a :prop:`grpc.StatusCode.ABORTED` error."""
+    grpc_status_code = (
+        grpc.StatusCode.ABORTED if grpc is not None else None)
+
+
+class LengthRequired(ClientError):
+    """Exception mapping a ``411 Length Required`` response."""
+    code = http_client.LENGTH_REQUIRED
+
+
+class PreconditionFailed(ClientError):
+    """Exception mapping a ``412 Precondition Failed`` response."""
+    code = http_client.PRECONDITION_FAILED
+
+
+class RequestRangeNotSatisfiable(ClientError):
+    """Exception mapping a ``416 Request Range Not Satisfiable`` response."""
+    code = http_client.REQUESTED_RANGE_NOT_SATISFIABLE
+
+
+class TooManyRequests(ClientError):
+    """Exception mapping a ``429 Too Many Requests`` response."""
+    # http_client does not define a constant for this in Python 2.
+    code = 429
+
+
+class ResourceExhausted(TooManyRequests):
+    """Exception mapping a :prop:`grpc.StatusCode.RESOURCE_EXHAUSTED` error."""
+    grpc_status_code = (
+        grpc.StatusCode.RESOURCE_EXHAUSTED if grpc is not None else None)
+
+
+class Cancelled(ClientError):
+    """Exception mapping a :prop:`grpc.StatusCode.CANCELLED` error."""
+    # This maps to HTTP status code 499. See
+    # https://github.com/googleapis/googleapis/blob/master/google/rpc\
+    # /code.proto
+    code = 499
+    grpc_status_code = grpc.StatusCode.CANCELLED if grpc is not None else None
+
+
+class ServerError(GoogleAPICallError):
+    """Base for 5xx responses."""
+
+
+class InternalServerError(ServerError):
+    """Exception mapping a ``500 Internal Server Error`` response. or a
+    :prop:`grpc.StatusCode.INTERNAL` error."""
+    code = http_client.INTERNAL_SERVER_ERROR
+    grpc_status_code = grpc.StatusCode.INTERNAL if grpc is not None else None
+
+
+class Unknown(ServerError):
+    """Exception mapping a :prop:`grpc.StatusCode.UNKNOWN` error."""
+    grpc_status_code = grpc.StatusCode.UNKNOWN if grpc is not None else None
+
+
+class DataLoss(ServerError):
+    """Exception mapping a :prop:`grpc.StatusCode.DATA_LOSS` error."""
+    grpc_status_code = grpc.StatusCode.DATA_LOSS if grpc is not None else None
+
+
+class MethodNotImplemented(ServerError):
+    """Exception mapping a ``501 Not Implemented`` response or a
+    :prop:`grpc.StatusCode.UNIMPLEMENTED` error."""
+    code = http_client.NOT_IMPLEMENTED
+    grpc_status_code = (
+        grpc.StatusCode.UNIMPLEMENTED if grpc is not None else None)
+
+
+class BadGateway(ServerError):
+    """Exception mapping a ``502 Bad Gateway`` response."""
+    code = http_client.BAD_GATEWAY
+
+
+class ServiceUnavailable(ServerError):
+    """Exception mapping a ``503 Service Unavailable`` response or a
+    :prop:`grpc.StatusCode.UNAVAILABLE` error."""
+    code = http_client.SERVICE_UNAVAILABLE
+    grpc_status_code = (
+        grpc.StatusCode.UNAVAILABLE if grpc is not None else None)
+
+
+class GatewayTimeout(ServerError):
+    """Exception mapping a ``504 Gateway Timeout`` response."""
+    code = http_client.GATEWAY_TIMEOUT
+
+
+class DeadlineExceeded(GatewayTimeout):
+    """Exception mapping a :prop:`grpc.StatusCode.DEADLINE_EXCEEDED` error."""
+    grpc_status_code = (
+        grpc.StatusCode.DEADLINE_EXCEEDED if grpc is not None else None)
+
+
+def exception_class_for_http_status(status_code):
+    """Return the exception class for a specific HTTP status code.
+
+    Args:
+        status_code (int): The HTTP status code.
+
+    Returns:
+        type: the appropriate subclass of :class:`GoogleAPICallError`.
+    """
+    return _HTTP_CODE_TO_EXCEPTION.get(status_code, GoogleAPICallError)
+
+
+def from_http_status(status_code, message, **kwargs):
+    """Create a :class:`GoogleAPICallError` from an HTTP status code.
+
+    Args:
+        status_code (int): The HTTP status code.
+        message (str): The exception message.
+        kwargs: Additional arguments passed to the :class:`GoogleAPICallError`
+            constructor.
+
+    Returns:
+        GoogleAPICallError: An instance of the appropriate subclass of
+            :class:`GoogleAPICallError`.
+    """
+    error_class = exception_class_for_http_status(status_code)
+    error = error_class(message, **kwargs)
+
+    if error.code is None:
+        error.code = status_code
+
+    return error
+
+
+def from_http_response(response):
+    """Create a :class:`GoogleAPICallError` from a :class:`requests.Response`.
+
+    Args:
+        response (requests.Response): The HTTP response.
+
+    Returns:
+        GoogleAPICallError: An instance of the appropriate subclass of
+            :class:`GoogleAPICallError`, with the message and errors populated
+            from the response.
+    """
+    try:
+        payload = response.json()
+    except ValueError:
+        payload = {'error': {'message': response.text or 'unknown error'}}
+
+    error_message = payload.get('error', {}).get('message', 'unknown error')
+    errors = payload.get('error', {}).get('errors', ())
+
+    message = '{method} {url}: {error}'.format(
+        method=response.request.method,
+        url=response.request.url,
+        error=error_message)
+
+    exception = from_http_status(
+        response.status_code, message, errors=errors, response=response)
+    return exception
+
+
+def exception_class_for_grpc_status(status_code):
+    """Return the exception class for a specific :class:`grpc.StatusCode`.
+
+    Args:
+        status_code (grpc.StatusCode): The gRPC status code.
+
+    Returns:
+        type: the appropriate subclass of :class:`GoogleAPICallError`.
+    """
+    return _GRPC_CODE_TO_EXCEPTION.get(status_code, GoogleAPICallError)
+
+
+def from_grpc_status(status_code, message, **kwargs):
+    """Create a :class:`GoogleAPICallError` from a :class:`grpc.StatusCode`.
+
+    Args:
+        status_code (grpc.StatusCode): The gRPC status code.
+        message (str): The exception message.
+        kwargs: Additional arguments passed to the :class:`GoogleAPICallError`
+            constructor.
+
+    Returns:
+        GoogleAPICallError: An instance of the appropriate subclass of
+            :class:`GoogleAPICallError`.
+    """
+    error_class = exception_class_for_grpc_status(status_code)
+    error = error_class(message, **kwargs)
+
+    if error.grpc_status_code is None:
+        error.grpc_status_code = status_code
+
+    return error
+
+
+def from_grpc_error(rpc_exc):
+    """Create a :class:`GoogleAPICallError` from a :class:`grpc.RpcError`.
+
+    Args:
+        rpc_exc (grpc.RpcError): The gRPC error.
+
+    Returns:
+        GoogleAPICallError: An instance of the appropriate subclass of
+            :class:`GoogleAPICallError`.
+    """
+    if isinstance(rpc_exc, grpc.Call):
+        return from_grpc_status(
+            rpc_exc.code(),
+            rpc_exc.details(),
+            errors=(rpc_exc,),
+            response=rpc_exc)
+    else:
+        return GoogleAPICallError(
+            str(rpc_exc), errors=(rpc_exc,), response=rpc_exc)
diff --git a/core/google/cloud/exceptions.py b/core/google/cloud/exceptions.py
index 2e7eca3be98dd..a5d82be304525 100644
--- a/core/google/cloud/exceptions.py
+++ b/core/google/cloud/exceptions.py
@@ -12,240 +12,48 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Custom exceptions for :mod:`google.cloud` package.
+# pylint: disable=invalid-name
+# pylint recognizies all of these aliases as constants and thinks they have
+# invalid names.
 
-See https://cloud.google.com/storage/docs/json_api/v1/status-codes
-"""
+"""Custom exceptions for :mod:`google.cloud` package."""
 
 # Avoid the grpc and google.cloud.grpc collision.
 from __future__ import absolute_import
 
-import copy
-
-import six
-
-from google.cloud._helpers import _to_bytes
+from google.api.core import exceptions
 
 try:
     from grpc._channel import _Rendezvous
 except ImportError:  # pragma: NO COVER
     _Rendezvous = None
 
-_HTTP_CODE_TO_EXCEPTION = {}  # populated at end of module
-
-
-# pylint: disable=invalid-name
 GrpcRendezvous = _Rendezvous
 """Exception class raised by gRPC stable."""
-# pylint: enable=invalid-name
-
-
-class GoogleCloudError(Exception):
-    """Base error class for Google Cloud errors (abstract).
-
-    Each subclass represents a single type of HTTP error response.
-    """
-    code = None
-    """HTTP status code.  Concrete subclasses *must* define.
-
-    See http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
-    """
-
-    def __init__(self, message, errors=()):
-        super(GoogleCloudError, self).__init__(message)
-        self.message = message
-        self._errors = errors
-
-    def __str__(self):
-        result = u'%d %s' % (self.code, self.message)
-        if six.PY2:
-            result = _to_bytes(result, 'utf-8')
-        return result
-
-    @property
-    def errors(self):
-        """Detailed error information.
-
-        :rtype: list(dict)
-        :returns: a list of mappings describing each error.
-        """
-        return [copy.deepcopy(error) for error in self._errors]
-
-
-class Redirection(GoogleCloudError):
-    """Base for 3xx responses
-
-    This class is abstract.
-    """
-
-
-class MovedPermanently(Redirection):
-    """Exception mapping a '301 Moved Permanently' response."""
-    code = 301
-
-
-class NotModified(Redirection):
-    """Exception mapping a '304 Not Modified' response."""
-    code = 304
-
-
-class TemporaryRedirect(Redirection):
-    """Exception mapping a '307 Temporary Redirect' response."""
-    code = 307
-
-
-class ResumeIncomplete(Redirection):
-    """Exception mapping a '308 Resume Incomplete' response."""
-    code = 308
-
-
-class ClientError(GoogleCloudError):
-    """Base for 4xx responses
-
-    This class is abstract
-    """
-
-
-class BadRequest(ClientError):
-    """Exception mapping a '400 Bad Request' response."""
-    code = 400
-
-
-class Unauthorized(ClientError):
-    """Exception mapping a '401 Unauthorized' response."""
-    code = 401
-
-
-class Forbidden(ClientError):
-    """Exception mapping a '403 Forbidden' response."""
-    code = 403
-
-
-class NotFound(ClientError):
-    """Exception mapping a '404 Not Found' response."""
-    code = 404
-
-
-class MethodNotAllowed(ClientError):
-    """Exception mapping a '405 Method Not Allowed' response."""
-    code = 405
-
-
-class Conflict(ClientError):
-    """Exception mapping a '409 Conflict' response."""
-    code = 409
-
-
-class LengthRequired(ClientError):
-    """Exception mapping a '411 Length Required' response."""
-    code = 411
-
-
-class PreconditionFailed(ClientError):
-    """Exception mapping a '412 Precondition Failed' response."""
-    code = 412
-
-
-class RequestRangeNotSatisfiable(ClientError):
-    """Exception mapping a '416 Request Range Not Satisfiable' response."""
-    code = 416
-
-
-class TooManyRequests(ClientError):
-    """Exception mapping a '429 Too Many Requests' response."""
-    code = 429
-
-
-class ServerError(GoogleCloudError):
-    """Base for 5xx responses:  (abstract)"""
-
-
-class InternalServerError(ServerError):
-    """Exception mapping a '500 Internal Server Error' response."""
-    code = 500
-
-
-class MethodNotImplemented(ServerError):
-    """Exception mapping a '501 Not Implemented' response."""
-    code = 501
-
-
-class BadGateway(ServerError):
-    """Exception mapping a '502 Bad Gateway' response."""
-    code = 502
-
-
-class ServiceUnavailable(ServerError):
-    """Exception mapping a '503 Service Unavailable' response."""
-    code = 503
-
-
-class GatewayTimeout(ServerError):
-    """Exception mapping a `504 Gateway Timeout'` response."""
-    code = 504
-
-
-def from_http_status(status_code, message, errors=()):
-    """Create a :class:`GoogleCloudError` from an HTTP status code.
-
-    Args:
-        status_code (int): The HTTP status code.
-        message (str): The exception message.
-        errors (Sequence[Any]): A list of additional error information.
-
-    Returns:
-        GoogleCloudError: An instance of the appropriate subclass of
-            :class:`GoogleCloudError`.
-    """
-    error_class = _HTTP_CODE_TO_EXCEPTION.get(status_code, GoogleCloudError)
-    error = error_class(message, errors)
-
-    if error.code is None:
-        error.code = status_code
-
-    return error
-
-
-def from_http_response(response):
-    """Create a :class:`GoogleCloudError` from a :class:`requests.Response`.
-
-    Args:
-        response (requests.Response): The HTTP response.
-
-    Returns:
-        GoogleCloudError: An instance of the appropriate subclass of
-            :class:`GoogleCloudError`, with the message and errors populated
-            from the response.
-    """
-    try:
-        payload = response.json()
-    except ValueError:
-        payload = {'error': {'message': response.text or 'unknown error'}}
-
-    error_message = payload.get('error', {}).get('message', 'unknown error')
-    errors = payload.get('error', {}).get('errors', ())
-
-    message = '{method} {url}: {error}'.format(
-        method=response.request.method,
-        url=response.request.url,
-        error=error_message)
-
-    exception = from_http_status(
-        response.status_code, message, errors=errors)
-    exception.response = response
-    return exception
-
-
-def _walk_subclasses(klass):
-    """Recursively walk subclass tree."""
-    for sub in klass.__subclasses__():
-        yield sub
-        for subsub in _walk_subclasses(sub):
-            yield subsub
-
 
-# Build the code->exception class mapping.
-for _eklass in _walk_subclasses(GoogleCloudError):
-    code = getattr(_eklass, 'code', None)
-    if code is not None:
-        _HTTP_CODE_TO_EXCEPTION[code] = _eklass
+# Aliases to moved classes.
+GoogleCloudError = exceptions.GoogleAPICallError
+Redirection = exceptions.Redirection
+MovedPermanently = exceptions.MovedPermanently
+NotModified = exceptions.NotModified
+TemporaryRedirect = exceptions.TemporaryRedirect
+ResumeIncomplete = exceptions.ResumeIncomplete
+ClientError = exceptions.ClientError
+BadRequest = exceptions.BadRequest
+Unauthorized = exceptions.Unauthorized
+Forbidden = exceptions.Forbidden
+NotFound = exceptions.NotFound
+MethodNotAllowed = exceptions.MethodNotAllowed
+Conflict = exceptions.Conflict
+LengthRequired = exceptions.LengthRequired
+PreconditionFailed = exceptions.PreconditionFailed
+RequestRangeNotSatisfiable = exceptions.RequestRangeNotSatisfiable
+TooManyRequests = exceptions.TooManyRequests
+ServerError = exceptions.ServerError
+InternalServerError = exceptions.InternalServerError
+MethodNotImplemented = exceptions.MethodNotImplemented
+BadGateway = exceptions.BadGateway
+ServiceUnavailable = exceptions.ServiceUnavailable
+GatewayTimeout = exceptions.GatewayTimeout
+from_http_status = exceptions.from_http_status
+from_http_response = exceptions.from_http_response
diff --git a/core/google/cloud/obselete.py b/core/google/cloud/obselete.py
index 9af28cd85d526..cd70025946f76 100644
--- a/core/google/cloud/obselete.py
+++ b/core/google/cloud/obselete.py
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+"""Helpers for deprecated code and modules."""
+
 import warnings
 
 import pkg_resources
diff --git a/core/nox.py b/core/nox.py
index 1dca10eb9b694..b795ddfce7a67 100644
--- a/core/nox.py
+++ b/core/nox.py
@@ -43,6 +43,7 @@ def unit_tests(session, python_version):
         'py.test',
         '--quiet',
         '--cov=google.cloud',
+        '--cov=google.api.core',
         '--cov=tests.unit',
         '--cov-append',
         '--cov-config=.coveragerc',
diff --git a/core/tests/unit/api_core/__init__.py b/core/tests/unit/api_core/__init__.py
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/core/tests/unit/api_core/test_exceptions.py b/core/tests/unit/api_core/test_exceptions.py
new file mode 100644
index 0000000000000..f29873e7b3d84
--- /dev/null
+++ b/core/tests/unit/api_core/test_exceptions.py
@@ -0,0 +1,201 @@
+# Copyright 2014 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import json
+
+import grpc
+import mock
+import requests
+from six.moves import http_client
+
+from google.api.core import exceptions
+
+
+def test_create_google_cloud_error():
+    exception = exceptions.GoogleAPICallError('Testing')
+    exception.code = 600
+    assert str(exception) == '600 Testing'
+    assert exception.message == 'Testing'
+    assert exception.errors == []
+    assert exception.response is None
+
+
+def test_create_google_cloud_error_with_args():
+    error = {
+        'domain': 'global',
+        'location': 'test',
+        'locationType': 'testing',
+        'message': 'Testing',
+        'reason': 'test',
+    }
+    response = mock.sentinel.response
+    exception = exceptions.GoogleAPICallError(
+        'Testing', [error], response=response)
+    exception.code = 600
+    assert str(exception) == '600 Testing'
+    assert exception.message == 'Testing'
+    assert exception.errors == [error]
+    assert exception.response == response
+
+
+def test_from_http_status():
+    message = 'message'
+    exception = exceptions.from_http_status(http_client.NOT_FOUND, message)
+    assert exception.code == http_client.NOT_FOUND
+    assert exception.message == message
+    assert exception.errors == []
+
+
+def test_from_http_status_with_errors_and_response():
+    message = 'message'
+    errors = ['1', '2']
+    response = mock.sentinel.response
+    exception = exceptions.from_http_status(
+        http_client.NOT_FOUND, message, errors=errors, response=response)
+
+    assert isinstance(exception, exceptions.NotFound)
+    assert exception.code == http_client.NOT_FOUND
+    assert exception.message == message
+    assert exception.errors == errors
+    assert exception.response == response
+
+
+def test_from_http_status_unknown_code():
+    message = 'message'
+    status_code = 156
+    exception = exceptions.from_http_status(status_code, message)
+    assert exception.code == status_code
+    assert exception.message == message
+
+
+def make_response(content):
+    response = requests.Response()
+    response._content = content
+    response.status_code = http_client.NOT_FOUND
+    response.request = requests.Request(
+        method='POST', url='https://example.com').prepare()
+    return response
+
+
+def test_from_http_response_no_content():
+    response = make_response(None)
+
+    exception = exceptions.from_http_response(response)
+
+    assert isinstance(exception, exceptions.NotFound)
+    assert exception.code == http_client.NOT_FOUND
+    assert exception.message == 'POST https://example.com/: unknown error'
+    assert exception.response == response
+
+
+def test_from_http_response_text_content():
+    response = make_response(b'message')
+
+    exception = exceptions.from_http_response(response)
+
+    assert isinstance(exception, exceptions.NotFound)
+    assert exception.code == http_client.NOT_FOUND
+    assert exception.message == 'POST https://example.com/: message'
+
+
+def test_from_http_response_json_content():
+    response = make_response(json.dumps({
+        'error': {
+            'message': 'json message',
+            'errors': ['1', '2']
+        }
+    }).encode('utf-8'))
+
+    exception = exceptions.from_http_response(response)
+
+    assert isinstance(exception, exceptions.NotFound)
+    assert exception.code == http_client.NOT_FOUND
+    assert exception.message == 'POST https://example.com/: json message'
+    assert exception.errors == ['1', '2']
+
+
+def test_from_http_response_bad_json_content():
+    response = make_response(json.dumps({'meep': 'moop'}).encode('utf-8'))
+
+    exception = exceptions.from_http_response(response)
+
+    assert isinstance(exception, exceptions.NotFound)
+    assert exception.code == http_client.NOT_FOUND
+    assert exception.message == 'POST https://example.com/: unknown error'
+
+
+def test_from_grpc_status():
+    message = 'message'
+    exception = exceptions.from_grpc_status(
+        grpc.StatusCode.OUT_OF_RANGE, message)
+    assert isinstance(exception, exceptions.BadRequest)
+    assert isinstance(exception, exceptions.OutOfRange)
+    assert exception.code == http_client.BAD_REQUEST
+    assert exception.grpc_status_code == grpc.StatusCode.OUT_OF_RANGE
+    assert exception.message == message
+    assert exception.errors == []
+
+
+def test_from_grpc_status_with_errors_and_response():
+    message = 'message'
+    response = mock.sentinel.response
+    errors = ['1', '2']
+    exception = exceptions.from_grpc_status(
+        grpc.StatusCode.OUT_OF_RANGE, message,
+        errors=errors, response=response)
+
+    assert isinstance(exception, exceptions.OutOfRange)
+    assert exception.message == message
+    assert exception.errors == errors
+    assert exception.response == response
+
+
+def test_from_grpc_status_unknown_code():
+    message = 'message'
+    exception = exceptions.from_grpc_status(
+        grpc.StatusCode.OK, message)
+    assert exception.grpc_status_code == grpc.StatusCode.OK
+    assert exception.message == message
+
+
+def test_from_grpc_error():
+    message = 'message'
+    error = mock.create_autospec(grpc.Call, instance=True)
+    error.code.return_value = grpc.StatusCode.INVALID_ARGUMENT
+    error.details.return_value = message
+
+    exception = exceptions.from_grpc_error(error)
+
+    assert isinstance(exception, exceptions.BadRequest)
+    assert isinstance(exception, exceptions.InvalidArgument)
+    assert exception.code == http_client.BAD_REQUEST
+    assert exception.grpc_status_code == grpc.StatusCode.INVALID_ARGUMENT
+    assert exception.message == message
+    assert exception.errors == [error]
+    assert exception.response == error
+
+
+def test_from_grpc_error_non_call():
+    message = 'message'
+    error = mock.create_autospec(grpc.RpcError, instance=True)
+    error.__str__.return_value = message
+
+    exception = exceptions.from_grpc_error(error)
+
+    assert isinstance(exception, exceptions.GoogleAPICallError)
+    assert exception.code is None
+    assert exception.grpc_status_code is None
+    assert exception.message == message
+    assert exception.errors == [error]
+    assert exception.response == error

From 90e6fe704d8632673ccb7b9ee5532a08cda96f9d Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Tue, 8 Aug 2017 10:36:47 -0700
Subject: [PATCH 169/211] Bump GAX dependency to 0.15.14. (#3752)

---
 language/setup.py          | 2 +-
 speech/setup.py            | 2 +-
 videointelligence/setup.py | 2 +-
 vision/setup.py            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/language/setup.py b/language/setup.py
index 0b7152fd89fd9..7180ed0b2cfb4 100644
--- a/language/setup.py
+++ b/language/setup.py
@@ -52,7 +52,7 @@
 
 REQUIREMENTS = [
     'google-cloud-core >= 0.26.0, < 0.27dev',
-    'google-gax >= 0.15.13, < 0.16dev',
+    'google-gax >= 0.15.14, < 0.16dev',
     'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',
 ]
 EXTRAS_REQUIRE = {
diff --git a/speech/setup.py b/speech/setup.py
index 6587ceec47790..8bb1208572f33 100644
--- a/speech/setup.py
+++ b/speech/setup.py
@@ -53,7 +53,7 @@
 
 REQUIREMENTS = [
     'google-cloud-core >= 0.26.0, < 0.27dev',
-    'google-gax >= 0.15.13, < 0.16dev',
+    'google-gax >= 0.15.14, < 0.16dev',
     'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',
 ]
 
diff --git a/videointelligence/setup.py b/videointelligence/setup.py
index a47f897e38554..3c7b64622a256 100644
--- a/videointelligence/setup.py
+++ b/videointelligence/setup.py
@@ -43,7 +43,7 @@
     packages=find_packages(exclude=('tests*',)),
     install_requires=(
         'googleapis-common-protos >= 1.5.2, < 2.0dev',
-        'google-gax >= 0.15.12, < 0.16dev',
+        'google-gax >= 0.15.14, < 0.16dev',
         'six >= 1.10.0',
     ),
     url='https://github.com/GoogleCloudPlatform/google-cloud-python',
diff --git a/vision/setup.py b/vision/setup.py
index 7567a30d0e53d..c4fbeaeaffabe 100644
--- a/vision/setup.py
+++ b/vision/setup.py
@@ -26,7 +26,7 @@
 
 REQUIREMENTS = [
     'google-cloud-core >= 0.26.0, < 0.27dev',
-    'google-gax >= 0.15.13, < 0.16dev',
+    'google-gax >= 0.15.14, < 0.16dev',
     'googleapis-common-protos[grpc] >= 1.5.2, < 2.0dev',
 ]
 EXTRAS_REQUIRE = {

From aaaaf7d635794260adee82b4b634d5cb2c7a4a8d Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Tue, 8 Aug 2017 12:36:20 -0700
Subject: [PATCH 170/211] Reference valid input formats in API docs. (#3758)

---
 bigquery/google/cloud/bigquery/table.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/table.py b/bigquery/google/cloud/bigquery/table.py
index ffbd47ca6c4c2..c6bf5db893abd 100644
--- a/bigquery/google/cloud/bigquery/table.py
+++ b/bigquery/google/cloud/bigquery/table.py
@@ -1045,9 +1045,10 @@ def upload_from_file(self,
         :param file_obj: A file handle opened in binary mode for reading.
 
         :type source_format: str
-        :param source_format: one of 'CSV' or 'NEWLINE_DELIMITED_JSON'.
-                              job configuration option; see
-                              :meth:`google.cloud.bigquery.job.LoadJob`
+        :param source_format: Any supported format. The full list of supported
+            formats is documented under the
+            ``configuration.extract.destinationFormat`` property on this page:
+            https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs
 
         :type rewind: bool
         :param rewind: If True, seek to the beginning of the file handle before

From 1ff7708fba64f289a957214dd089f224b74f2467 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Tue, 8 Aug 2017 12:37:24 -0700
Subject: [PATCH 171/211] Make exclude_from_indexes a set, and public API.
 (#3756)

---
 datastore/google/cloud/datastore/entity.py | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/datastore/google/cloud/datastore/entity.py b/datastore/google/cloud/datastore/entity.py
index dc8a60b038bef..e74d5aa640eeb 100644
--- a/datastore/google/cloud/datastore/entity.py
+++ b/datastore/google/cloud/datastore/entity.py
@@ -129,8 +129,9 @@ class Entity(dict):
     def __init__(self, key=None, exclude_from_indexes=()):
         super(Entity, self).__init__()
         self.key = key
-        self._exclude_from_indexes = set(_ensure_tuple_or_list(
+        self.exclude_from_indexes = set(_ensure_tuple_or_list(
             'exclude_from_indexes', exclude_from_indexes))
+        """Names of fields which are *not* to be indexed for this entity."""
         # NOTE: This will be populated when parsing a protobuf in
         #       google.cloud.datastore.helpers.entity_from_protobuf.
         self._meanings = {}
@@ -148,7 +149,7 @@ def __eq__(self, other):
             return False
 
         return (self.key == other.key and
-                self._exclude_from_indexes == other._exclude_from_indexes and
+                self.exclude_from_indexes == other.exclude_from_indexes and
                 self._meanings == other._meanings and
                 super(Entity, self).__eq__(other))
 
@@ -176,15 +177,6 @@ def kind(self):
         if self.key:
             return self.key.kind
 
-    @property
-    def exclude_from_indexes(self):
-        """Names of fields which are *not* to be indexed for this entity.
-
-        :rtype: sequence of field names
-        :returns: The set of fields excluded from indexes.
-        """
-        return frozenset(self._exclude_from_indexes)
-
     def __repr__(self):
         if self.key:
             return '<Entity%s %s>' % (self.key._flat_path,

From cdadf4c7dc891ad88bbb53d8a61b6ff019de2c9a Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Tue, 8 Aug 2017 14:03:04 -0700
Subject: [PATCH 172/211] Move google.cloud.future to google.api.core (#3764)

---
 bigquery/google/cloud/bigquery/job.py         |  6 ++--
 bigtable/google/cloud/bigtable/cluster.py     |  2 +-
 bigtable/google/cloud/bigtable/instance.py    |  2 +-
 bigtable/tests/unit/test_cluster.py           |  4 +--
 bigtable/tests/unit/test_instance.py          |  4 +--
 .../{cloud => api/core}/future/__init__.py    |  2 +-
 .../{cloud => api/core}/future/_helpers.py    |  0
 .../google/{cloud => api/core}/future/base.py |  0
 .../{cloud => api/core}/future/polling.py     |  4 +--
 .../{cloud/future => api/core}/operation.py   | 35 +++++++++++++++----
 .../unit/{ => api_core}/future/__init__.py    |  0
 .../{ => api_core}/future/test__helpers.py    |  2 +-
 .../{ => api_core}/future/test_polling.py     |  2 +-
 .../{future => api_core}/test_operation.py    |  2 +-
 spanner/google/cloud/spanner/database.py      |  4 +--
 spanner/google/cloud/spanner/instance.py      |  4 +--
 16 files changed, 48 insertions(+), 25 deletions(-)
 rename core/google/{cloud => api/core}/future/__init__.py (93%)
 rename core/google/{cloud => api/core}/future/_helpers.py (100%)
 rename core/google/{cloud => api/core}/future/base.py (100%)
 rename core/google/{cloud => api/core}/future/polling.py (98%)
 rename core/google/{cloud/future => api/core}/operation.py (91%)
 rename core/tests/unit/{ => api_core}/future/__init__.py (100%)
 rename core/tests/unit/{ => api_core}/future/test__helpers.py (96%)
 rename core/tests/unit/{ => api_core}/future/test_polling.py (98%)
 rename core/tests/unit/{future => api_core}/test_operation.py (99%)

diff --git a/bigquery/google/cloud/bigquery/job.py b/bigquery/google/cloud/bigquery/job.py
index 1519e2a0cf6e8..43d7fd8f23c31 100644
--- a/bigquery/google/cloud/bigquery/job.py
+++ b/bigquery/google/cloud/bigquery/job.py
@@ -19,6 +19,7 @@
 import six
 from six.moves import http_client
 
+import google.api.core.future.polling
 from google.cloud import exceptions
 from google.cloud.exceptions import NotFound
 from google.cloud._helpers import _datetime_from_microseconds
@@ -31,7 +32,6 @@
 from google.cloud.bigquery._helpers import UDFResourcesProperty
 from google.cloud.bigquery._helpers import _EnumProperty
 from google.cloud.bigquery._helpers import _TypedProperty
-import google.cloud.future.polling
 
 _DONE_STATE = 'DONE'
 _STOPPED_REASON = 'stopped'
@@ -140,7 +140,7 @@ class WriteDisposition(_EnumProperty):
     WRITE_EMPTY = 'WRITE_EMPTY'
 
 
-class _AsyncJob(google.cloud.future.polling.PollingFuture):
+class _AsyncJob(google.api.core.future.polling.PollingFuture):
     """Base class for asynchronous jobs.
 
     :type name: str
@@ -496,7 +496,7 @@ def cancelled(self):
 
         This always returns False. It's not possible to check if a job was
         cancelled in the API. This method is here to satisfy the interface
-        for :class:`google.cloud.future.Future`.
+        for :class:`google.api.core.future.Future`.
 
         :rtype: bool
         :returns: False
diff --git a/bigtable/google/cloud/bigtable/cluster.py b/bigtable/google/cloud/bigtable/cluster.py
index 8d15547efae38..09a34e11bb05e 100644
--- a/bigtable/google/cloud/bigtable/cluster.py
+++ b/bigtable/google/cloud/bigtable/cluster.py
@@ -17,11 +17,11 @@
 
 import re
 
+from google.api.core import operation
 from google.cloud.bigtable._generated import (
     instance_pb2 as data_v2_pb2)
 from google.cloud.bigtable._generated import (
     bigtable_instance_admin_pb2 as messages_v2_pb2)
-from google.cloud.future import operation
 
 _CLUSTER_NAME_RE = re.compile(r'^projects/(?P<project>[^/]+)/'
                               r'instances/(?P<instance>[^/]+)/clusters/'
diff --git a/bigtable/google/cloud/bigtable/instance.py b/bigtable/google/cloud/bigtable/instance.py
index 958f166029533..5e73ed2ba661f 100644
--- a/bigtable/google/cloud/bigtable/instance.py
+++ b/bigtable/google/cloud/bigtable/instance.py
@@ -17,6 +17,7 @@
 
 import re
 
+from google.api.core import operation
 from google.cloud.bigtable._generated import (
     instance_pb2 as data_v2_pb2)
 from google.cloud.bigtable._generated import (
@@ -26,7 +27,6 @@
 from google.cloud.bigtable.cluster import Cluster
 from google.cloud.bigtable.cluster import DEFAULT_SERVE_NODES
 from google.cloud.bigtable.table import Table
-from google.cloud.future import operation
 
 
 _EXISTING_INSTANCE_LOCATION_ID = 'see-existing-cluster'
diff --git a/bigtable/tests/unit/test_cluster.py b/bigtable/tests/unit/test_cluster.py
index e244b55d6dff6..8ed54846d18ec 100644
--- a/bigtable/tests/unit/test_cluster.py
+++ b/bigtable/tests/unit/test_cluster.py
@@ -233,8 +233,8 @@ def test_reload(self):
         self.assertEqual(cluster.location, LOCATION)
 
     def test_create(self):
+        from google.api.core import operation
         from google.longrunning import operations_pb2
-        from google.cloud.future import operation
         from google.cloud.bigtable._generated import (
             bigtable_instance_admin_pb2 as messages_v2_pb2)
         from tests.unit._testing import _FakeStub
@@ -275,8 +275,8 @@ def test_create(self):
 
     def test_update(self):
         import datetime
+        from google.api.core import operation
         from google.longrunning import operations_pb2
-        from google.cloud.future import operation
         from google.protobuf.any_pb2 import Any
         from google.cloud._helpers import _datetime_to_pb_timestamp
         from google.cloud.bigtable._generated import (
diff --git a/bigtable/tests/unit/test_instance.py b/bigtable/tests/unit/test_instance.py
index 03c0034fc49e8..ce475e0d5a669 100644
--- a/bigtable/tests/unit/test_instance.py
+++ b/bigtable/tests/unit/test_instance.py
@@ -232,13 +232,13 @@ def test_reload(self):
 
     def test_create(self):
         import datetime
+        from google.api.core import operation
         from google.longrunning import operations_pb2
         from google.protobuf.any_pb2 import Any
         from google.cloud.bigtable._generated import (
             bigtable_instance_admin_pb2 as messages_v2_pb2)
         from google.cloud._helpers import _datetime_to_pb_timestamp
         from tests.unit._testing import _FakeStub
-        from google.cloud.future import operation
         from google.cloud.bigtable.cluster import DEFAULT_SERVE_NODES
 
         NOW = datetime.datetime.utcnow()
@@ -285,11 +285,11 @@ def test_create(self):
         self.assertEqual(kwargs, {})
 
     def test_create_w_explicit_serve_nodes(self):
+        from google.api.core import operation
         from google.longrunning import operations_pb2
         from google.cloud.bigtable._generated import (
             bigtable_instance_admin_pb2 as messages_v2_pb2)
         from tests.unit._testing import _FakeStub
-        from google.cloud.future import operation
 
         SERVE_NODES = 5
 
diff --git a/core/google/cloud/future/__init__.py b/core/google/api/core/future/__init__.py
similarity index 93%
rename from core/google/cloud/future/__init__.py
rename to core/google/api/core/future/__init__.py
index e5cf2b20ce7ed..a61510d307e62 100644
--- a/core/google/cloud/future/__init__.py
+++ b/core/google/api/core/future/__init__.py
@@ -14,7 +14,7 @@
 
 """Futures for dealing with asynchronous operations."""
 
-from google.cloud.future.base import Future
+from google.api.core.future.base import Future
 
 __all__ = [
     'Future',
diff --git a/core/google/cloud/future/_helpers.py b/core/google/api/core/future/_helpers.py
similarity index 100%
rename from core/google/cloud/future/_helpers.py
rename to core/google/api/core/future/_helpers.py
diff --git a/core/google/cloud/future/base.py b/core/google/api/core/future/base.py
similarity index 100%
rename from core/google/cloud/future/base.py
rename to core/google/api/core/future/base.py
diff --git a/core/google/cloud/future/polling.py b/core/google/api/core/future/polling.py
similarity index 98%
rename from core/google/cloud/future/polling.py
rename to core/google/api/core/future/polling.py
index 6b7ae4221f64f..40380d6ad938d 100644
--- a/core/google/cloud/future/polling.py
+++ b/core/google/api/core/future/polling.py
@@ -22,8 +22,8 @@
 import six
 import tenacity
 
-from google.cloud.future import _helpers
-from google.cloud.future import base
+from google.api.core.future import _helpers
+from google.api.core.future import base
 
 
 class PollingFuture(base.Future):
diff --git a/core/google/cloud/future/operation.py b/core/google/api/core/operation.py
similarity index 91%
rename from core/google/cloud/future/operation.py
rename to core/google/api/core/operation.py
index ec430cd9c55b4..1cc44f0b3d7bc 100644
--- a/core/google/cloud/future/operation.py
+++ b/core/google/api/core/operation.py
@@ -12,14 +12,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Futures for long-running operations returned from Google Cloud APIs."""
+"""Futures for long-running operations returned from Google Cloud APIs.
+
+These futures can be used to synchronously wait for the result of a
+long-running operation using :meth:`Operation.result`:
+
+
+.. code-block:: python
+
+    operation = my_api_client.long_running_method()
+    result = operation.result()
+
+Or asynchronously using callbacks and :meth:`Operation.add_done_callback`:
+
+.. code-block:: python
+
+    operation = my_api_client.long_running_method()
+
+    def my_callback(future):
+        result = future.result()
+
+    operation.add_done_callback(my_callback)
+
+"""
 
 import functools
 import threading
 
+from google.api.core import exceptions
+from google.api.core.future import polling
 from google.cloud import _helpers
-from google.cloud import exceptions
-from google.cloud.future import polling
 from google.longrunning import operations_pb2
 from google.protobuf import json_format
 from google.rpc import code_pb2
@@ -85,12 +107,13 @@ def _set_result_from_operation(self):
                     self._result_type, self._operation.response)
                 self.set_result(response)
             elif self._operation.HasField('error'):
-                exception = exceptions.GoogleCloudError(
+                exception = exceptions.GoogleAPICallError(
                     self._operation.error.message,
-                    errors=(self._operation.error))
+                    errors=(self._operation.error),
+                    response=self._operation)
                 self.set_exception(exception)
             else:
-                exception = exceptions.GoogleCloudError(
+                exception = exceptions.GoogleAPICallError(
                     'Unexpected state: Long-running operation had neither '
                     'response nor error set.')
                 self.set_exception(exception)
diff --git a/core/tests/unit/future/__init__.py b/core/tests/unit/api_core/future/__init__.py
similarity index 100%
rename from core/tests/unit/future/__init__.py
rename to core/tests/unit/api_core/future/__init__.py
diff --git a/core/tests/unit/future/test__helpers.py b/core/tests/unit/api_core/future/test__helpers.py
similarity index 96%
rename from core/tests/unit/future/test__helpers.py
rename to core/tests/unit/api_core/future/test__helpers.py
index cbca5ba4d4df8..534dd3696cb97 100644
--- a/core/tests/unit/future/test__helpers.py
+++ b/core/tests/unit/api_core/future/test__helpers.py
@@ -14,7 +14,7 @@
 
 import mock
 
-from google.cloud.future import _helpers
+from google.api.core.future import _helpers
 
 
 @mock.patch('threading.Thread', autospec=True)
diff --git a/core/tests/unit/future/test_polling.py b/core/tests/unit/api_core/future/test_polling.py
similarity index 98%
rename from core/tests/unit/future/test_polling.py
rename to core/tests/unit/api_core/future/test_polling.py
index c8fde1c203850..a359ba1a2152c 100644
--- a/core/tests/unit/future/test_polling.py
+++ b/core/tests/unit/api_core/future/test_polling.py
@@ -19,7 +19,7 @@
 import mock
 import pytest
 
-from google.cloud.future import polling
+from google.api.core.future import polling
 
 
 class PollingFutureImpl(polling.PollingFuture):
diff --git a/core/tests/unit/future/test_operation.py b/core/tests/unit/api_core/test_operation.py
similarity index 99%
rename from core/tests/unit/future/test_operation.py
rename to core/tests/unit/api_core/test_operation.py
index 2d281694001a7..2332c50fdf4b4 100644
--- a/core/tests/unit/future/test_operation.py
+++ b/core/tests/unit/api_core/test_operation.py
@@ -15,7 +15,7 @@
 
 import mock
 
-from google.cloud.future import operation
+from google.api.core import operation
 from google.longrunning import operations_pb2
 from google.protobuf import struct_pb2
 from google.rpc import code_pb2
diff --git a/spanner/google/cloud/spanner/database.py b/spanner/google/cloud/spanner/database.py
index acfcefdce891a..38dc1c7eaaf88 100644
--- a/spanner/google/cloud/spanner/database.py
+++ b/spanner/google/cloud/spanner/database.py
@@ -185,7 +185,7 @@ def create(self):
         See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.CreateDatabase
 
-        :rtype: :class:`~google.cloud.future.operation.Operation`
+        :rtype: :class:`~google.api.core.operation.Operation`
         :returns: a future used to poll the status of the create request
         :raises Conflict: if the database already exists
         :raises NotFound: if the instance owning the database does not exist
@@ -269,7 +269,7 @@ def update_ddl(self, ddl_statements):
         See
         https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.UpdateDatabase
 
-        :rtype: :class:`google.cloud.future.operation.Operation`
+        :rtype: :class:`google.api.core.operation.Operation`
         :returns: an operation instance
         :raises NotFound: if the database does not exist
         :raises GaxError:
diff --git a/spanner/google/cloud/spanner/instance.py b/spanner/google/cloud/spanner/instance.py
index 5bd4663764f5d..4a51c70557316 100644
--- a/spanner/google/cloud/spanner/instance.py
+++ b/spanner/google/cloud/spanner/instance.py
@@ -198,7 +198,7 @@ def create(self):
 
            before calling :meth:`create`.
 
-        :rtype: :class:`google.cloud.future.operation.Operation`
+        :rtype: :class:`google.api.core.operation.Operation`
         :returns: an operation instance
         :raises Conflict: if the instance already exists
         :raises GaxError:
@@ -289,7 +289,7 @@ def update(self):
 
             before calling :meth:`update`.
 
-        :rtype: :class:`google.cloud.future.operation.Operation`
+        :rtype: :class:`google.api.core.operation.Operation`
         :returns: an operation instance
         :raises NotFound: if the instance does not exist
         :raises GaxError: for other errors returned from the call

From 90834d1dbbc29b7fbbd463cdb64c8d44f907af40 Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Tue, 8 Aug 2017 14:50:31 -0700
Subject: [PATCH 173/211] Use latest/ directory for docs instead of stable/
 (#3766)

See also
https://github.com/GoogleCloudPlatform/google-cloud-python/pull/3763

$ sed -i '' 's/googlecloudplatform.github.io\/google-cloud-python\/stable\//googlecloudplatform.github.io\/google-cloud-python\/latest\//g' **/*.rst
---
 README.rst                  | 2 +-
 bigquery/README.rst         | 4 ++--
 bigtable/README.rst         | 2 +-
 core/README.rst             | 2 +-
 datastore/README.rst        | 4 ++--
 dns/README.rst              | 2 +-
 error_reporting/README.rst  | 2 +-
 language/README.rst         | 2 +-
 logging/README.rst          | 4 ++--
 monitoring/README.rst       | 4 ++--
 pubsub/README.rst           | 4 ++--
 resource_manager/README.rst | 4 ++--
 speech/README.rst           | 4 ++--
 storage/README.rst          | 4 ++--
 trace/README.rst            | 6 +++---
 translate/README.rst        | 2 +-
 vision/README.rst           | 2 +-
 17 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/README.rst b/README.rst
index 65e07164bac5b..af1fc5c07b97f 100644
--- a/README.rst
+++ b/README.rst
@@ -12,7 +12,7 @@ Google Cloud Python Client
 -  `Read The Docs Documentation`_
 
 .. _Homepage: https://googlecloudplatform.github.io/google-cloud-python/
-.. _API Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/
+.. _API Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/
 .. _Read The Docs Documentation: https://google-cloud-python.readthedocs.io/en/latest/
 
 The following client libraries have **GA** support:
diff --git a/bigquery/README.rst b/bigquery/README.rst
index 7e4f0cb72dae2..c25b84c6bebde 100644
--- a/bigquery/README.rst
+++ b/bigquery/README.rst
@@ -9,7 +9,7 @@ Python Client for Google BigQuery
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/bigquery/usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/bigquery/usage.html
 
 Quick Start
 -----------
@@ -86,7 +86,7 @@ Perform a synchronous query
 See the ``google-cloud-python`` API `BigQuery documentation`_ to learn how
 to connect to BigQuery using this Client Library.
 
-.. _BigQuery documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/bigquery/usage.html
+.. _BigQuery documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/bigquery/usage.html
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-bigquery.svg
    :target: https://pypi.org/project/google-cloud-bigquery/
diff --git a/bigtable/README.rst b/bigtable/README.rst
index ebc202d8d87e4..879ddd512c9b3 100644
--- a/bigtable/README.rst
+++ b/bigtable/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Bigtable
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/bigtable/usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/bigtable/usage.html
 
 Quick Start
 -----------
diff --git a/core/README.rst b/core/README.rst
index 0685a028dbb1f..878e9a5363e00 100644
--- a/core/README.rst
+++ b/core/README.rst
@@ -9,7 +9,7 @@ common helpers (e.g. base ``Client`` classes) used by all of the
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/core/modules.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/core/modules.html
 
 Quick Start
 -----------
diff --git a/datastore/README.rst b/datastore/README.rst
index 89ba561baed3d..dd2fc68cc2174 100644
--- a/datastore/README.rst
+++ b/datastore/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Datastore
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/datastore/client.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/datastore/client.html
 
 Quick Start
 -----------
@@ -44,7 +44,7 @@ queries, and eventual consistency for all other queries.
 See the ``google-cloud-python`` API `datastore documentation`_ to learn how to
 interact with the Cloud Datastore using this Client Library.
 
-.. _datastore documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/datastore/client.html
+.. _datastore documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/datastore/client.html
 
 See the `official Google Cloud Datastore documentation`_ for more details on
 how to activate Cloud Datastore for your project.
diff --git a/dns/README.rst b/dns/README.rst
index e5882fd0adc27..79d58d28e7e76 100644
--- a/dns/README.rst
+++ b/dns/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud DNS
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/dns/usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/dns/usage.html
 
 Quick Start
 -----------
diff --git a/error_reporting/README.rst b/error_reporting/README.rst
index 104856f348e63..fbf8dfaf9c8ea 100644
--- a/error_reporting/README.rst
+++ b/error_reporting/README.rst
@@ -9,7 +9,7 @@ Python Client for Stackdriver Error Reporting
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/error-reporting/usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/error-reporting/usage.html
 
 Quick Start
 -----------
diff --git a/language/README.rst b/language/README.rst
index 9940503a78327..430028097ffd4 100644
--- a/language/README.rst
+++ b/language/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Natural Language
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/language/usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/language/usage.html
 
 Quick Start
 -----------
diff --git a/logging/README.rst b/logging/README.rst
index 8cf274e4e4a12..7e0f8a55180d3 100644
--- a/logging/README.rst
+++ b/logging/README.rst
@@ -9,7 +9,7 @@ Python Client for Stackdriver Logging
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/logging/usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/logging/usage.html
 
 Quick Start
 -----------
@@ -54,7 +54,7 @@ Example of fetching entries:
 See the ``google-cloud-python`` API `logging documentation`_ to learn how to
 connect to Stackdriver Logging using this Client Library.
 
-.. _logging documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/logging/usage.html
+.. _logging documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/logging/usage.html
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-logging.svg
    :target: https://pypi.org/project/google-cloud-logging/
diff --git a/monitoring/README.rst b/monitoring/README.rst
index f5a8bb8ecb779..3881cce522513 100644
--- a/monitoring/README.rst
+++ b/monitoring/README.rst
@@ -9,7 +9,7 @@ Python Client for Stackdriver Monitoring
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/monitoring/usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/monitoring/usage.html
 
 Quick Start
 -----------
@@ -64,7 +64,7 @@ Display CPU utilization across your GCE instances during the last five minutes:
 See the ``google-cloud-python`` API `monitoring documentation`_ to learn how
 to connect to Stackdriver Monitoring using this Client Library.
 
-.. _monitoring documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/monitoring/usage.html
+.. _monitoring documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/monitoring/usage.html
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-monitoring.svg
    :target: https://pypi.org/project/google-cloud-monitoring/
diff --git a/pubsub/README.rst b/pubsub/README.rst
index bf116676a440f..75611b1ff2962 100644
--- a/pubsub/README.rst
+++ b/pubsub/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Pub / Sub
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/pubsub/usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/pubsub/usage.html
 
 Quick Start
 -----------
@@ -45,7 +45,7 @@ independently written applications.
 See the ``google-cloud-python`` API `Pub/Sub documentation`_ to learn how to connect
 to Cloud Pub/Sub using this Client Library.
 
-.. _Pub/Sub documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/pubsub/usage.html
+.. _Pub/Sub documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/pubsub/usage.html
 
 To get started with this API, you'll need to create
 
diff --git a/resource_manager/README.rst b/resource_manager/README.rst
index fe6864580ed51..de06cff6ed478 100644
--- a/resource_manager/README.rst
+++ b/resource_manager/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Resource Manager
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/resource-manager/api.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/resource-manager/api.html
 
 Quick Start
 -----------
@@ -42,7 +42,7 @@ Google Cloud Platform.
 See the ``google-cloud-python`` API `Resource Manager documentation`_ to learn
 how to manage projects using this Client Library.
 
-.. _Resource Manager documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/resource-manager/api.html
+.. _Resource Manager documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/resource-manager/api.html
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-resource-manager.svg
    :target: https://pypi.org/project/google-cloud-resource-manager/
diff --git a/speech/README.rst b/speech/README.rst
index 150fc37bb5902..21042f6053bf2 100644
--- a/speech/README.rst
+++ b/speech/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Speech
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/speech/usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/speech/usage.html
 
 Quick Start
 -----------
@@ -41,7 +41,7 @@ and receive a text transcription from the Cloud Speech API service.
 See the ``google-cloud-python`` API `speech documentation`_ to learn how to
 connect to the Google Cloud Speech API using this Client Library.
 
-.. _speech documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/speech/usage.html
+.. _speech documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/speech/usage.html
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-speech.svg
    :target: https://pypi.org/project/google-cloud-speech/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-speech.svg
diff --git a/storage/README.rst b/storage/README.rst
index d291fc389c239..40e9e2edf5a96 100644
--- a/storage/README.rst
+++ b/storage/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Storage
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/storage/client.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/storage/client.html
 
 Quick Start
 -----------
@@ -43,7 +43,7 @@ via direct download.
 See the ``google-cloud-python`` API `storage documentation`_ to learn how to
 connect to Cloud Storage using this Client Library.
 
-.. _storage documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/storage/client.html
+.. _storage documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/storage/client.html
 
 You need to create a Google Cloud Storage bucket to use this client library.
 Follow along with the `official Google Cloud Storage documentation`_ to learn
diff --git a/trace/README.rst b/trace/README.rst
index 39178ee440fca..e0601d62d0d9e 100644
--- a/trace/README.rst
+++ b/trace/README.rst
@@ -8,7 +8,7 @@ Idiomatic Python client for `Stackdriver Trace API`_
 
 .. _Alpha: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/README.rst
 .. _Stackdriver Trace API: https://cloud.google.com/trace
-.. _Client Library Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/trace-usage
+.. _Client Library Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/trace-usage
 .. _Product Documentation:  https://cloud.google.com/trace
 
 Quick Start
@@ -22,7 +22,7 @@ In order to use this library, you first need to go through the following steps:
 
 .. _Select or create a Cloud Platform project.: https://console.cloud.google.com/project
 .. _Enable the trace api.:  https://cloud.google.com/trace
-.. _Setup Authentication.: https://googlecloudplatform.github.io/google-cloud-python/stable/google-cloud-auth
+.. _Setup Authentication.: https://googlecloudplatform.github.io/google-cloud-python/latest/google-cloud-auth
 
 Installation
 ~~~~~~~~~~~~
@@ -94,4 +94,4 @@ Next Steps
    APIs that we cover.
 
 .. _Stackdriver Trace API Product documentation:  https://cloud.google.com/trace
-.. _repository’s main README: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/README.rst
\ No newline at end of file
+.. _repository’s main README: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/README.rst
diff --git a/translate/README.rst b/translate/README.rst
index 18bc34002258d..4070d2faa1e5b 100644
--- a/translate/README.rst
+++ b/translate/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Translation
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/translate/usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/translate/usage.html
 
 Quick Start
 -----------
diff --git a/vision/README.rst b/vision/README.rst
index d54f36c3e8c8a..018d21e0efe34 100644
--- a/vision/README.rst
+++ b/vision/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Vision
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/vision/usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/vision/usage.html
 
 Quick Start
 -----------

From b242099d45260bf25bf065ae6fa4ceca22590f58 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Tue, 8 Aug 2017 14:51:50 -0700
Subject: [PATCH 174/211] Fix __eq__ and __ne__. (#3765)

---
 bigquery/google/cloud/bigquery/_helpers.py    |  5 ++
 bigquery/google/cloud/bigquery/dataset.py     |  5 ++
 bigquery/google/cloud/bigquery/schema.py      | 10 +---
 bigquery/tests/unit/test__helpers.py          | 14 +++++
 bigquery/tests/unit/test_dataset.py           |  7 +++
 bigquery/tests/unit/test_schema.py            |  6 +-
 bigtable/google/cloud/bigtable/cluster.py     |  4 +-
 .../google/cloud/bigtable/column_family.py    | 27 ++++++---
 bigtable/google/cloud/bigtable/instance.py    |  4 +-
 bigtable/google/cloud/bigtable/row_data.py    | 12 ++--
 bigtable/google/cloud/bigtable/row_filters.py | 57 ++++++++++++++-----
 bigtable/google/cloud/bigtable/table.py       |  4 +-
 bigtable/tests/unit/test_column_family.py     |  7 ++-
 datastore/google/cloud/datastore/entity.py    |  4 +-
 datastore/google/cloud/datastore/helpers.py   |  4 +-
 datastore/google/cloud/datastore/key.py       |  4 +-
 monitoring/google/cloud/monitoring/label.py   |  4 +-
 monitoring/tests/unit/test_label.py           | 16 ++++--
 spanner/google/cloud/spanner/database.py      |  4 +-
 spanner/google/cloud/spanner/instance.py      |  4 +-
 20 files changed, 138 insertions(+), 64 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/_helpers.py b/bigquery/google/cloud/bigquery/_helpers.py
index 4da9be9f07233..deb83516b9d7e 100644
--- a/bigquery/google/cloud/bigquery/_helpers.py
+++ b/bigquery/google/cloud/bigquery/_helpers.py
@@ -328,10 +328,15 @@ def __init__(self, udf_type, value):
         self.value = value
 
     def __eq__(self, other):
+        if not isinstance(other, UDFResource):
+            return NotImplemented
         return(
             self.udf_type == other.udf_type and
             self.value == other.value)
 
+    def __ne__(self, other):
+        return not self == other
+
 
 class UDFResourcesProperty(object):
     """Custom property type, holding :class:`UDFResource` instances."""
diff --git a/bigquery/google/cloud/bigquery/dataset.py b/bigquery/google/cloud/bigquery/dataset.py
index 8fb986cb848db..1304d5028873a 100644
--- a/bigquery/google/cloud/bigquery/dataset.py
+++ b/bigquery/google/cloud/bigquery/dataset.py
@@ -76,11 +76,16 @@ def __init__(self, role, entity_type, entity_id):
         self.entity_id = entity_id
 
     def __eq__(self, other):
+        if not isinstance(other, AccessGrant):
+            return NotImplemented
         return (
             self.role == other.role and
             self.entity_type == other.entity_type and
             self.entity_id == other.entity_id)
 
+    def __ne__(self, other):
+        return not self == other
+
     def __repr__(self):
         return '<AccessGrant: role=%s, %s=%s>' % (
             self.role, self.entity_type, self.entity_id)
diff --git a/bigquery/google/cloud/bigquery/schema.py b/bigquery/google/cloud/bigquery/schema.py
index edd8dd68f3bdf..e98d67c30fb69 100644
--- a/bigquery/google/cloud/bigquery/schema.py
+++ b/bigquery/google/cloud/bigquery/schema.py
@@ -101,16 +101,12 @@ def _key(self):
         )
 
     def __eq__(self, other):
-        if isinstance(other, SchemaField):
-            return self._key() == other._key()
-        else:
+        if not isinstance(other, SchemaField):
             return NotImplemented
+        return self._key() == other._key()
 
     def __ne__(self, other):
-        if isinstance(other, SchemaField):
-            return self._key() != other._key()
-        else:
-            return NotImplemented
+        return not self == other
 
     def __hash__(self):
         return hash(self._key())
diff --git a/bigquery/tests/unit/test__helpers.py b/bigquery/tests/unit/test__helpers.py
index 7648ed5bee18b..581b4b9a42fcd 100644
--- a/bigquery/tests/unit/test__helpers.py
+++ b/bigquery/tests/unit/test__helpers.py
@@ -14,6 +14,8 @@
 
 import unittest
 
+import mock
+
 
 class Test_not_null(unittest.TestCase):
 
@@ -815,6 +817,18 @@ def test_instance_getter_empty(self):
         instance = klass()
         self.assertEqual(instance.udf_resources, [])
 
+    def test_resource_equality(self):
+        from google.cloud.bigquery._helpers import UDFResource
+
+        resource1a = UDFResource('resourceUri', 'gs://bucket/file.js')
+        resource1b = UDFResource('resourceUri', 'gs://bucket/file.js')
+        resource2 = UDFResource('resourceUri', 'gs://bucket/other.js')
+
+        self.assertEqual(resource1a, resource1b)
+        self.assertNotEqual(resource1a, resource2)
+        self.assertNotEqual(resource1a, object())
+        self.assertEqual(resource1a, mock.ANY)
+
     def test_instance_getter_w_non_empty_list(self):
         from google.cloud.bigquery._helpers import UDFResource
 
diff --git a/bigquery/tests/unit/test_dataset.py b/bigquery/tests/unit/test_dataset.py
index 97721554f1b6f..164f9ed0a2b45 100644
--- a/bigquery/tests/unit/test_dataset.py
+++ b/bigquery/tests/unit/test_dataset.py
@@ -14,6 +14,8 @@
 
 import unittest
 
+import mock
+
 
 class TestAccessGrant(unittest.TestCase):
 
@@ -77,6 +79,11 @@ def test___eq___hit(self):
         other = self._make_one('OWNER', 'userByEmail', 'phred@example.com')
         self.assertEqual(grant, other)
 
+    def test__eq___type_mismatch(self):
+        grant = self._make_one('OWNER', 'userByEmail', 'silly@example.com')
+        self.assertNotEqual(grant, object())
+        self.assertEqual(grant, mock.ANY)
+
 
 class TestDataset(unittest.TestCase):
     PROJECT = 'project'
diff --git a/bigquery/tests/unit/test_schema.py b/bigquery/tests/unit/test_schema.py
index bf3cf2e025d1c..84f910a10d8eb 100644
--- a/bigquery/tests/unit/test_schema.py
+++ b/bigquery/tests/unit/test_schema.py
@@ -14,6 +14,8 @@
 
 import unittest
 
+import mock
+
 
 class TestSchemaField(unittest.TestCase):
 
@@ -101,7 +103,7 @@ def test___eq___wrong_type(self):
         field = self._make_one('test', 'STRING')
         other = object()
         self.assertNotEqual(field, other)
-        self.assertIs(field.__eq__(other), NotImplemented)
+        self.assertEqual(field, mock.ANY)
 
     def test___eq___name_mismatch(self):
         field = self._make_one('test', 'STRING')
@@ -155,7 +157,7 @@ def test___ne___wrong_type(self):
         field = self._make_one('toast', 'INTEGER')
         other = object()
         self.assertNotEqual(field, other)
-        self.assertIs(field.__ne__(other), NotImplemented)
+        self.assertEqual(field, mock.ANY)
 
     def test___ne___same_value(self):
         field1 = self._make_one('test', 'TIMESTAMP', mode='REPEATED')
diff --git a/bigtable/google/cloud/bigtable/cluster.py b/bigtable/google/cloud/bigtable/cluster.py
index 09a34e11bb05e..21410ca559cd0 100644
--- a/bigtable/google/cloud/bigtable/cluster.py
+++ b/bigtable/google/cloud/bigtable/cluster.py
@@ -159,7 +159,7 @@ def name(self):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         # NOTE: This does not compare the configuration values, such as
         #       the serve_nodes. Instead, it only compares
         #       identifying values instance, cluster ID and client. This is
@@ -170,7 +170,7 @@ def __eq__(self, other):
                 other._instance == self._instance)
 
     def __ne__(self, other):
-        return not self.__eq__(other)
+        return not self == other
 
     def reload(self):
         """Reload the metadata for this cluster."""
diff --git a/bigtable/google/cloud/bigtable/column_family.py b/bigtable/google/cloud/bigtable/column_family.py
index c34e75ed2c1f7..391452880f2f2 100644
--- a/bigtable/google/cloud/bigtable/column_family.py
+++ b/bigtable/google/cloud/bigtable/column_family.py
@@ -39,9 +39,6 @@ class GarbageCollectionRule(object):
         don't support that feature and instead support via native classes.
     """
 
-    def __ne__(self, other):
-        return not self.__eq__(other)
-
 
 class MaxVersionsGCRule(GarbageCollectionRule):
     """Garbage collection limiting the number of versions of a cell.
@@ -55,9 +52,12 @@ def __init__(self, max_num_versions):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return other.max_num_versions == self.max_num_versions
 
+    def __ne__(self, other):
+        return not self == other
+
     def to_pb(self):
         """Converts the garbage collection rule to a protobuf.
 
@@ -79,9 +79,12 @@ def __init__(self, max_age):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return other.max_age == self.max_age
 
+    def __ne__(self, other):
+        return not self == other
+
     def to_pb(self):
         """Converts the garbage collection rule to a protobuf.
 
@@ -104,9 +107,12 @@ def __init__(self, rules):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return other.rules == self.rules
 
+    def __ne__(self, other):
+        return not self == other
+
     def to_pb(self):
         """Converts the union into a single GC rule as a protobuf.
 
@@ -130,9 +136,12 @@ def __init__(self, rules):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return other.rules == self.rules
 
+    def __ne__(self, other):
+        return not self == other
+
     def to_pb(self):
         """Converts the intersection into a single GC rule as a protobuf.
 
@@ -190,13 +199,13 @@ def name(self):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return (other.column_family_id == self.column_family_id and
                 other._table == self._table and
                 other.gc_rule == self.gc_rule)
 
     def __ne__(self, other):
-        return not self.__eq__(other)
+        return not self == other
 
     def to_pb(self):
         """Converts the column family to a protobuf.
diff --git a/bigtable/google/cloud/bigtable/instance.py b/bigtable/google/cloud/bigtable/instance.py
index 5e73ed2ba661f..10246ecf6ef2a 100644
--- a/bigtable/google/cloud/bigtable/instance.py
+++ b/bigtable/google/cloud/bigtable/instance.py
@@ -180,7 +180,7 @@ def name(self):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         # NOTE: This does not compare the configuration values, such as
         #       the display_name. Instead, it only compares
         #       identifying values instance ID and client. This is
@@ -191,7 +191,7 @@ def __eq__(self, other):
                 other._client == self._client)
 
     def __ne__(self, other):
-        return not self.__eq__(other)
+        return not self == other
 
     def reload(self):
         """Reload the metadata for this instance."""
diff --git a/bigtable/google/cloud/bigtable/row_data.py b/bigtable/google/cloud/bigtable/row_data.py
index 78179db25c4e5..56129f6342b8a 100644
--- a/bigtable/google/cloud/bigtable/row_data.py
+++ b/bigtable/google/cloud/bigtable/row_data.py
@@ -58,13 +58,13 @@ def from_pb(cls, cell_pb):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return (other.value == self.value and
                 other.timestamp == self.timestamp and
                 other.labels == self.labels)
 
     def __ne__(self, other):
-        return not self.__eq__(other)
+        return not self == other
 
 
 class PartialCellData(object):
@@ -126,12 +126,12 @@ def __init__(self, row_key):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return (other._row_key == self._row_key and
                 other._cells == self._cells)
 
     def __ne__(self, other):
-        return not self.__eq__(other)
+        return not self == other
 
     def to_dict(self):
         """Convert the cells to a dictionary.
@@ -211,11 +211,11 @@ def __init__(self, response_iterator):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return other._response_iterator == self._response_iterator
 
     def __ne__(self, other):
-        return not self.__eq__(other)
+        return not self == other
 
     @property
     def state(self):
diff --git a/bigtable/google/cloud/bigtable/row_filters.py b/bigtable/google/cloud/bigtable/row_filters.py
index e3f3006df2860..a59be638365c7 100644
--- a/bigtable/google/cloud/bigtable/row_filters.py
+++ b/bigtable/google/cloud/bigtable/row_filters.py
@@ -32,9 +32,6 @@ class RowFilter(object):
         This class is a do-nothing base class for all row filters.
     """
 
-    def __ne__(self, other):
-        return not self.__eq__(other)
-
 
 class _BoolFilter(RowFilter):
     """Row filter that uses a boolean flag.
@@ -48,9 +45,12 @@ def __init__(self, flag):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return other.flag == self.flag
 
+    def __ne__(self, other):
+        return not self == other
+
 
 class SinkFilter(_BoolFilter):
     """Advanced row filter to skip parent filters.
@@ -124,9 +124,12 @@ def __init__(self, regex):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return other.regex == self.regex
 
+    def __ne__(self, other):
+        return not self == other
+
 
 class RowKeyRegexFilter(_RegexFilter):
     """Row filter for a row key regular expression.
@@ -173,9 +176,12 @@ def __init__(self, sample):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return other.sample == self.sample
 
+    def __ne__(self, other):
+        return not self == other
+
     def to_pb(self):
         """Converts the row filter to a protobuf.
 
@@ -257,12 +263,12 @@ def __init__(self, start=None, end=None):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return (other.start == self.start and
                 other.end == self.end)
 
     def __ne__(self, other):
-        return not self.__eq__(other)
+        return not self == other
 
     def to_pb(self):
         """Converts the :class:`TimestampRange` to a protobuf.
@@ -292,9 +298,12 @@ def __init__(self, range_):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return other.range_ == self.range_
 
+    def __ne__(self, other):
+        return not self == other
+
     def to_pb(self):
         """Converts the row filter to a protobuf.
 
@@ -367,13 +376,16 @@ def __init__(self, column_family_id, start_column=None, end_column=None,
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return (other.column_family_id == self.column_family_id and
                 other.start_column == self.start_column and
                 other.end_column == self.end_column and
                 other.inclusive_start == self.inclusive_start and
                 other.inclusive_end == self.inclusive_end)
 
+    def __ne__(self, other):
+        return not self == other
+
     def to_pb(self):
         """Converts the row filter to a protobuf.
 
@@ -485,12 +497,15 @@ def __init__(self, start_value=None, end_value=None,
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return (other.start_value == self.start_value and
                 other.end_value == self.end_value and
                 other.inclusive_start == self.inclusive_start and
                 other.inclusive_end == self.inclusive_end)
 
+    def __ne__(self, other):
+        return not self == other
+
     def to_pb(self):
         """Converts the row filter to a protobuf.
 
@@ -533,9 +548,12 @@ def __init__(self, num_cells):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return other.num_cells == self.num_cells
 
+    def __ne__(self, other):
+        return not self == other
+
 
 class CellsRowOffsetFilter(_CellCountFilter):
     """Row filter to skip cells in a row.
@@ -631,9 +649,12 @@ def __init__(self, label):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return other.label == self.label
 
+    def __ne__(self, other):
+        return not self == other
+
     def to_pb(self):
         """Converts the row filter to a protobuf.
 
@@ -661,9 +682,12 @@ def __init__(self, filters=None):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return other.filters == self.filters
 
+    def __ne__(self, other):
+        return not self == other
+
 
 class RowFilterChain(_FilterCombination):
     """Chain of row filters.
@@ -748,11 +772,14 @@ def __init__(self, base_filter, true_filter=None, false_filter=None):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return (other.base_filter == self.base_filter and
                 other.true_filter == self.true_filter and
                 other.false_filter == self.false_filter)
 
+    def __ne__(self, other):
+        return not self == other
+
     def to_pb(self):
         """Converts the row filter to a protobuf.
 
diff --git a/bigtable/google/cloud/bigtable/table.py b/bigtable/google/cloud/bigtable/table.py
index 64fbcc93771ed..921fd30fd11b1 100644
--- a/bigtable/google/cloud/bigtable/table.py
+++ b/bigtable/google/cloud/bigtable/table.py
@@ -142,12 +142,12 @@ def row(self, row_key, filter_=None, append=False):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return (other.table_id == self.table_id and
                 other._instance == self._instance)
 
     def __ne__(self, other):
-        return not self.__eq__(other)
+        return not self == other
 
     def create(self, initial_split_keys=None, column_families=()):
         """Creates this table.
diff --git a/bigtable/tests/unit/test_column_family.py b/bigtable/tests/unit/test_column_family.py
index 6fa408fdb07ee..73b836501b471 100644
--- a/bigtable/tests/unit/test_column_family.py
+++ b/bigtable/tests/unit/test_column_family.py
@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 import unittest
 
+import mock
+
 
 class TestMaxVersionsGCRule(unittest.TestCase):
 
@@ -29,8 +30,8 @@ def _make_one(self, *args, **kwargs):
 
     def test___eq__type_differ(self):
         gc_rule1 = self._make_one(10)
-        gc_rule2 = object()
-        self.assertNotEqual(gc_rule1, gc_rule2)
+        self.assertNotEqual(gc_rule1, object())
+        self.assertEqual(gc_rule1, mock.ANY)
 
     def test___eq__same_value(self):
         gc_rule1 = self._make_one(2)
diff --git a/datastore/google/cloud/datastore/entity.py b/datastore/google/cloud/datastore/entity.py
index e74d5aa640eeb..be30aa9151728 100644
--- a/datastore/google/cloud/datastore/entity.py
+++ b/datastore/google/cloud/datastore/entity.py
@@ -146,7 +146,7 @@ def __eq__(self, other):
         :returns: True if the entities compare equal, else False.
         """
         if not isinstance(other, Entity):
-            return False
+            return NotImplemented
 
         return (self.key == other.key and
                 self.exclude_from_indexes == other.exclude_from_indexes and
@@ -162,7 +162,7 @@ def __ne__(self, other):
         :rtype: bool
         :returns: False if the entities compare equal, else True.
         """
-        return not self.__eq__(other)
+        return not self == other
 
     @property
     def kind(self):
diff --git a/datastore/google/cloud/datastore/helpers.py b/datastore/google/cloud/datastore/helpers.py
index ee4537317030a..eeae9d427572e 100644
--- a/datastore/google/cloud/datastore/helpers.py
+++ b/datastore/google/cloud/datastore/helpers.py
@@ -454,7 +454,7 @@ def __eq__(self, other):
         :returns: True if the points compare equal, else False.
         """
         if not isinstance(other, GeoPoint):
-            return False
+            return NotImplemented
 
         return (self.latitude == other.latitude and
                 self.longitude == other.longitude)
@@ -465,4 +465,4 @@ def __ne__(self, other):
         :rtype: bool
         :returns: False if the points compare equal, else True.
         """
-        return not self.__eq__(other)
+        return not self == other
diff --git a/datastore/google/cloud/datastore/key.py b/datastore/google/cloud/datastore/key.py
index f1733f8f5d8e3..615cab6965683 100644
--- a/datastore/google/cloud/datastore/key.py
+++ b/datastore/google/cloud/datastore/key.py
@@ -123,7 +123,7 @@ def __eq__(self, other):
         :returns: True if the keys compare equal, else False.
         """
         if not isinstance(other, Key):
-            return False
+            return NotImplemented
 
         if self.is_partial or other.is_partial:
             return False
@@ -143,7 +143,7 @@ def __ne__(self, other):
         :rtype: bool
         :returns: False if the keys compare equal, else True.
         """
-        return not self.__eq__(other)
+        return not self == other
 
     def __hash__(self):
         """Hash a keys for use in a dictionary lookp.
diff --git a/monitoring/google/cloud/monitoring/label.py b/monitoring/google/cloud/monitoring/label.py
index 602a2eb99aa51..0ea909a0a75e0 100644
--- a/monitoring/google/cloud/monitoring/label.py
+++ b/monitoring/google/cloud/monitoring/label.py
@@ -87,10 +87,12 @@ def _to_dict(self):
         return info
 
     def __eq__(self, other):
+        if not isinstance(other, LabelDescriptor):
+            return NotImplemented
         return self.__dict__ == other.__dict__
 
     def __ne__(self, other):
-        return self.__dict__ != other.__dict__
+        return not self == other
 
     def __repr__(self):
         return (
diff --git a/monitoring/tests/unit/test_label.py b/monitoring/tests/unit/test_label.py
index 11b66f92ae714..24fb6808bf826 100644
--- a/monitoring/tests/unit/test_label.py
+++ b/monitoring/tests/unit/test_label.py
@@ -14,6 +14,8 @@
 
 import unittest
 
+import mock
+
 
 class TestLabelValueType(unittest.TestCase):
 
@@ -108,9 +110,13 @@ def test_equality(self):
         KEY = 'response_code'
         VALUE_TYPE = 'INT64'
         DESCRIPTION = 'HTTP status code for the request.'
-        descriptor1 = self._make_one(key=KEY, value_type=VALUE_TYPE,
-                                     description=DESCRIPTION)
+        descriptor1a = self._make_one(key=KEY, value_type=VALUE_TYPE,
+                                      description=DESCRIPTION)
+        descriptor1b = self._make_one(key=KEY, value_type=VALUE_TYPE,
+                                      description=DESCRIPTION)
         descriptor2 = self._make_one(key=KEY, value_type=VALUE_TYPE,
-                                     description=DESCRIPTION)
-        self.assertTrue(descriptor1 == descriptor2)
-        self.assertFalse(descriptor1 != descriptor2)
+                                     description=DESCRIPTION + 'foo')
+        self.assertEqual(descriptor1a, descriptor1b)
+        self.assertNotEqual(descriptor1a, descriptor2)
+        self.assertNotEqual(descriptor1a, object())
+        self.assertEqual(descriptor1a, mock.ANY)
diff --git a/spanner/google/cloud/spanner/database.py b/spanner/google/cloud/spanner/database.py
index 38dc1c7eaaf88..a984b88ed4b24 100644
--- a/spanner/google/cloud/spanner/database.py
+++ b/spanner/google/cloud/spanner/database.py
@@ -170,12 +170,12 @@ def spanner_api(self):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         return (other.database_id == self.database_id and
                 other._instance == self._instance)
 
     def __ne__(self, other):
-        return not self.__eq__(other)
+        return not self == other
 
     def create(self):
         """Create this database within its instance
diff --git a/spanner/google/cloud/spanner/instance.py b/spanner/google/cloud/spanner/instance.py
index 4a51c70557316..7d715c94c5908 100644
--- a/spanner/google/cloud/spanner/instance.py
+++ b/spanner/google/cloud/spanner/instance.py
@@ -148,7 +148,7 @@ def name(self):
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
-            return False
+            return NotImplemented
         # NOTE: This does not compare the configuration values, such as
         #       the display_name. Instead, it only compares
         #       identifying values instance ID and client. This is
@@ -159,7 +159,7 @@ def __eq__(self, other):
                 other._client == self._client)
 
     def __ne__(self, other):
-        return not self.__eq__(other)
+        return not self == other
 
     def copy(self):
         """Make a copy of this instance.

From 15ed5e730c2c2c733f147b23c143b7de5386ae4c Mon Sep 17 00:00:00 2001
From: Angela Li <yanhuil@google.com>
Date: Tue, 8 Aug 2017 19:15:23 -0700
Subject: [PATCH 175/211] Increase backoff to fix monitoring system test
 (#3769)

---
 monitoring/tests/system.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/monitoring/tests/system.py b/monitoring/tests/system.py
index 46eb5a40f72c3..bc02092891366 100644
--- a/monitoring/tests/system.py
+++ b/monitoring/tests/system.py
@@ -178,6 +178,7 @@ def test_create_and_delete_metric_descriptor(self):
         retry_500(descriptor.create)()
         retry_404_500(descriptor.delete)()
 
+    @RetryErrors(exception=BadRequest, max_tries=2)
     def test_write_point(self):
         METRIC_TYPE = ('custom.googleapis.com/tmp/system_test_example' +
                        unique_resource_id())
@@ -202,14 +203,19 @@ def test_write_point(self):
         retry_500(client.write_point)(metric, resource, VALUE)
 
         def _query_timeseries_with_retries():
-            MAX_RETRIES = 10
+            MAX_RETRIES = 6
 
             def _has_timeseries(result):
                 return len(list(result)) > 0
 
-            retry_result = RetryResult(_has_timeseries,
-                                       max_tries=MAX_RETRIES)(client.query)
-            return RetryErrors(BadRequest, max_tries=MAX_RETRIES)(retry_result)
+            retry_result = RetryResult(
+                _has_timeseries,
+                max_tries=MAX_RETRIES,
+                backoff=3)(client.query)
+            return RetryErrors(
+                BadRequest,
+                max_tries=MAX_RETRIES,
+                backoff=3)(retry_result)
 
         query = _query_timeseries_with_retries()(METRIC_TYPE, minutes=5)
         timeseries_list = list(query)

From c24123c2100fe7a6cff64de7cf6eade97c81fb1f Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Wed, 9 Aug 2017 10:02:05 -0700
Subject: [PATCH 176/211] Move google.cloud.iterator to
 google.api.core.page_iterator (#3770)

* Move google.cloud.iterator to google.api.core.page_iterator
* Re-write tests to pytest style.
* Make GAXIterator private- it will soon be removed.
* Pass api_request into HTTPIterator to avoid accessing private members
* BigQuery: use google.api.core.page_iterator
* DNS: use google.api.core.page_iterator
* Logging: use google.api.core.page_iterator
* PubSub: use google.api.core.page_iterator
* Resource manager: use google.api.core.page_iterator
* Runtimeconfig: use google.api.core.page_iterator
* logging: use google.api.core._GAXIterator
* Storage: use google.api.core.page_iterator
* Pubsub: use google.api.core._GAXIterator
* Trace: use google.api.core._GAXIterator
* Spanner: use google.api.core._GAXIterator
---
 bigquery/google/cloud/bigquery/_helpers.py    |   4 +-
 bigquery/google/cloud/bigquery/client.py      |  51 +-
 bigquery/google/cloud/bigquery/dataset.py     |  17 +-
 bigquery/google/cloud/bigquery/query.py       |  23 +-
 bigquery/google/cloud/bigquery/table.py       |  17 +-
 .../iterator.py => api/core/page_iterator.py} | 326 +++++-----
 .../tests/unit/api_core/test_page_iterator.py | 461 +++++++++++++
 core/tests/unit/test_iterator.py              | 605 ------------------
 datastore/google/cloud/datastore/query.py     |   9 +-
 datastore/tests/unit/test_query.py            |   4 +-
 dns/google/cloud/dns/client.py                |  17 +-
 dns/google/cloud/dns/zone.py                  |  32 +-
 docs/core/index.rst                           |   1 -
 docs/core/iterators.rst                       |   6 -
 logging/google/cloud/logging/_gax.py          |  23 +-
 logging/google/cloud/logging/_http.py         |  52 +-
 logging/google/cloud/logging/client.py        |   6 +-
 logging/google/cloud/logging/logger.py        |   2 +-
 pubsub/google/cloud/pubsub/_gax.py            |  35 +-
 pubsub/google/cloud/pubsub/_http.py           |  59 +-
 pubsub/google/cloud/pubsub/client.py          |   6 +-
 pubsub/google/cloud/pubsub/topic.py           |   2 +-
 .../google/cloud/resource_manager/client.py   |  16 +-
 resource_manager/tests/unit/test_client.py    |   8 +-
 .../google/cloud/runtimeconfig/config.py      |  19 +-
 spanner/google/cloud/spanner/client.py        |  16 +-
 spanner/google/cloud/spanner/instance.py      |   9 +-
 storage/google/cloud/storage/bucket.py        |  21 +-
 storage/google/cloud/storage/client.py        |  16 +-
 storage/tests/unit/test_bucket.py             |   4 +-
 storage/tests/unit/test_client.py             |   4 +-
 trace/google/cloud/trace/_gax.py              |   9 +-
 trace/google/cloud/trace/client.py            |   2 +-
 33 files changed, 897 insertions(+), 985 deletions(-)
 rename core/google/{cloud/iterator.py => api/core/page_iterator.py} (52%)
 create mode 100644 core/tests/unit/api_core/test_page_iterator.py
 delete mode 100644 core/tests/unit/test_iterator.py
 delete mode 100644 docs/core/iterators.rst

diff --git a/bigquery/google/cloud/bigquery/_helpers.py b/bigquery/google/cloud/bigquery/_helpers.py
index deb83516b9d7e..9358229e630a8 100644
--- a/bigquery/google/cloud/bigquery/_helpers.py
+++ b/bigquery/google/cloud/bigquery/_helpers.py
@@ -684,7 +684,7 @@ def _item_to_row(iterator, resource):
         added to the iterator after being created, which
         should be done by the caller.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type resource: dict
@@ -700,7 +700,7 @@ def _item_to_row(iterator, resource):
 def _rows_page_start(iterator, page, response):
     """Grab total rows when :class:`~google.cloud.iterator.Page` starts.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type page: :class:`~google.cloud.iterator.Page`
diff --git a/bigquery/google/cloud/bigquery/client.py b/bigquery/google/cloud/bigquery/client.py
index f36d80978efdb..d9ff17d717203 100644
--- a/bigquery/google/cloud/bigquery/client.py
+++ b/bigquery/google/cloud/bigquery/client.py
@@ -14,7 +14,7 @@
 
 """Client for interacting with the Google BigQuery API."""
 
-
+from google.api.core import page_iterator
 from google.cloud.client import ClientWithProject
 from google.cloud.bigquery._http import Connection
 from google.cloud.bigquery.dataset import Dataset
@@ -23,7 +23,6 @@
 from google.cloud.bigquery.job import LoadTableFromStorageJob
 from google.cloud.bigquery.job import QueryJob
 from google.cloud.bigquery.query import QueryResults
-from google.cloud.iterator import HTTPIterator
 
 
 class Project(object):
@@ -98,13 +97,17 @@ def list_projects(self, max_results=None, page_token=None):
                            not passed, the API will return the first page of
                            projects.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~google.cloud.bigquery.client.Project`
                   accessible to the current client.
         """
-        return HTTPIterator(
-            client=self, path='/projects', item_to_value=_item_to_project,
-            items_key='projects', page_token=page_token,
+        return page_iterator.HTTPIterator(
+            client=self,
+            api_request=self._connection.api_request,
+            path='/projects',
+            item_to_value=_item_to_project,
+            items_key='projects',
+            page_token=page_token,
             max_results=max_results)
 
     def list_datasets(self, include_all=False, max_results=None,
@@ -126,7 +129,7 @@ def list_datasets(self, include_all=False, max_results=None,
                            not passed, the API will return the first page of
                            datasets.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~google.cloud.bigquery.dataset.Dataset`.
                   accessible to the current client.
         """
@@ -134,10 +137,15 @@ def list_datasets(self, include_all=False, max_results=None,
         if include_all:
             extra_params['all'] = True
         path = '/projects/%s/datasets' % (self.project,)
-        return HTTPIterator(
-            client=self, path=path, item_to_value=_item_to_dataset,
-            items_key='datasets', page_token=page_token,
-            max_results=max_results, extra_params=extra_params)
+        return page_iterator.HTTPIterator(
+            client=self,
+            api_request=self._connection.api_request,
+            path=path,
+            item_to_value=_item_to_dataset,
+            items_key='datasets',
+            page_token=page_token,
+            max_results=max_results,
+            extra_params=extra_params)
 
     def dataset(self, dataset_name, project=None):
         """Construct a dataset bound to this client.
@@ -207,7 +215,7 @@ def list_jobs(self, max_results=None, page_token=None, all_users=None,
                              * ``"pending"``
                              * ``"running"``
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterable of job instances.
         """
         extra_params = {'projection': 'full'}
@@ -219,10 +227,15 @@ def list_jobs(self, max_results=None, page_token=None, all_users=None,
             extra_params['stateFilter'] = state_filter
 
         path = '/projects/%s/jobs' % (self.project,)
-        return HTTPIterator(
-            client=self, path=path, item_to_value=_item_to_job,
-            items_key='jobs', page_token=page_token,
-            max_results=max_results, extra_params=extra_params)
+        return page_iterator.HTTPIterator(
+            client=self,
+            api_request=self._connection.api_request,
+            path=path,
+            item_to_value=_item_to_job,
+            items_key='jobs',
+            page_token=page_token,
+            max_results=max_results,
+            extra_params=extra_params)
 
     def load_table_from_storage(self, job_name, destination, *source_uris):
         """Construct a job for loading data into a table from CloudStorage.
@@ -349,7 +362,7 @@ def run_sync_query(self, query, udf_resources=(), query_parameters=()):
 def _item_to_project(iterator, resource):
     """Convert a JSON project to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type resource: dict
@@ -365,7 +378,7 @@ def _item_to_project(iterator, resource):
 def _item_to_dataset(iterator, resource):
     """Convert a JSON dataset to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type resource: dict
@@ -380,7 +393,7 @@ def _item_to_dataset(iterator, resource):
 def _item_to_job(iterator, resource):
     """Convert a JSON job to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type resource: dict
diff --git a/bigquery/google/cloud/bigquery/dataset.py b/bigquery/google/cloud/bigquery/dataset.py
index 1304d5028873a..d25f6747285f9 100644
--- a/bigquery/google/cloud/bigquery/dataset.py
+++ b/bigquery/google/cloud/bigquery/dataset.py
@@ -15,10 +15,10 @@
 """Define API Datasets."""
 import six
 
+from google.api.core import page_iterator
 from google.cloud._helpers import _datetime_from_microseconds
 from google.cloud.exceptions import NotFound
 from google.cloud.bigquery.table import Table
-from google.cloud.iterator import HTTPIterator
 
 
 class AccessGrant(object):
@@ -561,14 +561,19 @@ def list_tables(self, max_results=None, page_token=None):
                            datasets. If not passed, the API will return the
                            first page of datasets.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~google.cloud.bigquery.table.Table`
                   contained within the current dataset.
         """
         path = '/projects/%s/datasets/%s/tables' % (self.project, self.name)
-        result = HTTPIterator(client=self._client, path=path,
-                              item_to_value=_item_to_table, items_key='tables',
-                              page_token=page_token, max_results=max_results)
+        result = page_iterator.HTTPIterator(
+            client=self._client,
+            api_request=self._client._connection.api_request,
+            path=path,
+            item_to_value=_item_to_table,
+            items_key='tables',
+            page_token=page_token,
+            max_results=max_results)
         result.dataset = self
         return result
 
@@ -590,7 +595,7 @@ def table(self, name, schema=()):
 def _item_to_table(iterator, resource):
     """Convert a JSON table to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type resource: dict
diff --git a/bigquery/google/cloud/bigquery/query.py b/bigquery/google/cloud/bigquery/query.py
index 502953b2c828d..dfa0a422a68ae 100644
--- a/bigquery/google/cloud/bigquery/query.py
+++ b/bigquery/google/cloud/bigquery/query.py
@@ -16,7 +16,7 @@
 
 import six
 
-from google.cloud.iterator import HTTPIterator
+from google.api.core import page_iterator
 from google.cloud.bigquery._helpers import _TypedProperty
 from google.cloud.bigquery._helpers import _rows_from_json
 from google.cloud.bigquery.dataset import Dataset
@@ -414,7 +414,7 @@ def fetch_data(self, max_results=None, page_token=None, start_index=None,
         :param client: the client to use.  If not passed, falls back to the
                        ``client`` stored on the current dataset.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of row data :class:`tuple`s. During each page, the
                   iterator will have the ``total_rows`` attribute set,
                   which counts the total number of rows **in the result
@@ -435,13 +435,16 @@ def fetch_data(self, max_results=None, page_token=None, start_index=None,
             params['timeoutMs'] = timeout_ms
 
         path = '/projects/%s/queries/%s' % (self.project, self.name)
-        iterator = HTTPIterator(client=client, path=path,
-                                item_to_value=_item_to_row,
-                                items_key='rows',
-                                page_token=page_token,
-                                max_results=max_results,
-                                page_start=_rows_page_start_query,
-                                extra_params=params)
+        iterator = page_iterator.HTTPIterator(
+            client=client,
+            api_request=client._connection.api_request,
+            path=path,
+            item_to_value=_item_to_row,
+            items_key='rows',
+            page_token=page_token,
+            max_results=max_results,
+            page_start=_rows_page_start_query,
+            extra_params=params)
         iterator.query_result = self
         # Over-ride the key used to retrieve the next page token.
         iterator._NEXT_TOKEN = 'pageToken'
@@ -457,7 +460,7 @@ def _rows_page_start_query(iterator, page, response):
         added to the iterator after being created, which
         should be done by the caller.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type page: :class:`~google.cloud.iterator.Page`
diff --git a/bigquery/google/cloud/bigquery/table.py b/bigquery/google/cloud/bigquery/table.py
index c6bf5db893abd..87cff2980c7e5 100644
--- a/bigquery/google/cloud/bigquery/table.py
+++ b/bigquery/google/cloud/bigquery/table.py
@@ -23,10 +23,10 @@
 from google.resumable_media.requests import MultipartUpload
 from google.resumable_media.requests import ResumableUpload
 
+from google.api.core import page_iterator
 from google.cloud import exceptions
 from google.cloud._helpers import _datetime_from_microseconds
 from google.cloud._helpers import _millis_from_datetime
-from google.cloud.iterator import HTTPIterator
 from google.cloud.bigquery.schema import SchemaField
 from google.cloud.bigquery._helpers import _item_to_row
 from google.cloud.bigquery._helpers import _rows_page_start
@@ -712,7 +712,7 @@ def fetch_data(self, max_results=None, page_token=None, client=None):
         :param client: (Optional) The client to use.  If not passed, falls
                        back to the ``client`` stored on the current dataset.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of row data :class:`tuple`s. During each page, the
                   iterator will have the ``total_rows`` attribute set,
                   which counts the total number of rows **in the table**
@@ -724,10 +724,15 @@ def fetch_data(self, max_results=None, page_token=None, client=None):
 
         client = self._require_client(client)
         path = '%s/data' % (self.path,)
-        iterator = HTTPIterator(client=client, path=path,
-                                item_to_value=_item_to_row, items_key='rows',
-                                page_token=page_token, max_results=max_results,
-                                page_start=_rows_page_start)
+        iterator = page_iterator.HTTPIterator(
+            client=client,
+            api_request=client._connection.api_request,
+            path=path,
+            item_to_value=_item_to_row,
+            items_key='rows',
+            page_token=page_token,
+            max_results=max_results,
+            page_start=_rows_page_start)
         iterator.schema = self._schema
         # Over-ride the key used to retrieve the next page token.
         iterator._NEXT_TOKEN = 'pageToken'
diff --git a/core/google/cloud/iterator.py b/core/google/api/core/page_iterator.py
similarity index 52%
rename from core/google/cloud/iterator.py
rename to core/google/api/core/page_iterator.py
index 742443ddc5f97..147c9f47e35ad 100644
--- a/core/google/cloud/iterator.py
+++ b/core/google/api/core/page_iterator.py
@@ -12,56 +12,49 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Iterators for paging through API responses.
+"""Iterators for paging through paged API methods.
 
 These iterators simplify the process of paging through API responses
-where the response is a list of results with a ``nextPageToken``.
-
-To make an iterator work, you'll need to provide a way to convert a JSON
-item returned from the API into the object of your choice (via
-``item_to_value``). You also may need to specify a custom ``items_key`` so
-that a given response (containing a page of results) can be parsed into an
-iterable page of the actual objects you want. You then can use this to get
-**all** the results from a resource::
-
-    >>> def item_to_value(iterator, item):
-    ...     my_item = MyItemClass(iterator.client, other_arg=True)
-    ...     my_item._set_properties(item)
-    ...     return my_item
-    ...
-    >>> iterator = Iterator(..., items_key='blocks',
-    ...                     item_to_value=item_to_value)
-    >>> list(iterator)  # Convert to a list (consumes all values).
+where the request takes a page token and the response is a list of results with
+a token for the next page. See `list pagination`_ in the Google API Style Guide
+for more details.
+
+.. _list pagination:
+    https://cloud.google.com/apis/design/design_patterns#list_pagination
+
+API clients that have methods that follow the list pagination pattern can
+return an :class:`Iterator`. You can use this iterator to get **all** of
+the results across all pages::
+
+    >>> results_iterator = client.list_resources()
+    >>> list(results_iterator)  # Convert to a list (consumes all values).
 
 Or you can walk your way through items and call off the search early if
-you find what you're looking for (resulting in possibly fewer
-requests)::
+you find what you're looking for (resulting in possibly fewer requests)::
 
-    >>> for my_item in Iterator(...):
-    ...     print(my_item.name)
-    ...     if not my_item.is_valid:
+    >>> for resource in results_iterator:
+    ...     print(resource.name)
+    ...     if not resource.is_valid:
     ...         break
 
 At any point, you may check the number of items consumed by referencing the
 ``num_results`` property of the iterator::
 
-    >>> my_iterator = Iterator(...)
-    >>> for my_item in my_iterator:
-    ...     if my_iterator.num_results >= 10:
+    >>> for my_item in results_iterator:
+    ...     if results_iterator.num_results >= 10:
     ...         break
 
 When iterating, not every new item will send a request to the server.
 To iterate based on each page of items (where a page corresponds to
 a request)::
 
-    >>> iterator = Iterator(...)
-    >>> for page in iterator.pages:
+    >>> for page in results_iterator.pages:
     ...     print('=' * 20)
-    ...     print('    Page number: %d' % (iterator.page_number,))
-    ...     print('  Items in page: %d' % (page.num_items,))
-    ...     print('     First item: %r' % (next(page),))
-    ...     print('Items remaining: %d' % (page.remaining,))
-    ...     print('Next page token: %s' % (iterator.next_page_token,))
+    ...     print('    Page number: {:d}'.format(iterator.page_number))
+    ...     print('  Items in page: {:d}'.format(page.num_items))
+    ...     print('     First item: {!r}'.format(next(page)))
+    ...     print('Items remaining: {:d}'.format(page.remaining))
+    ...     print('Next page token: {}'.format(iterator.next_page_token))
     ====================
         Page number: 1
       Items in page: 1
@@ -75,7 +68,8 @@
     Items remaining: 18
     Next page token: None
 
-To consume an entire page::
+Then, for each page you can get all the resources on that page by iterating
+through it or using :func:`list`::
 
     >>> list(page)
     [
@@ -85,47 +79,21 @@
     ]
 """
 
+import abc
 
 import six
 
 
-DEFAULT_ITEMS_KEY = 'items'
-"""The dictionary key used to retrieve items from each response."""
-
-
-# pylint: disable=unused-argument
-def _do_nothing_page_start(iterator, page, response):
-    """Helper to provide custom behavior after a :class:`Page` is started.
-
-    This is a do-nothing stand-in as the default value.
-
-    :type iterator: :class:`Iterator`
-    :param iterator: An iterator that holds some request info.
-
-    :type page: :class:`Page`
-    :param page: The page that was just created.
-
-    :type response: dict
-    :param response: The JSON API response for a page.
-    """
-# pylint: enable=unused-argument
-
-
 class Page(object):
     """Single page of results in an iterator.
 
-    :type parent: :class:`Iterator`
-    :param parent: The iterator that owns the current page.
-
-    :type items: iterable
-    :param items: An iterable (that also defines __len__) of items
-                  from a raw API response.
-
-    :type item_to_value: callable
-    :param item_to_value: Callable to convert an item from the type in the
-                          raw API response into the native object.
-                          Assumed signature takes an :class:`Iterator` and a
-                          raw API response with a single item.
+    Args:
+        parent (Iterator): The iterator that owns the current page.
+        items (Sequence[Any]): An iterable (that also defines __len__) of items
+            from a raw API response.
+        item_to_value (Callable[Iterator, Any]): Callable to convert an item
+            from the type in the raw API response into the native object. Will
+            be called with the iterator and a single item.
     """
 
     def __init__(self, parent, items, item_to_value):
@@ -137,24 +105,16 @@ def __init__(self, parent, items, item_to_value):
 
     @property
     def num_items(self):
-        """Total items in the page.
-
-        :rtype: int
-        :returns: The number of items in this page.
-        """
+        """int: Total items in the page."""
         return self._num_items
 
     @property
     def remaining(self):
-        """Remaining items in the page.
-
-        :rtype: int
-        :returns: The number of items remaining in this page.
-        """
+        """int: Remaining items in the page."""
         return self._remaining
 
     def __iter__(self):
-        """The :class:`Page` is an iterator."""
+        """The :class:`Page` is an iterator of items."""
         return self
 
     def next(self):
@@ -170,26 +130,28 @@ def next(self):
     __next__ = next
 
 
-class Iterator(object):
-    """A generic class for iterating through API list responses.
-
-    :type client: :class:`~google.cloud.client.Client`
-    :param client: The client used to identify the application.
+def _item_to_value_identity(iterator, item):
+    """An item to value transformer that returns the item un-changed."""
+    # pylint: disable=unused-argument
+    # We are conforming to the interface defined by Iterator.
+    return item
 
-    :type item_to_value: callable
-    :param item_to_value: Callable to convert an item from the type in the
-                          raw API response into the native object.
-                          Assumed signature takes an :class:`Iterator` and a
-                          raw API response with a single item.
 
-    :type page_token: str
-    :param page_token: (Optional) A token identifying a page in a result set.
+@six.add_metaclass(abc.ABCMeta)
+class Iterator(object):
+    """A generic class for iterating through API list responses.
 
-    :type max_results: int
-    :param max_results: (Optional) The maximum number of results to fetch.
+    Args:
+        client(google.cloud.client.Client): The API client.
+        item_to_value (Callable[Iterator, Any]): Callable to convert an item
+            from the type in the raw API response into the native object. Will
+            be called with the iterator and a single item.
+        page_token (str): A token identifying a page in a result set to start
+            fetching results from.
+        max_results (int): The maximum number of results to fetch.
     """
 
-    def __init__(self, client, item_to_value,
+    def __init__(self, client, item_to_value=_item_to_value_identity,
                  page_token=None, max_results=None):
         self._started = False
         self.client = client
@@ -204,9 +166,11 @@ def __init__(self, client, item_to_value,
     def pages(self):
         """Iterator of pages in the response.
 
-        :rtype: :class:`~types.GeneratorType`
-        :returns: A generator of :class:`Page` instances.
-        :raises ValueError: If the iterator has already been started.
+        returns:
+            types.GeneratorType[Page]: A generator of :class:`Page` instances.
+
+        raises:
+            ValueError: If the iterator has already been started.
         """
         if self._started:
             raise ValueError('Iterator has already started', self)
@@ -223,9 +187,11 @@ def _items_iter(self):
     def __iter__(self):
         """Iterator for each item returned.
 
-        :rtype: :class:`~types.GeneratorType`
-        :returns: A generator of items from the API.
-        :raises ValueError: If the iterator has already been started.
+        Returns:
+            types.GeneratorType[Any]: A generator of items from the API.
+
+        Raises:
+            ValueError: If the iterator has already been started.
         """
         if self._started:
             raise ValueError('Iterator has already started', self)
@@ -235,15 +201,14 @@ def __iter__(self):
     def _page_iter(self, increment):
         """Generator of pages of API responses.
 
-        :type increment: bool
-        :param increment: Flag indicating if the total number of results
-                          should be incremented on each page. This is useful
-                          since a page iterator will want to increment by
-                          results per page while an items iterator will want
-                          to increment per item.
+        Args:
+            increment (bool): Flag indicating if the total number of results
+                should be incremented on each page. This is useful since a page
+                iterator will want to increment by results per page while an
+                items iterator will want to increment per item.
 
-        :rtype: :class:`Page`
-        :returns: pages
+        Yields:
+            Page: each page of items from the API.
         """
         page = self._next_page()
         while page is not None:
@@ -253,70 +218,82 @@ def _page_iter(self, increment):
             yield page
             page = self._next_page()
 
-    @staticmethod
-    def _next_page():
+    @abc.abstractmethod
+    def _next_page(self):
         """Get the next page in the iterator.
 
         This does nothing and is intended to be over-ridden by subclasses
         to return the next :class:`Page`.
 
-        :raises NotImplementedError: Always.
+        Raises:
+            NotImplementedError: Always, this method is abstract.
         """
         raise NotImplementedError
 
 
-class HTTPIterator(Iterator):
-    """A generic class for iterating through Cloud JSON APIs list responses.
-
-    :type client: :class:`~google.cloud.client.Client`
-    :param client: The client used to identify the application.
-
-    :type path: str
-    :param path: The path to query for the list of items.
-
-    :type item_to_value: callable
-    :param item_to_value: Callable to convert an item from JSON
-                          into the native object. Assumed signature
-                          takes an :class:`Iterator` and a dictionary
-                          holding a single item.
-
-    :type items_key: str
-    :param items_key: (Optional) The key used to grab retrieved items from an
-                      API response. Defaults to :data:`DEFAULT_ITEMS_KEY`.
+def _do_nothing_page_start(iterator, page, response):
+    """Helper to provide custom behavior after a :class:`Page` is started.
 
-    :type page_token: str
-    :param page_token: (Optional) A token identifying a page in a result set.
+    This is a do-nothing stand-in as the default value.
 
-    :type max_results: int
-    :param max_results: (Optional) The maximum number of results to fetch.
+    Args:
+        iterator (Iterator): An iterator that holds some request info.
+        page (Page): The page that was just created.
+        response (Any): The API response for a page.
+    """
+    # pylint: disable=unused-argument
+    pass
 
-    :type extra_params: dict
-    :param extra_params: (Optional) Extra query string parameters for the
-                         API call.
 
-    :type page_start: callable
-    :param page_start: (Optional) Callable to provide any special behavior
-                       after a new page has been created. Assumed signature
-                       takes the :class:`Iterator` that started the page,
-                       the :class:`Page` that was started and the dictionary
-                       containing the page response.
+class HTTPIterator(Iterator):
+    """A generic class for iterating through HTTP/JSON API list responses.
+
+    To make an iterator work, you'll need to provide a way to convert a JSON
+    item returned from the API into the object of your choice (via
+    ``item_to_value``). You also may need to specify a custom ``items_key`` so
+    that a given response (containing a page of results) can be parsed into an
+    iterable page of the actual objects you want.
+
+    Args:
+        client (google.cloud.client.Client): The API client.
+        api_request (Callable): The function to use to make API requests.
+            Generally, this will be
+            :meth:`google.cloud._http.JSONConnection.api_request`.
+        path (str): The method path to query for the list of items.
+        item_to_value (Callable[Iterator, Any]): Callable to convert an item
+            from the type in the JSON response into a native object. Will
+            be called with the iterator and a single item.
+        items_key (str): The key in the API response where the list of items
+            can be found.
+        page_token (str): A token identifying a page in a result set to start
+            fetching results from.
+        max_results (int): The maximum number of results to fetch.
+        extra_params (dict): Extra query string parameters for the
+            API call.
+        page_start (Callable[Iterator, Page, dict]):  Callable to provide any
+            special behavior after a new page has been created. Assumed
+            signature takes the :class:`Iterator` that started the page,
+            the :class:`Page` that was started and the dictionary containing
+            the page response.
 
     .. autoattribute:: pages
     """
 
+    _DEFAULT_ITEMS_KEY = 'items'
     _PAGE_TOKEN = 'pageToken'
     _MAX_RESULTS = 'maxResults'
     _NEXT_TOKEN = 'nextPageToken'
     _RESERVED_PARAMS = frozenset([_PAGE_TOKEN, _MAX_RESULTS])
     _HTTP_METHOD = 'GET'
 
-    def __init__(self, client, path, item_to_value,
-                 items_key=DEFAULT_ITEMS_KEY,
+    def __init__(self, client, api_request, path, item_to_value,
+                 items_key=_DEFAULT_ITEMS_KEY,
                  page_token=None, max_results=None, extra_params=None,
                  page_start=_do_nothing_page_start):
         super(HTTPIterator, self).__init__(
             client, item_to_value, page_token=page_token,
             max_results=max_results)
+        self.api_request = api_request
         self.path = path
         self._items_key = items_key
         self.extra_params = extra_params
@@ -329,7 +306,8 @@ def __init__(self, client, path, item_to_value,
     def _verify_params(self):
         """Verifies the parameters don't use any reserved parameter.
 
-        :raises ValueError: If a reserved parameter is used.
+        Raises:
+            ValueError: If a reserved parameter is used.
         """
         reserved_in_use = self._RESERVED_PARAMS.intersection(
             self.extra_params)
@@ -340,9 +318,9 @@ def _verify_params(self):
     def _next_page(self):
         """Get the next page in the iterator.
 
-        :rtype: :class:`Page`
-        :returns: The next page in the iterator (or :data:`None` if
-                  there are no pages left).
+        Returns:
+            Optional[Page]: The next page in the iterator or :data:`None` if
+                there are no pages left.
         """
         if self._has_next_page():
             response = self._get_next_page_response()
@@ -357,8 +335,8 @@ def _next_page(self):
     def _has_next_page(self):
         """Determines whether or not there are more pages with results.
 
-        :rtype: bool
-        :returns: Whether the iterator has more pages.
+        Returns:
+            bool: Whether the iterator has more pages.
         """
         if self.page_number == 0:
             return True
@@ -372,8 +350,8 @@ def _has_next_page(self):
     def _get_query_params(self):
         """Getter for query parameters for the next request.
 
-        :rtype: dict
-        :returns: A dictionary of query parameters.
+        Returns:
+            dict: A dictionary of query parameters.
         """
         result = {}
         if self.next_page_token is not None:
@@ -386,19 +364,20 @@ def _get_query_params(self):
     def _get_next_page_response(self):
         """Requests the next page from the path provided.
 
-        :rtype: dict
-        :returns: The parsed JSON response of the next page's contents.
+        Returns:
+            dict: The parsed JSON response of the next page's contents.
 
-        :raises ValueError: If the HTTP method is not ``GET`` or ``POST``.
+        Raises:
+            ValueError: If the HTTP method is not ``GET`` or ``POST``.
         """
         params = self._get_query_params()
         if self._HTTP_METHOD == 'GET':
-            return self.client._connection.api_request(
+            return self.api_request(
                 method=self._HTTP_METHOD,
                 path=self.path,
                 query_params=params)
         elif self._HTTP_METHOD == 'POST':
-            return self.client._connection.api_request(
+            return self.api_request(
                 method=self._HTTP_METHOD,
                 path=self.path,
                 data=params)
@@ -406,30 +385,23 @@ def _get_next_page_response(self):
             raise ValueError('Unexpected HTTP method', self._HTTP_METHOD)
 
 
-class GAXIterator(Iterator):
+class _GAXIterator(Iterator):
     """A generic class for iterating through Cloud gRPC APIs list responses.
 
-    :type client: :class:`~google.cloud.client.Client`
-    :param client: The client used to identify the application.
-
-    :type page_iter: :class:`~google.gax.PageIterator`
-    :param page_iter: A GAX page iterator to be wrapped and conform to the
-                      :class:`~google.cloud.iterator.Iterator` surface.
-
-    :type item_to_value: callable
-    :param item_to_value: Callable to convert an item from a protobuf
-                          into the native object. Assumed signature
-                          takes an :class:`Iterator` and a single item
-                          from the API response as a protobuf.
-
-    :type max_results: int
-    :param max_results: (Optional) The maximum number of results to fetch.
+    Any:
+        client (google.cloud.client.Client): The API client.
+        page_iter (google.gax.PageIterator): A GAX page iterator to be wrapped
+            to conform to the :class:`Iterator` interface.
+        item_to_value (Callable[Iterator, Any]): Callable to convert an item
+            from the the protobuf response into a native object. Will
+            be called with the iterator and a single item.
+        max_results (int): The maximum number of results to fetch.
 
     .. autoattribute:: pages
     """
 
     def __init__(self, client, page_iter, item_to_value, max_results=None):
-        super(GAXIterator, self).__init__(
+        super(_GAXIterator, self).__init__(
             client, item_to_value, page_token=page_iter.page_token,
             max_results=max_results)
         self._gax_page_iter = page_iter
@@ -440,9 +412,9 @@ def _next_page(self):
         Wraps the response from the :class:`~google.gax.PageIterator` in a
         :class:`Page` instance and captures some state at each page.
 
-        :rtype: :class:`Page`
-        :returns: The next page in the iterator (or :data:`None` if
-                  there are no pages left).
+        Returns:
+            Optional[Page]: The next page in the iterator or :data:`None` if
+                  there are no pages left.
         """
         try:
             items = six.next(self._gax_page_iter)
diff --git a/core/tests/unit/api_core/test_page_iterator.py b/core/tests/unit/api_core/test_page_iterator.py
new file mode 100644
index 0000000000000..82466579e37b4
--- /dev/null
+++ b/core/tests/unit/api_core/test_page_iterator.py
@@ -0,0 +1,461 @@
+# Copyright 2015 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import types
+
+import mock
+import pytest
+import six
+
+from google.api.core import page_iterator
+
+
+def test__do_nothing_page_start():
+    assert page_iterator._do_nothing_page_start(None, None, None) is None
+
+
+class TestPage(object):
+
+    def test_constructor(self):
+        parent = mock.sentinel.parent
+        item_to_value = mock.sentinel.item_to_value
+
+        page = page_iterator.Page(parent, (1, 2, 3), item_to_value)
+
+        assert page.num_items == 3
+        assert page.remaining == 3
+        assert page._parent is parent
+        assert page._item_to_value is item_to_value
+
+    def test___iter__(self):
+        page = page_iterator.Page(None, (), None)
+        assert iter(page) is page
+
+    def test_iterator_calls_parent_item_to_value(self):
+        parent = mock.sentinel.parent
+
+        item_to_value = mock.Mock(
+            side_effect=lambda iterator, value: value, spec=['__call__'])
+
+        page = page_iterator.Page(parent, (10, 11, 12), item_to_value)
+        page._remaining = 100
+
+        assert item_to_value.call_count == 0
+        assert page.remaining == 100
+
+        assert six.next(page) == 10
+        assert item_to_value.call_count == 1
+        item_to_value.assert_called_with(parent, 10)
+        assert page.remaining == 99
+
+        assert six.next(page) == 11
+        assert item_to_value.call_count == 2
+        item_to_value.assert_called_with(parent, 11)
+        assert page.remaining == 98
+
+        assert six.next(page) == 12
+        assert item_to_value.call_count == 3
+        item_to_value.assert_called_with(parent, 12)
+        assert page.remaining == 97
+
+
+class PageIteratorImpl(page_iterator.Iterator):
+    def _next_page(self):
+        return mock.create_autospec(page_iterator.Page, instance=True)
+
+
+class TestIterator(object):
+
+    def test_constructor(self):
+        client = mock.sentinel.client
+        item_to_value = mock.sentinel.item_to_value
+        token = 'ab13nceor03'
+        max_results = 1337
+
+        iterator = PageIteratorImpl(
+            client, item_to_value, page_token=token, max_results=max_results)
+
+        assert not iterator._started
+        assert iterator.client is client
+        assert iterator._item_to_value == item_to_value
+        assert iterator.max_results == max_results
+        # Changing attributes.
+        assert iterator.page_number == 0
+        assert iterator.next_page_token == token
+        assert iterator.num_results == 0
+
+    def test_pages_property_starts(self):
+        iterator = PageIteratorImpl(None, None)
+
+        assert not iterator._started
+
+        assert isinstance(iterator.pages, types.GeneratorType)
+
+        assert iterator._started
+
+    def test_pages_property_restart(self):
+        iterator = PageIteratorImpl(None, None)
+
+        assert iterator.pages
+
+        # Make sure we cannot restart.
+        with pytest.raises(ValueError):
+            assert iterator.pages
+
+    def test__page_iter_increment(self):
+        iterator = PageIteratorImpl(None, None)
+        page = page_iterator.Page(
+            iterator, ('item',), page_iterator._item_to_value_identity)
+        iterator._next_page = mock.Mock(side_effect=[page, None])
+
+        assert iterator.num_results == 0
+
+        page_iter = iterator._page_iter(increment=True)
+        next(page_iter)
+
+        assert iterator.num_results == 1
+
+    def test__page_iter_no_increment(self):
+        iterator = PageIteratorImpl(None, None)
+
+        assert iterator.num_results == 0
+
+        page_iter = iterator._page_iter(increment=False)
+        next(page_iter)
+
+        # results should still be 0 after fetching a page.
+        assert iterator.num_results == 0
+
+    def test__items_iter(self):
+        # Items to be returned.
+        item1 = 17
+        item2 = 100
+        item3 = 211
+
+        # Make pages from mock responses
+        parent = mock.sentinel.parent
+        page1 = page_iterator.Page(
+            parent, (item1, item2), page_iterator._item_to_value_identity)
+        page2 = page_iterator.Page(
+            parent, (item3,), page_iterator._item_to_value_identity)
+
+        iterator = PageIteratorImpl(None, None)
+        iterator._next_page = mock.Mock(side_effect=[page1, page2, None])
+
+        items_iter = iterator._items_iter()
+
+        assert isinstance(items_iter, types.GeneratorType)
+
+        # Consume items and check the state of the iterator.
+        assert iterator.num_results == 0
+
+        assert six.next(items_iter) == item1
+        assert iterator.num_results == 1
+
+        assert six.next(items_iter) == item2
+        assert iterator.num_results == 2
+
+        assert six.next(items_iter) == item3
+        assert iterator.num_results == 3
+
+        with pytest.raises(StopIteration):
+            six.next(items_iter)
+
+    def test___iter__(self):
+        iterator = PageIteratorImpl(None, None)
+        iterator._next_page = mock.Mock(side_effect=[(1, 2), (3,), None])
+
+        assert not iterator._started
+
+        result = list(iterator)
+
+        assert result == [1, 2, 3]
+        assert iterator._started
+
+    def test___iter__restart(self):
+        iterator = PageIteratorImpl(None, None)
+
+        iter(iterator)
+
+        # Make sure we cannot restart.
+        with pytest.raises(ValueError):
+            iter(iterator)
+
+    def test___iter___restart_after_page(self):
+        iterator = PageIteratorImpl(None, None)
+
+        assert iterator.pages
+
+        # Make sure we cannot restart after starting the page iterator
+        with pytest.raises(ValueError):
+            iter(iterator)
+
+
+class TestHTTPIterator(object):
+
+    def test_constructor(self):
+        client = mock.sentinel.client
+        path = '/foo'
+        iterator = page_iterator.HTTPIterator(
+            client, mock.sentinel.api_request,
+            path, mock.sentinel.item_to_value)
+
+        assert not iterator._started
+        assert iterator.client is client
+        assert iterator.path == path
+        assert iterator._item_to_value is mock.sentinel.item_to_value
+        assert iterator._items_key == 'items'
+        assert iterator.max_results is None
+        assert iterator.extra_params == {}
+        assert iterator._page_start == page_iterator._do_nothing_page_start
+        # Changing attributes.
+        assert iterator.page_number == 0
+        assert iterator.next_page_token is None
+        assert iterator.num_results == 0
+
+    def test_constructor_w_extra_param_collision(self):
+        extra_params = {'pageToken': 'val'}
+
+        with pytest.raises(ValueError):
+            page_iterator.HTTPIterator(
+                mock.sentinel.client,
+                mock.sentinel.api_request,
+                mock.sentinel.path,
+                mock.sentinel.item_to_value,
+                extra_params=extra_params)
+
+    def test_iterate(self):
+        path = '/foo'
+        item1 = {'name': '1'}
+        item2 = {'name': '2'}
+        api_request = mock.Mock(return_value={'items': [item1, item2]})
+        iterator = page_iterator.HTTPIterator(
+            mock.sentinel.client, api_request, path=path,
+            item_to_value=page_iterator._item_to_value_identity)
+
+        assert iterator.num_results == 0
+
+        items_iter = iter(iterator)
+
+        val1 = six.next(items_iter)
+        assert val1 == item1
+        assert iterator.num_results == 1
+
+        val2 = six.next(items_iter)
+        assert val2 == item2
+        assert iterator.num_results == 2
+
+        with pytest.raises(StopIteration):
+            six.next(items_iter)
+
+        api_request.assert_called_once_with(
+            method='GET', path=path, query_params={})
+
+    def test__has_next_page_new(self):
+        iterator = page_iterator.HTTPIterator(
+            mock.sentinel.client,
+            mock.sentinel.api_request,
+            mock.sentinel.path,
+            mock.sentinel.item_to_value)
+
+        # The iterator should *always* indicate that it has a next page
+        # when created so that it can fetch the initial page.
+        assert iterator._has_next_page()
+
+    def test__has_next_page_without_token(self):
+        iterator = page_iterator.HTTPIterator(
+            mock.sentinel.client,
+            mock.sentinel.api_request,
+            mock.sentinel.path,
+            mock.sentinel.item_to_value)
+
+        iterator.page_number = 1
+
+        # The iterator should not indicate that it has a new page if the
+        # initial page has been requested and there's no page token.
+        assert not iterator._has_next_page()
+
+    def test__has_next_page_w_number_w_token(self):
+        iterator = page_iterator.HTTPIterator(
+            mock.sentinel.client,
+            mock.sentinel.api_request,
+            mock.sentinel.path,
+            mock.sentinel.item_to_value)
+
+        iterator.page_number = 1
+        iterator.next_page_token = mock.sentinel.token
+
+        # The iterator should indicate that it has a new page if the
+        # initial page has been requested and there's is a page token.
+        assert iterator._has_next_page()
+
+    def test__has_next_page_w_max_results_not_done(self):
+        iterator = page_iterator.HTTPIterator(
+            mock.sentinel.client,
+            mock.sentinel.api_request,
+            mock.sentinel.path,
+            mock.sentinel.item_to_value,
+            max_results=3,
+            page_token=mock.sentinel.token)
+
+        iterator.page_number = 1
+
+        # The iterator should indicate that it has a new page if there
+        # is a page token and it has not consumed more than max_results.
+        assert iterator.num_results < iterator.max_results
+        assert iterator._has_next_page()
+
+    def test__has_next_page_w_max_results_done(self):
+
+        iterator = page_iterator.HTTPIterator(
+            mock.sentinel.client,
+            mock.sentinel.api_request,
+            mock.sentinel.path,
+            mock.sentinel.item_to_value,
+            max_results=3,
+            page_token=mock.sentinel.token)
+
+        iterator.page_number = 1
+        iterator.num_results = 3
+
+        # The iterator should not indicate that it has a new page if there
+        # if it has consumed more than max_results.
+        assert iterator.num_results == iterator.max_results
+        assert not iterator._has_next_page()
+
+    def test__get_query_params_no_token(self):
+        iterator = page_iterator.HTTPIterator(
+            mock.sentinel.client,
+            mock.sentinel.api_request,
+            mock.sentinel.path,
+            mock.sentinel.item_to_value)
+
+        assert iterator._get_query_params() == {}
+
+    def test__get_query_params_w_token(self):
+        iterator = page_iterator.HTTPIterator(
+            mock.sentinel.client,
+            mock.sentinel.api_request,
+            mock.sentinel.path,
+            mock.sentinel.item_to_value)
+        iterator.next_page_token = 'token'
+
+        assert iterator._get_query_params() == {
+            'pageToken': iterator.next_page_token}
+
+    def test__get_query_params_w_max_results(self):
+        max_results = 3
+        iterator = page_iterator.HTTPIterator(
+            mock.sentinel.client,
+            mock.sentinel.api_request,
+            mock.sentinel.path,
+            mock.sentinel.item_to_value,
+            max_results=max_results)
+
+        iterator.num_results = 1
+        local_max = max_results - iterator.num_results
+
+        assert iterator._get_query_params() == {
+            'maxResults': local_max}
+
+    def test__get_query_params_extra_params(self):
+        extra_params = {'key': 'val'}
+        iterator = page_iterator.HTTPIterator(
+            mock.sentinel.client,
+            mock.sentinel.api_request,
+            mock.sentinel.path,
+            mock.sentinel.item_to_value,
+            extra_params=extra_params)
+
+        assert iterator._get_query_params() == extra_params
+
+    def test__get_next_page_response_with_post(self):
+        path = '/foo'
+        page_response = {'items': ['one', 'two']}
+        api_request = mock.Mock(return_value=page_response)
+        iterator = page_iterator.HTTPIterator(
+            mock.sentinel.client, api_request, path=path,
+            item_to_value=page_iterator._item_to_value_identity)
+        iterator._HTTP_METHOD = 'POST'
+
+        response = iterator._get_next_page_response()
+
+        assert response == page_response
+
+        api_request.assert_called_once_with(
+            method='POST', path=path, data={})
+
+    def test__get_next_page_bad_http_method(self):
+        iterator = page_iterator.HTTPIterator(
+            mock.sentinel.client,
+            mock.sentinel.api_request,
+            mock.sentinel.path,
+            mock.sentinel.item_to_value)
+        iterator._HTTP_METHOD = 'NOT-A-VERB'
+
+        with pytest.raises(ValueError):
+            iterator._get_next_page_response()
+
+
+class GAXPageIterator(object):
+    """Fake object that matches gax.PageIterator"""
+    def __init__(self, pages, page_token=None):
+        self._pages = iter(pages)
+        self.page_token = page_token
+
+    def next(self):
+        return six.next(self._pages)
+
+    __next__ = next
+
+
+class TestGAXIterator(object):
+
+    def test_constructor(self):
+        client = mock.sentinel.client
+        token = 'zzzyy78kl'
+        page_iter = GAXPageIterator((), page_token=token)
+        item_to_value = page_iterator._item_to_value_identity
+        max_results = 1337
+        iterator = page_iterator._GAXIterator(
+            client, page_iter, item_to_value, max_results=max_results)
+
+        assert not iterator._started
+        assert iterator.client is client
+        assert iterator._item_to_value is item_to_value
+        assert iterator.max_results == max_results
+        assert iterator._gax_page_iter is page_iter
+        # Changing attributes.
+        assert iterator.page_number == 0
+        assert iterator.next_page_token == token
+        assert iterator.num_results == 0
+
+    def test__next_page(self):
+        page_items = (29, 31)
+        page_token = '2sde98ds2s0hh'
+        page_iter = GAXPageIterator([page_items], page_token=page_token)
+        iterator = page_iterator._GAXIterator(
+            mock.sentinel.client,
+            page_iter,
+            page_iterator._item_to_value_identity)
+
+        page = iterator._next_page()
+
+        assert iterator.next_page_token == page_token
+        assert isinstance(page, page_iterator.Page)
+        assert list(page) == list(page_items)
+
+        next_page = iterator._next_page()
+
+        assert next_page is None
diff --git a/core/tests/unit/test_iterator.py b/core/tests/unit/test_iterator.py
deleted file mode 100644
index a7d9e4f0924dd..0000000000000
--- a/core/tests/unit/test_iterator.py
+++ /dev/null
@@ -1,605 +0,0 @@
-# Copyright 2015 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import unittest
-
-
-class Test__do_nothing_page_start(unittest.TestCase):
-
-    def _call_fut(self, iterator, page, response):
-        from google.cloud.iterator import _do_nothing_page_start
-
-        return _do_nothing_page_start(iterator, page, response)
-
-    def test_do_nothing(self):
-        result = self._call_fut(None, None, None)
-        self.assertIsNone(result)
-
-
-class TestPage(unittest.TestCase):
-
-    @staticmethod
-    def _get_target_class():
-        from google.cloud.iterator import Page
-
-        return Page
-
-    def _make_one(self, *args, **kw):
-        return self._get_target_class()(*args, **kw)
-
-    def test_constructor(self):
-        parent = object()
-        item_to_value = object()
-        page = self._make_one(parent, (1, 2, 3), item_to_value)
-        self.assertIs(page._parent, parent)
-        self.assertEqual(page._num_items, 3)
-        self.assertEqual(page._remaining, 3)
-        self.assertIs(page._item_to_value, item_to_value)
-
-    def test_num_items_property(self):
-        page = self._make_one(None, (), None)
-        num_items = 42
-        page._num_items = num_items
-        self.assertEqual(page.num_items, num_items)
-
-    def test_remaining_property(self):
-        page = self._make_one(None, (), None)
-        remaining = 1337
-        page._remaining = remaining
-        self.assertEqual(page.remaining, remaining)
-
-    def test___iter__(self):
-        page = self._make_one(None, (), None)
-        self.assertIs(iter(page), page)
-
-    def test_iterator_calls__item_to_value(self):
-        import six
-
-        class Parent(object):
-
-            calls = 0
-
-            def item_to_value(self, item):
-                self.calls += 1
-                return item
-
-        parent = Parent()
-        page = self._make_one(parent, (10, 11, 12),
-                              Parent.item_to_value)
-        page._remaining = 100
-
-        self.assertEqual(parent.calls, 0)
-        self.assertEqual(page.remaining, 100)
-        self.assertEqual(six.next(page), 10)
-        self.assertEqual(parent.calls, 1)
-        self.assertEqual(page.remaining, 99)
-        self.assertEqual(six.next(page), 11)
-        self.assertEqual(parent.calls, 2)
-        self.assertEqual(page.remaining, 98)
-        self.assertEqual(six.next(page), 12)
-        self.assertEqual(parent.calls, 3)
-        self.assertEqual(page.remaining, 97)
-
-
-class TestIterator(unittest.TestCase):
-
-    @staticmethod
-    def _get_target_class():
-        from google.cloud.iterator import Iterator
-
-        return Iterator
-
-    def _make_one(self, *args, **kw):
-        return self._get_target_class()(*args, **kw)
-
-    def test_constructor(self):
-        connection = _Connection()
-        client = _Client(connection)
-        item_to_value = object()
-        token = 'ab13nceor03'
-        max_results = 1337
-        iterator = self._make_one(client, item_to_value, page_token=token,
-                                  max_results=max_results)
-
-        self.assertFalse(iterator._started)
-        self.assertIs(iterator.client, client)
-        self.assertIs(iterator._item_to_value, item_to_value)
-        self.assertEqual(iterator.max_results, max_results)
-        # Changing attributes.
-        self.assertEqual(iterator.page_number, 0)
-        self.assertEqual(iterator.next_page_token, token)
-        self.assertEqual(iterator.num_results, 0)
-
-    def test_pages_property(self):
-        iterator = self._make_one(None, None)
-        self.assertFalse(iterator._started)
-        mock_iter = object()
-        incremented = []
-
-        def page_iter(increment):
-            incremented.append(increment)
-            return mock_iter
-
-        iterator._page_iter = page_iter
-        self.assertIs(iterator.pages, mock_iter)
-        self.assertEqual(incremented, [True])
-        # Check the side-effect.
-        self.assertTrue(iterator._started)
-
-    def test_pages_property_started(self):
-        import types
-
-        iterator = self._make_one(None, None)
-        self.assertIsInstance(iterator.pages, types.GeneratorType)
-        # Make sure we cannot restart.
-        with self.assertRaises(ValueError):
-            getattr(iterator, 'pages')
-
-    def test_pages_property_items_started(self):
-        import types
-
-        iterator = self._make_one(None, None)
-        self.assertIsInstance(iter(iterator), types.GeneratorType)
-        with self.assertRaises(ValueError):
-            getattr(iterator, 'pages')
-
-    @staticmethod
-    def _do_nothing(parent, value):
-        return parent, value
-
-    def test__items_iter(self):
-        import types
-        import six
-        from google.cloud.iterator import Page
-
-        # Items to be returned.
-        item1 = 17
-        item2 = 100
-        item3 = 211
-
-        # Make pages from mock responses
-        parent = object()
-        page1 = Page(parent, (item1, item2), self._do_nothing)
-        page2 = Page(parent, (item3,), self._do_nothing)
-
-        iterator = self._make_one(None, None)
-        # Fake the page iterator on the object.
-        incremented = []
-
-        def page_iter(increment):
-            incremented.append(increment)
-            return iter((page1, page2))
-
-        iterator._page_iter = page_iter
-        items_iter = iterator._items_iter()
-        # Make sure it is a generator.
-        self.assertIsInstance(items_iter, types.GeneratorType)
-
-        # Consume items and check the state of the iterator.
-        self.assertEqual(iterator.num_results, 0)
-        self.assertEqual(six.next(items_iter), (parent, item1))
-        self.assertEqual(iterator.num_results, 1)
-        self.assertEqual(six.next(items_iter), (parent, item2))
-        self.assertEqual(iterator.num_results, 2)
-        self.assertEqual(six.next(items_iter), (parent, item3))
-        self.assertEqual(iterator.num_results, 3)
-        with self.assertRaises(StopIteration):
-            six.next(items_iter)
-
-        # Make sure our page_iter() was called correctly.
-        self.assertEqual(incremented, [False])
-
-    def test___iter__(self):
-        iterator = self._make_one(None, None)
-        self.assertFalse(iterator._started)
-        incremented = []
-
-        def page_iter(increment):
-            incremented.append(increment)
-            return iter(())
-
-        iterator._page_iter = page_iter
-        self.assertEqual(list(iterator), [])
-        # Check the side-effect.
-        self.assertTrue(iterator._started)
-
-    def test___iter___started(self):
-        import types
-
-        iterator = self._make_one(None, None)
-        self.assertIsInstance(iter(iterator), types.GeneratorType)
-        with self.assertRaises(ValueError):
-            iter(iterator)
-
-    def test___iter___pages_started(self):
-        import types
-
-        iterator = self._make_one(None, None)
-        self.assertIsInstance(iterator.pages, types.GeneratorType)
-        with self.assertRaises(ValueError):
-            iter(iterator)
-
-    def test__next_page_virtual(self):
-        iterator = self._make_one(None, None)
-        with self.assertRaises(NotImplementedError):
-            iterator._next_page()
-
-
-class TestHTTPIterator(unittest.TestCase):
-
-    @staticmethod
-    def _get_target_class():
-        from google.cloud.iterator import HTTPIterator
-
-        return HTTPIterator
-
-    def _make_one(self, *args, **kw):
-        return self._get_target_class()(*args, **kw)
-
-    def test_constructor(self):
-        from google.cloud.iterator import _do_nothing_page_start
-
-        connection = _Connection()
-        client = _Client(connection)
-        path = '/foo'
-        iterator = self._make_one(client, path, None)
-        self.assertFalse(iterator._started)
-        self.assertIs(iterator.client, client)
-        self.assertEqual(iterator.path, path)
-        self.assertIsNone(iterator._item_to_value)
-        self.assertEqual(iterator._items_key, 'items')
-        self.assertIsNone(iterator.max_results)
-        self.assertEqual(iterator.extra_params, {})
-        self.assertIs(iterator._page_start, _do_nothing_page_start)
-        # Changing attributes.
-        self.assertEqual(iterator.page_number, 0)
-        self.assertIsNone(iterator.next_page_token)
-        self.assertEqual(iterator.num_results, 0)
-
-    def test_constructor_w_extra_param_collision(self):
-        connection = _Connection()
-        client = _Client(connection)
-        path = '/foo'
-        extra_params = {'pageToken': 'val'}
-        with self.assertRaises(ValueError):
-            self._make_one(client, path, None, extra_params=extra_params)
-
-    def test_pages_iter_empty_then_another(self):
-        import six
-        from google.cloud._testing import _Monkey
-        from google.cloud import iterator as MUT
-
-        items_key = 'its-key'
-        iterator = self._make_one(None, None, None, items_key=items_key)
-        # Fake the next page class.
-        fake_page = MUT.Page(None, (), None)
-        page_args = []
-
-        def dummy_response():
-            return {}
-
-        def dummy_page_class(*args):
-            page_args.append(args)
-            return fake_page
-
-        iterator._get_next_page_response = dummy_response
-        pages_iter = iterator.pages
-        with _Monkey(MUT, Page=dummy_page_class):
-            page = six.next(pages_iter)
-        self.assertIs(page, fake_page)
-        self.assertEqual(
-            page_args, [(iterator, (), iterator._item_to_value)])
-
-    def test_iterate(self):
-        import six
-
-        path = '/foo'
-        key1 = 'key1'
-        key2 = 'key2'
-        item1, item2 = object(), object()
-        ITEMS = {key1: item1, key2: item2}
-
-        def item_to_value(iterator, item):  # pylint: disable=unused-argument
-            return ITEMS[item['name']]
-
-        connection = _Connection(
-            {'items': [{'name': key1}, {'name': key2}]})
-        client = _Client(connection)
-        iterator = self._make_one(client, path=path,
-                                  item_to_value=item_to_value)
-        self.assertEqual(iterator.num_results, 0)
-
-        items_iter = iter(iterator)
-        val1 = six.next(items_iter)
-        self.assertEqual(val1, item1)
-        self.assertEqual(iterator.num_results, 1)
-
-        val2 = six.next(items_iter)
-        self.assertEqual(val2, item2)
-        self.assertEqual(iterator.num_results, 2)
-
-        with self.assertRaises(StopIteration):
-            six.next(items_iter)
-
-        kw, = connection._requested
-        self.assertEqual(kw['method'], 'GET')
-        self.assertEqual(kw['path'], path)
-        self.assertEqual(kw['query_params'], {})
-
-    def test__has_next_page_new(self):
-        connection = _Connection()
-        client = _Client(connection)
-        path = '/foo'
-        iterator = self._make_one(client, path, None)
-        self.assertTrue(iterator._has_next_page())
-
-    def test__has_next_page_w_number_no_token(self):
-        connection = _Connection()
-        client = _Client(connection)
-        path = '/foo'
-        iterator = self._make_one(client, path, None)
-        iterator.page_number = 1
-        self.assertFalse(iterator._has_next_page())
-
-    def test__has_next_page_w_number_w_token(self):
-        connection = _Connection()
-        client = _Client(connection)
-        path = '/foo'
-        token = 'token'
-        iterator = self._make_one(client, path, None)
-        iterator.page_number = 1
-        iterator.next_page_token = token
-        self.assertTrue(iterator._has_next_page())
-
-    def test__has_next_page_w_max_results_not_done(self):
-        iterator = self._make_one(None, None, None, max_results=3,
-                                  page_token='definitely-not-none')
-        iterator.page_number = 1
-        self.assertLess(iterator.num_results, iterator.max_results)
-        self.assertTrue(iterator._has_next_page())
-
-    def test__has_next_page_w_max_results_done(self):
-        iterator = self._make_one(None, None, None, max_results=3)
-        iterator.page_number = 1
-        iterator.num_results = iterator.max_results
-        self.assertFalse(iterator._has_next_page())
-
-    def test__get_query_params_no_token(self):
-        connection = _Connection()
-        client = _Client(connection)
-        path = '/foo'
-        iterator = self._make_one(client, path, None)
-        self.assertEqual(iterator._get_query_params(), {})
-
-    def test__get_query_params_w_token(self):
-        connection = _Connection()
-        client = _Client(connection)
-        path = '/foo'
-        token = 'token'
-        iterator = self._make_one(client, path, None)
-        iterator.next_page_token = token
-        self.assertEqual(iterator._get_query_params(),
-                         {'pageToken': token})
-
-    def test__get_query_params_w_max_results(self):
-        connection = _Connection()
-        client = _Client(connection)
-        path = '/foo'
-        max_results = 3
-        iterator = self._make_one(client, path, None,
-                                  max_results=max_results)
-        iterator.num_results = 1
-        local_max = max_results - iterator.num_results
-        self.assertEqual(iterator._get_query_params(),
-                         {'maxResults': local_max})
-
-    def test__get_query_params_extra_params(self):
-        connection = _Connection()
-        client = _Client(connection)
-        path = '/foo'
-        extra_params = {'key': 'val'}
-        iterator = self._make_one(client, path, None,
-                                  extra_params=extra_params)
-        self.assertEqual(iterator._get_query_params(), extra_params)
-
-    def test__get_query_params_w_token_and_extra_params(self):
-        connection = _Connection()
-        client = _Client(connection)
-        path = '/foo'
-        token = 'token'
-        extra_params = {'key': 'val'}
-        iterator = self._make_one(client, path, None,
-                                  extra_params=extra_params)
-        iterator.next_page_token = token
-
-        expected_query = extra_params.copy()
-        expected_query.update({'pageToken': token})
-        self.assertEqual(iterator._get_query_params(), expected_query)
-
-    def test__get_next_page_response_new_no_token_in_response(self):
-        path = '/foo'
-        token = 'token'
-        key1 = 'key1'
-        key2 = 'key2'
-        connection = _Connection({'items': [{'name': key1}, {'name': key2}],
-                                  'nextPageToken': token})
-        client = _Client(connection)
-        iterator = self._make_one(client, path, None)
-        response = iterator._get_next_page_response()
-        self.assertEqual(response['items'], [{'name': key1}, {'name': key2}])
-        kw, = connection._requested
-        self.assertEqual(kw['method'], 'GET')
-        self.assertEqual(kw['path'], path)
-        self.assertEqual(kw['query_params'], {})
-
-    def test__get_next_page_response_with_post(self):
-        path = '/foo'
-        returned = {'green': 'eggs', 'ham': 55}
-        connection = _Connection(returned)
-        client = _Client(connection)
-        iterator = self._make_one(client, path, None)
-        iterator._HTTP_METHOD = 'POST'
-        response = iterator._get_next_page_response()
-        self.assertEqual(response, returned)
-
-        self.assertEqual(len(connection._requested), 1)
-        called_kwargs = connection._requested[0]
-        self.assertEqual(called_kwargs, {
-            'method': iterator._HTTP_METHOD,
-            'path': path,
-            'data': {},
-        })
-
-    def test__get_next_page_bad_http_method(self):
-        path = '/foo'
-        client = _Client(None)
-        iterator = self._make_one(client, path, None)
-        iterator._HTTP_METHOD = 'NOT-A-VERB'
-        with self.assertRaises(ValueError):
-            iterator._get_next_page_response()
-
-
-class TestGAXIterator(unittest.TestCase):
-
-    @staticmethod
-    def _get_target_class():
-        from google.cloud.iterator import GAXIterator
-
-        return GAXIterator
-
-    def _make_one(self, *args, **kw):
-        return self._get_target_class()(*args, **kw)
-
-    def test_constructor(self):
-        client = _Client(None)
-        token = 'zzzyy78kl'
-        page_iter = SimpleIter(token)
-        item_to_value = object()
-        max_results = 1337
-        iterator = self._make_one(client, page_iter, item_to_value,
-                                  max_results=max_results)
-
-        self.assertFalse(iterator._started)
-        self.assertIs(iterator.client, client)
-        self.assertIs(iterator._item_to_value, item_to_value)
-        self.assertEqual(iterator.max_results, max_results)
-        self.assertIs(iterator._gax_page_iter, page_iter)
-        # Changing attributes.
-        self.assertEqual(iterator.page_number, 0)
-        self.assertEqual(iterator.next_page_token, token)
-        self.assertEqual(iterator.num_results, 0)
-
-    @staticmethod
-    def _do_nothing(parent, value):
-        return parent, value
-
-    def test__next_page(self):
-        from google.cloud._testing import _GAXPageIterator
-        from google.cloud.iterator import Page
-
-        # Make a mock ``google.gax.PageIterator``
-        page_items = (29, 31)  # Items for just one page.
-        page_token = '2sde98ds2s0hh'
-        page_iter = _GAXPageIterator(page_items, page_token=page_token)
-        # Wrap the GAX iterator.
-        iterator = self._make_one(None, page_iter, self._do_nothing)
-
-        page = iterator._next_page()
-        # First check the page token.
-        self.assertEqual(iterator.next_page_token, page_token)
-        # Then check the page.
-        self.assertIsInstance(page, Page)
-        # _do_nothing will throw the iterator in front.
-        expected = zip((iterator, iterator), page_items)
-        self.assertEqual(list(page), list(expected))
-
-    def test__next_page_empty(self):
-        from google.cloud._testing import _GAXPageIterator
-
-        # Make a mock ``google.gax.PageIterator``
-        page_iter = _GAXPageIterator()
-        # Wrap the GAX iterator.
-        iterator = self._make_one(None, page_iter, self._do_nothing)
-
-        page = iterator._next_page()
-        self.assertIsNone(page)
-        self.assertIsNone(iterator.next_page_token)
-
-    def test_iterate(self):
-        import six
-        from google.cloud._testing import _GAXPageIterator
-
-        item1 = object()
-        item2 = object()
-        item3 = object()
-        token1 = 'smkdme30e2e32r'
-        token2 = '39cm9csl123dck'
-
-        # Make a mock ``google.gax.PageIterator``
-        page1 = (item1,)
-        page2 = (item2, item3)
-        page_iter = _GAXPageIterator(page1, page2, page_token=token1)
-        iterator = self._make_one(None, page_iter, self._do_nothing)
-
-        self.assertEqual(iterator.num_results, 0)
-
-        items_iter = iter(iterator)
-        val1 = six.next(items_iter)
-        self.assertEqual(val1, (iterator, item1))
-        self.assertEqual(iterator.num_results, 1)
-        self.assertEqual(iterator.next_page_token, token1)
-
-        # Before grabbing the next page, hot-swap the token
-        # on the ``page_iter``.
-        page_iter.page_token = token2
-
-        # Grab the next item (which will cause the next page).
-        val2 = six.next(items_iter)
-        self.assertEqual(val2, (iterator, item2))
-        self.assertEqual(iterator.num_results, 2)
-        self.assertEqual(iterator.next_page_token, token2)
-
-        # Grab the final item from the final / current page.
-        val3 = six.next(items_iter)
-        self.assertEqual(val3, (iterator, item3))
-        self.assertEqual(iterator.num_results, 3)
-        # Make sure the token did not change.
-        self.assertEqual(iterator.next_page_token, token2)
-
-        with self.assertRaises(StopIteration):
-            six.next(items_iter)
-
-
-class _Connection(object):
-
-    def __init__(self, *responses):
-        self._responses = responses
-        self._requested = []
-
-    def api_request(self, **kw):
-        self._requested.append(kw)
-        response, self._responses = self._responses[0], self._responses[1:]
-        return response
-
-
-class _Client(object):
-
-    def __init__(self, connection):
-        self._connection = connection
-
-
-class SimpleIter(object):
-
-    def __init__(self, page_token=None):
-        self.page_token = page_token
diff --git a/datastore/google/cloud/datastore/query.py b/datastore/google/cloud/datastore/query.py
index 2ab65064f85e1..d0c9cea9f7118 100644
--- a/datastore/google/cloud/datastore/query.py
+++ b/datastore/google/cloud/datastore/query.py
@@ -16,9 +16,8 @@
 
 import base64
 
+from google.api.core import page_iterator
 from google.cloud._helpers import _ensure_tuple_or_list
-from google.cloud.iterator import Iterator as BaseIterator
-from google.cloud.iterator import Page
 
 from google.cloud.proto.datastore.v1 import datastore_pb2 as _datastore_pb2
 from google.cloud.proto.datastore.v1 import entity_pb2 as _entity_pb2
@@ -373,7 +372,7 @@ def fetch(self, limit=None, offset=0, start_cursor=None, end_cursor=None,
             start_cursor=start_cursor, end_cursor=end_cursor)
 
 
-class Iterator(BaseIterator):
+class Iterator(page_iterator.Iterator):
     """Represent the state of a given execution of a Query.
 
     :type query: :class:`~google.cloud.datastore.query.Query`
@@ -499,7 +498,7 @@ def _next_page(self):
             query=query_pb,
         )
         entity_pbs = self._process_query_results(response_pb)
-        return Page(self, entity_pbs, self._item_to_value)
+        return page_iterator.Page(self, entity_pbs, self._item_to_value)
 
 
 def _pb_from_query(query):
@@ -571,7 +570,7 @@ def _pb_from_query(query):
 def _item_to_entity(iterator, entity_pb):
     """Convert a raw protobuf entity to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type entity_pb:
diff --git a/datastore/tests/unit/test_query.py b/datastore/tests/unit/test_query.py
index 26c1b6cc0831d..d8d08430dab94 100644
--- a/datastore/tests/unit/test_query.py
+++ b/datastore/tests/unit/test_query.py
@@ -488,7 +488,7 @@ def test__process_query_results_bad_enum(self):
             iterator._process_query_results(response_pb)
 
     def _next_page_helper(self, txn_id=None):
-        from google.cloud.iterator import Page
+        from google.api.core import page_iterator
         from google.cloud.proto.datastore.v1 import datastore_pb2
         from google.cloud.proto.datastore.v1 import entity_pb2
         from google.cloud.proto.datastore.v1 import query_pb2
@@ -509,7 +509,7 @@ def _next_page_helper(self, txn_id=None):
         iterator = self._make_one(query, client)
 
         page = iterator._next_page()
-        self.assertIsInstance(page, Page)
+        self.assertIsInstance(page, page_iterator.Page)
         self.assertIs(page._parent, iterator)
 
         partition_id = entity_pb2.PartitionId(project_id=project)
diff --git a/dns/google/cloud/dns/client.py b/dns/google/cloud/dns/client.py
index 4025f7e9eb68c..c800d58975602 100644
--- a/dns/google/cloud/dns/client.py
+++ b/dns/google/cloud/dns/client.py
@@ -14,12 +14,11 @@
 
 """Client for interacting with the Google Cloud DNS API."""
 
-
+from google.api.core import page_iterator
 from google.cloud.client import ClientWithProject
 
 from google.cloud.dns._http import Connection
 from google.cloud.dns.zone import ManagedZone
-from google.cloud.iterator import HTTPIterator
 
 
 class Client(ClientWithProject):
@@ -86,14 +85,18 @@ def list_zones(self, max_results=None, page_token=None):
                            not passed, the API will return the first page of
                            zones.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~google.cloud.dns.zone.ManagedZone`
                   belonging to this project.
         """
         path = '/projects/%s/managedZones' % (self.project,)
-        return HTTPIterator(
-            client=self, path=path, item_to_value=_item_to_zone,
-            items_key='managedZones', page_token=page_token,
+        return page_iterator.HTTPIterator(
+            client=self,
+            api_request=self._connection.api_request,
+            path=path,
+            item_to_value=_item_to_zone,
+            items_key='managedZones',
+            page_token=page_token,
             max_results=max_results)
 
     def zone(self, name, dns_name=None, description=None):
@@ -122,7 +125,7 @@ def zone(self, name, dns_name=None, description=None):
 def _item_to_zone(iterator, resource):
     """Convert a JSON managed zone to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that has retrieved the item.
 
     :type resource: dict
diff --git a/dns/google/cloud/dns/zone.py b/dns/google/cloud/dns/zone.py
index 4c278e9038624..db9aa68df0715 100644
--- a/dns/google/cloud/dns/zone.py
+++ b/dns/google/cloud/dns/zone.py
@@ -16,11 +16,11 @@
 
 import six
 
+from google.api.core import page_iterator
 from google.cloud._helpers import _rfc3339_to_datetime
 from google.cloud.exceptions import NotFound
 from google.cloud.dns.changes import Changes
 from google.cloud.dns.resource_record_set import ResourceRecordSet
-from google.cloud.iterator import HTTPIterator
 
 
 class ManagedZone(object):
@@ -340,17 +340,21 @@ def list_resource_record_sets(self, max_results=None, page_token=None,
             (Optional) the client to use.  If not passed, falls back to the
             ``client`` stored on the current zone.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~.resource_record_set.ResourceRecordSet`
                   belonging to this zone.
         """
         client = self._require_client(client)
         path = '/projects/%s/managedZones/%s/rrsets' % (
             self.project, self.name)
-        iterator = HTTPIterator(
-            client=client, path=path,
-            item_to_value=_item_to_resource_record_set, items_key='rrsets',
-            page_token=page_token, max_results=max_results)
+        iterator = page_iterator.HTTPIterator(
+            client=client,
+            api_request=client._connection.api_request,
+            path=path,
+            item_to_value=_item_to_resource_record_set,
+            items_key='rrsets',
+            page_token=page_token,
+            max_results=max_results)
         iterator.zone = self
         return iterator
 
@@ -374,16 +378,20 @@ def list_changes(self, max_results=None, page_token=None, client=None):
             (Optional) the client to use.  If not passed, falls back to the
             ``client`` stored on the current zone.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~.changes.Changes`
                   belonging to this zone.
         """
         client = self._require_client(client)
         path = '/projects/%s/managedZones/%s/changes' % (
             self.project, self.name)
-        iterator = HTTPIterator(
-            client=client, path=path, item_to_value=_item_to_changes,
-            items_key='changes', page_token=page_token,
+        iterator = page_iterator.HTTPIterator(
+            client=client,
+            api_request=client._connection.api_request,
+            path=path,
+            item_to_value=_item_to_changes,
+            items_key='changes',
+            page_token=page_token,
             max_results=max_results)
         iterator.zone = self
         return iterator
@@ -392,7 +400,7 @@ def list_changes(self, max_results=None, page_token=None, client=None):
 def _item_to_resource_record_set(iterator, resource):
     """Convert a JSON resource record set value to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that has retrieved the item.
 
     :type resource: dict
@@ -407,7 +415,7 @@ def _item_to_resource_record_set(iterator, resource):
 def _item_to_changes(iterator, resource):
     """Convert a JSON "changes" value to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that has retrieved the item.
 
     :type resource: dict
diff --git a/docs/core/index.rst b/docs/core/index.rst
index 58985beec8f17..964609401655a 100644
--- a/docs/core/index.rst
+++ b/docs/core/index.rst
@@ -4,7 +4,6 @@ Core
 .. toctree::
     config
     auth
-    iterators
     operation-api
     modules
 
diff --git a/docs/core/iterators.rst b/docs/core/iterators.rst
deleted file mode 100644
index b53a41fe40feb..0000000000000
--- a/docs/core/iterators.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Iterators
-~~~~~~~~~
-
-.. automodule:: google.cloud.iterator
-  :members:
-  :show-inheritance:
diff --git a/logging/google/cloud/logging/_gax.py b/logging/google/cloud/logging/_gax.py
index 3fb648d98f7fc..bfea5df022ade 100644
--- a/logging/google/cloud/logging/_gax.py
+++ b/logging/google/cloud/logging/_gax.py
@@ -16,6 +16,7 @@
 
 import functools
 
+from google.api.core import page_iterator
 from google.cloud.gapic.logging.v2.config_service_v2_client import (
     ConfigServiceV2Client)
 from google.cloud.gapic.logging.v2.logging_service_v2_client import (
@@ -37,7 +38,6 @@
 from google.cloud._http import DEFAULT_USER_AGENT
 from google.cloud.exceptions import Conflict
 from google.cloud.exceptions import NotFound
-from google.cloud.iterator import GAXIterator
 from google.cloud.logging import __version__
 from google.cloud.logging._helpers import entry_from_resource
 from google.cloud.logging.sink import Sink
@@ -84,7 +84,7 @@ def list_entries(self, projects, filter_='', order_by='',
                            passed, the API will return the first page of
                            entries.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~google.cloud.logging.entries._BaseEntry`
                   accessible to the current API.
         """
@@ -101,7 +101,8 @@ def list_entries(self, projects, filter_='', order_by='',
         loggers = {}
         item_to_value = functools.partial(
             _item_to_entry, loggers=loggers)
-        return GAXIterator(self._client, page_iter, item_to_value)
+        return page_iterator._GAXIterator(
+            self._client, page_iter, item_to_value)
 
     def write_entries(self, entries, logger_name=None, resource=None,
                       labels=None):
@@ -188,7 +189,8 @@ def list_sinks(self, project, page_size=0, page_token=None):
         path = 'projects/%s' % (project,)
         page_iter = self._gax_api.list_sinks(path, page_size=page_size,
                                              options=options)
-        return GAXIterator(self._client, page_iter, _item_to_sink)
+        return page_iterator._GAXIterator(
+            self._client, page_iter, _item_to_sink)
 
     def sink_create(self, project, sink_name, filter_, destination):
         """API call:  create a sink resource.
@@ -330,7 +332,7 @@ def list_metrics(self, project, page_size=0, page_token=None):
                            passed, the API will return the first page of
                            metrics.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of
                   :class:`~google.cloud.logging.metric.Metric`
                   accessible to the current API.
@@ -341,7 +343,8 @@ def list_metrics(self, project, page_size=0, page_token=None):
         path = 'projects/%s' % (project,)
         page_iter = self._gax_api.list_log_metrics(
             path, page_size=page_size, options=options)
-        return GAXIterator(self._client, page_iter, _item_to_metric)
+        return page_iterator._GAXIterator(
+            self._client, page_iter, _item_to_metric)
 
     def metric_create(self, project, metric_name, filter_, description):
         """API call:  create a metric resource.
@@ -507,12 +510,12 @@ def _item_to_entry(iterator, entry_pb, loggers):
 
         This method does not have the correct signature to be used as
         the ``item_to_value`` argument to
-        :class:`~google.cloud.iterator.Iterator`. It is intended to be
+        :class:`~google.api.core.page_iterator.Iterator`. It is intended to be
         patched with a mutable ``loggers`` argument that can be updated
         on subsequent calls. For an example, see how the method is
         used above in :meth:`_LoggingAPI.list_entries`.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type entry_pb: :class:`.log_entry_pb2.LogEntry`
@@ -534,7 +537,7 @@ def _item_to_entry(iterator, entry_pb, loggers):
 def _item_to_sink(iterator, log_sink_pb):
     """Convert a sink protobuf to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type log_sink_pb:
@@ -553,7 +556,7 @@ def _item_to_sink(iterator, log_sink_pb):
 def _item_to_metric(iterator, log_metric_pb):
     """Convert a metric protobuf to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type log_metric_pb:
diff --git a/logging/google/cloud/logging/_http.py b/logging/google/cloud/logging/_http.py
index 7ca5c457c25df..45db345fa847c 100644
--- a/logging/google/cloud/logging/_http.py
+++ b/logging/google/cloud/logging/_http.py
@@ -16,8 +16,8 @@
 
 import functools
 
+from google.api.core import page_iterator
 from google.cloud import _http
-from google.cloud.iterator import HTTPIterator
 
 from google.cloud.logging import __version__
 from google.cloud.logging._helpers import entry_from_resource
@@ -93,7 +93,7 @@ def list_entries(self, projects, filter_=None, order_by=None,
                            passed, the API will return the first page of
                            entries.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~google.cloud.logging.entries._BaseEntry`
                   accessible to the current API.
         """
@@ -115,10 +115,14 @@ def list_entries(self, projects, filter_=None, order_by=None,
         loggers = {}
         item_to_value = functools.partial(
             _item_to_entry, loggers=loggers)
-        iterator = HTTPIterator(
-            client=self._client, path=path,
-            item_to_value=item_to_value, items_key='entries',
-            page_token=page_token, extra_params=extra_params)
+        iterator = page_iterator.HTTPIterator(
+            client=self._client,
+            api_request=self._client._connection.api_request,
+            path=path,
+            item_to_value=item_to_value,
+            items_key='entries',
+            page_token=page_token,
+            extra_params=extra_params)
         # This method uses POST to make a read-only request.
         iterator._HTTP_METHOD = 'POST'
         return iterator
@@ -205,7 +209,7 @@ def list_sinks(self, project, page_size=None, page_token=None):
                            passed, the API will return the first page of
                            sinks.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of
                   :class:`~google.cloud.logging.sink.Sink`
                   accessible to the current API.
@@ -216,10 +220,14 @@ def list_sinks(self, project, page_size=None, page_token=None):
             extra_params['pageSize'] = page_size
 
         path = '/projects/%s/sinks' % (project,)
-        return HTTPIterator(
-            client=self._client, path=path,
-            item_to_value=_item_to_sink, items_key='sinks',
-            page_token=page_token, extra_params=extra_params)
+        return page_iterator.HTTPIterator(
+            client=self._client,
+            api_request=self._client._connection.api_request,
+            path=path,
+            item_to_value=_item_to_sink,
+            items_key='sinks',
+            page_token=page_token,
+            extra_params=extra_params)
 
     def sink_create(self, project, sink_name, filter_, destination):
         """API call:  create a sink resource.
@@ -345,7 +353,7 @@ def list_metrics(self, project, page_size=None, page_token=None):
                            passed, the API will return the first page of
                            metrics.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of
                   :class:`~google.cloud.logging.metric.Metric`
                   accessible to the current API.
@@ -356,10 +364,14 @@ def list_metrics(self, project, page_size=None, page_token=None):
             extra_params['pageSize'] = page_size
 
         path = '/projects/%s/metrics' % (project,)
-        return HTTPIterator(
-            client=self._client, path=path,
-            item_to_value=_item_to_metric, items_key='metrics',
-            page_token=page_token, extra_params=extra_params)
+        return page_iterator.HTTPIterator(
+            client=self._client,
+            api_request=self._client._connection.api_request,
+            path=path,
+            item_to_value=_item_to_metric,
+            items_key='metrics',
+            page_token=page_token,
+            extra_params=extra_params)
 
     def metric_create(self, project, metric_name, filter_, description=None):
         """API call:  create a metric resource.
@@ -459,12 +471,12 @@ def _item_to_entry(iterator, resource, loggers):
 
         This method does not have the correct signature to be used as
         the ``item_to_value`` argument to
-        :class:`~google.cloud.iterator.Iterator`. It is intended to be
+        :class:`~google.api.core.page_iterator.Iterator`. It is intended to be
         patched with a mutable ``loggers`` argument that can be updated
         on subsequent calls. For an example, see how the method is
         used above in :meth:`_LoggingAPI.list_entries`.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type resource: dict
@@ -485,7 +497,7 @@ def _item_to_entry(iterator, resource, loggers):
 def _item_to_sink(iterator, resource):
     """Convert a sink resource to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type resource: dict
@@ -500,7 +512,7 @@ def _item_to_sink(iterator, resource):
 def _item_to_metric(iterator, resource):
     """Convert a metric resource to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type resource: dict
diff --git a/logging/google/cloud/logging/client.py b/logging/google/cloud/logging/client.py
index 3ce67fba151c8..23ec84ec67d01 100644
--- a/logging/google/cloud/logging/client.py
+++ b/logging/google/cloud/logging/client.py
@@ -194,7 +194,7 @@ def list_entries(self, projects=None, filter_=None, order_by=None,
                            passed, the API will return the first page of
                            entries.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~google.cloud.logging.entries._BaseEntry`
                   accessible to the current client.
         """
@@ -243,7 +243,7 @@ def list_sinks(self, page_size=None, page_token=None):
                            passed, the API will return the first page of
                            sinks.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of
                   :class:`~google.cloud.logging.sink.Sink`
                   accessible to the current client.
@@ -288,7 +288,7 @@ def list_metrics(self, page_size=None, page_token=None):
                            passed, the API will return the first page of
                            metrics.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~google.cloud.logging.metric.Metric`
                   accessible to the current client.
         """
diff --git a/logging/google/cloud/logging/logger.py b/logging/google/cloud/logging/logger.py
index a13b06cd260b5..1006ebb1e693d 100644
--- a/logging/google/cloud/logging/logger.py
+++ b/logging/google/cloud/logging/logger.py
@@ -344,7 +344,7 @@ def list_entries(self, projects=None, filter_=None, order_by=None,
                            passed, the API will return the first page of
                            entries.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~google.cloud.logging.entries._BaseEntry`
                   accessible to the current logger.
         """
diff --git a/pubsub/google/cloud/pubsub/_gax.py b/pubsub/google/cloud/pubsub/_gax.py
index 94dc639178ef9..35e56717b3c2e 100644
--- a/pubsub/google/cloud/pubsub/_gax.py
+++ b/pubsub/google/cloud/pubsub/_gax.py
@@ -16,6 +16,7 @@
 
 import functools
 
+from google.api.core import page_iterator
 from google.cloud.gapic.pubsub.v1.publisher_client import PublisherClient
 from google.cloud.gapic.pubsub.v1.subscriber_client import SubscriberClient
 from google.gax import CallOptions
@@ -35,7 +36,6 @@
 from google.cloud._http import DEFAULT_USER_AGENT
 from google.cloud.exceptions import Conflict
 from google.cloud.exceptions import NotFound
-from google.cloud.iterator import GAXIterator
 from google.cloud.pubsub import __version__
 from google.cloud.pubsub._helpers import subscription_name_from_path
 from google.cloud.pubsub.snapshot import Snapshot
@@ -78,7 +78,7 @@ def list_topics(self, project, page_size=0, page_token=None):
                            passed, the API will return the first page of
                            topics.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~google.cloud.pubsub.topic.Topic`
                   accessible to the current API.
         """
@@ -88,7 +88,8 @@ def list_topics(self, project, page_size=0, page_token=None):
         path = 'projects/%s' % (project,)
         page_iter = self._gax_api.list_topics(
             path, page_size=page_size, options=options)
-        return GAXIterator(self._client, page_iter, _item_to_topic)
+        return page_iterator._GAXIterator(
+            self._client, page_iter, _item_to_topic)
 
     def topic_create(self, topic_path):
         """API call:  create a topic
@@ -204,7 +205,7 @@ def topic_list_subscriptions(self, topic, page_size=0, page_token=None):
                            If not passed, the API will return the first page
                            of subscriptions.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of
                   :class:`~google.cloud.pubsub.subscription.Subscription`
                   accessible to the current API.
@@ -223,8 +224,8 @@ def topic_list_subscriptions(self, topic, page_size=0, page_token=None):
                 raise NotFound(topic_path)
             raise
 
-        iterator = GAXIterator(self._client, page_iter,
-                               _item_to_subscription_for_topic)
+        iterator = page_iterator._GAXIterator(
+            self._client, page_iter, _item_to_subscription_for_topic)
         iterator.topic = topic
         return iterator
 
@@ -260,7 +261,7 @@ def list_subscriptions(self, project, page_size=0, page_token=None):
                            If not passed, the API will return the first page
                            of subscriptions.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of
                   :class:`~google.cloud.pubsub.subscription.Subscription`
                   accessible to the current API.
@@ -278,7 +279,8 @@ def list_subscriptions(self, project, page_size=0, page_token=None):
         topics = {}
         item_to_value = functools.partial(
             _item_to_sub_for_client, topics=topics)
-        return GAXIterator(self._client, page_iter, item_to_value)
+        return page_iterator._GAXIterator(
+            self._client, page_iter, item_to_value)
 
     def subscription_create(self, subscription_path, topic_path,
                             ack_deadline=None, push_endpoint=None,
@@ -542,7 +544,7 @@ def list_snapshots(self, project, page_size=0, page_token=None):
                            passed, the API will return the first page of
                            topics.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~google.cloud.pubsub.snapshot.Snapshot`
                   accessible to the current API.
         """
@@ -559,7 +561,8 @@ def list_snapshots(self, project, page_size=0, page_token=None):
         topics = {}
         item_to_value = functools.partial(
             _item_to_snapshot_for_client, topics=topics)
-        return GAXIterator(self._client, page_iter, item_to_value)
+        return page_iterator._GAXIterator(
+            self._client, page_iter, item_to_value)
 
     def snapshot_create(self, snapshot_path, subscription_path):
         """API call:  create a snapshot
@@ -709,7 +712,7 @@ def make_gax_subscriber_api(credentials=None, host=None):
 def _item_to_topic(iterator, resource):
     """Convert a protobuf topic to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type resource: :class:`.pubsub_pb2.Topic`
@@ -725,7 +728,7 @@ def _item_to_topic(iterator, resource):
 def _item_to_subscription_for_topic(iterator, subscription_path):
     """Convert a subscription name to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type subscription_path: str
@@ -746,12 +749,12 @@ def _item_to_sub_for_client(iterator, sub_pb, topics):
 
        This method does not have the correct signature to be used as
        the ``item_to_value`` argument to
-       :class:`~google.cloud.iterator.Iterator`. It is intended to be
+       :class:`~google.api.core.page_iterator.Iterator`. It is intended to be
        patched with a mutable topics argument that can be updated
        on subsequent calls. For an example, see how the method is
        used above in :meth:`_SubscriberAPI.list_subscriptions`.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type sub_pb: :class:`.pubsub_pb2.Subscription`
@@ -776,12 +779,12 @@ def _item_to_snapshot_for_client(iterator, snapshot_pb, topics):
 
        This method does not have the correct signature to be used as
        the ``item_to_value`` argument to
-       :class:`~google.cloud.iterator.Iterator`. It is intended to be
+       :class:`~google.api.core.page_iterator.Iterator`. It is intended to be
        patched with a mutable topics argument that can be updated
        on subsequent calls. For an example, see how the method is
        used above in :meth:`_SubscriberAPI.list_snapshots`.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type sub_pb: :class:`.pubsub_pb2.Snapshot`
diff --git a/pubsub/google/cloud/pubsub/_http.py b/pubsub/google/cloud/pubsub/_http.py
index f1d07237d7df8..5173b4095ca87 100644
--- a/pubsub/google/cloud/pubsub/_http.py
+++ b/pubsub/google/cloud/pubsub/_http.py
@@ -19,10 +19,10 @@
 import functools
 import os
 
+from google.api.core import page_iterator
 from google.cloud import _http
 from google.cloud._helpers import _timedelta_to_duration_pb
 from google.cloud.environment_vars import PUBSUB_EMULATOR
-from google.cloud.iterator import HTTPIterator
 
 from google.cloud.pubsub import __version__
 from google.cloud.pubsub._helpers import subscription_name_from_path
@@ -131,7 +131,7 @@ def list_topics(self, project, page_size=None, page_token=None):
                            passed, the API will return the first page of
                            topics.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~google.cloud.pubsub.topic.Topic`
                   accessible to the current client.
         """
@@ -140,9 +140,13 @@ def list_topics(self, project, page_size=None, page_token=None):
             extra_params['pageSize'] = page_size
         path = '/projects/%s/topics' % (project,)
 
-        return HTTPIterator(
-            client=self._client, path=path, item_to_value=_item_to_topic,
-            items_key='topics', page_token=page_token,
+        return page_iterator.HTTPIterator(
+            client=self._client,
+            api_request=self._client._connection.api_request,
+            path=path,
+            item_to_value=_item_to_topic,
+            items_key='topics',
+            page_token=page_token,
             extra_params=extra_params)
 
     def topic_create(self, topic_path):
@@ -237,11 +241,14 @@ def topic_list_subscriptions(self, topic, page_size=None, page_token=None):
             extra_params['pageSize'] = page_size
         path = '/%s/subscriptions' % (topic.full_name,)
 
-        iterator = HTTPIterator(
-            client=self._client, path=path,
+        iterator = page_iterator.HTTPIterator(
+            client=self._client,
+            api_request=self._client._connection.api_request,
+            path=path,
             item_to_value=_item_to_subscription_for_topic,
             items_key='subscriptions',
-            page_token=page_token, extra_params=extra_params)
+            page_token=page_token,
+            extra_params=extra_params)
         iterator.topic = topic
         return iterator
 
@@ -275,7 +282,7 @@ def list_subscriptions(self, project, page_size=None, page_token=None):
                            If not passed, the API will return the first page
                            of subscriptions.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of
                   :class:`~google.cloud.pubsub.subscription.Subscription`
                   accessible to the current API.
@@ -291,9 +298,13 @@ def list_subscriptions(self, project, page_size=None, page_token=None):
         topics = {}
         item_to_value = functools.partial(
             _item_to_sub_for_client, topics=topics)
-        return HTTPIterator(
-            client=self._client, path=path, item_to_value=item_to_value,
-            items_key='subscriptions', page_token=page_token,
+        return page_iterator.HTTPIterator(
+            client=self._client,
+            api_request=self._client._connection.api_request,
+            path=path,
+            item_to_value=item_to_value,
+            items_key='subscriptions',
+            page_token=page_token,
             extra_params=extra_params)
 
     def subscription_create(self, subscription_path, topic_path,
@@ -536,7 +547,7 @@ def list_snapshots(self, project, page_size=None, page_token=None):
                            passed, the API will return the first page of
                            topics.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~google.cloud.pubsub.snapshot.Snapshot`
                   accessible to the current API.
         """
@@ -551,9 +562,13 @@ def list_snapshots(self, project, page_size=None, page_token=None):
         topics = {}
         item_to_value = functools.partial(
             _item_to_snapshot_for_client, topics=topics)
-        return HTTPIterator(
-            client=self._client, path=path, item_to_value=item_to_value,
-            items_key='snapshots', page_token=page_token,
+        return page_iterator.HTTPIterator(
+            client=self._client,
+            api_request=self._client._connection.api_request,
+            path=path,
+            item_to_value=item_to_value,
+            items_key='snapshots',
+            page_token=page_token,
             extra_params=extra_params)
 
     def snapshot_create(self, snapshot_path, subscription_path):
@@ -695,7 +710,7 @@ def _transform_messages_base64(messages, transform, key=None):
 def _item_to_topic(iterator, resource):
     """Convert a JSON topic to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type resource: dict
@@ -710,7 +725,7 @@ def _item_to_topic(iterator, resource):
 def _item_to_subscription_for_topic(iterator, subscription_path):
     """Convert a subscription name to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type subscription_path: str
@@ -731,12 +746,12 @@ def _item_to_sub_for_client(iterator, resource, topics):
 
        This method does not have the correct signature to be used as
        the ``item_to_value`` argument to
-       :class:`~google.cloud.iterator.Iterator`. It is intended to be
+       :class:`~google.api.core.page_iterator.Iterator`. It is intended to be
        patched with a mutable topics argument that can be updated
        on subsequent calls. For an example, see how the method is
        used above in :meth:`_SubscriberAPI.list_subscriptions`.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type resource: dict
@@ -760,12 +775,12 @@ def _item_to_snapshot_for_client(iterator, resource, topics):
 
        This method does not have the correct signature to be used as
        the ``item_to_value`` argument to
-       :class:`~google.cloud.iterator.Iterator`. It is intended to be
+       :class:`~google.api.core.page_iterator.Iterator`. It is intended to be
        patched with a mutable topics argument that can be updated
        on subsequent calls. For an example, see how the method is
        used above in :meth:`_SubscriberAPI.list_snapshots`.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type resource: dict
diff --git a/pubsub/google/cloud/pubsub/client.py b/pubsub/google/cloud/pubsub/client.py
index ae808c038b7c5..0dc9b8fb6f384 100644
--- a/pubsub/google/cloud/pubsub/client.py
+++ b/pubsub/google/cloud/pubsub/client.py
@@ -154,7 +154,7 @@ def list_topics(self, page_size=None, page_token=None):
                            passed, the API will return the first page of
                            topics.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~google.cloud.pubsub.topic.Topic`
                   accessible to the current API.
         """
@@ -183,7 +183,7 @@ def list_subscriptions(self, page_size=None, page_token=None):
                            passed, the API will return the first page of
                            topics.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of
                   :class:`~google.cloud.pubsub.subscription.Subscription`
                   accessible to the current client.
@@ -210,7 +210,7 @@ def list_snapshots(self, page_size=None, page_token=None):
                            passed, the API will return the first page of
                            topics.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of :class:`~google.cloud.pubsub.snapshot.Snapshot`
                   accessible to the current API.
         """
diff --git a/pubsub/google/cloud/pubsub/topic.py b/pubsub/google/cloud/pubsub/topic.py
index 92c323ed63d72..92f453bd2b2bd 100644
--- a/pubsub/google/cloud/pubsub/topic.py
+++ b/pubsub/google/cloud/pubsub/topic.py
@@ -330,7 +330,7 @@ def list_subscriptions(self, page_size=None, page_token=None, client=None):
         :param client: the client to use.  If not passed, falls back to the
                        ``client`` stored on the current topic.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of
                   :class:`~google.cloud.pubsub.subscription.Subscription`
                   accessible to the current topic.
diff --git a/resource_manager/google/cloud/resource_manager/client.py b/resource_manager/google/cloud/resource_manager/client.py
index 90f1877359747..2a4ff91daf211 100644
--- a/resource_manager/google/cloud/resource_manager/client.py
+++ b/resource_manager/google/cloud/resource_manager/client.py
@@ -15,8 +15,8 @@
 """A Client for interacting with the Resource Manager API."""
 
 
+from google.api.core import page_iterator
 from google.cloud.client import Client as BaseClient
-from google.cloud.iterator import HTTPIterator
 
 from google.cloud.resource_manager._http import Connection
 from google.cloud.resource_manager.project import Project
@@ -151,7 +151,7 @@ def list_projects(self, filter_params=None, page_size=None):
                           single page. If not passed, defaults to a value set
                           by the API.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of all
                   :class:`~google.cloud.resource_manager.project.Project`.
                   that the current user has access to.
@@ -164,15 +164,19 @@ def list_projects(self, filter_params=None, page_size=None):
         if filter_params is not None:
             extra_params['filter'] = filter_params
 
-        return HTTPIterator(
-            client=self, path='/projects', item_to_value=_item_to_project,
-            items_key='projects', extra_params=extra_params)
+        return page_iterator.HTTPIterator(
+            client=self,
+            api_request=self._connection.api_request,
+            path='/projects',
+            item_to_value=_item_to_project,
+            items_key='projects',
+            extra_params=extra_params)
 
 
 def _item_to_project(iterator, resource):
     """Convert a JSON project to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that has retrieved the item.
 
     :type resource: dict
diff --git a/resource_manager/tests/unit/test_client.py b/resource_manager/tests/unit/test_client.py
index 1ba312775f171..06ac02cbe6274 100644
--- a/resource_manager/tests/unit/test_client.py
+++ b/resource_manager/tests/unit/test_client.py
@@ -88,7 +88,7 @@ def test_fetch_project(self):
         self.assertEqual(project.labels, labels)
 
     def test_list_projects_return_type(self):
-        from google.cloud.iterator import HTTPIterator
+        from google.api.core import page_iterator
 
         credentials = _make_credentials()
         client = self._make_one(credentials=credentials)
@@ -96,7 +96,7 @@ def test_list_projects_return_type(self):
         client._connection = _Connection({})
 
         results = client.list_projects()
-        self.assertIsInstance(results, HTTPIterator)
+        self.assertIsInstance(results, page_iterator.HTTPIterator)
 
     def test_list_projects_no_paging(self):
         credentials = _make_credentials()
@@ -227,12 +227,12 @@ def test_list_projects_with_filter(self):
         })
 
     def test_page_empty_response(self):
-        from google.cloud.iterator import Page
+        from google.api.core import page_iterator
 
         credentials = _make_credentials()
         client = self._make_one(credentials=credentials)
         iterator = client.list_projects()
-        page = Page(iterator, (), None)
+        page = page_iterator.Page(iterator, (), None)
         iterator._page = page
         self.assertEqual(page.num_items, 0)
         self.assertEqual(page.remaining, 0)
diff --git a/runtimeconfig/google/cloud/runtimeconfig/config.py b/runtimeconfig/google/cloud/runtimeconfig/config.py
index 385b92a31c406..1b86e7971aab2 100644
--- a/runtimeconfig/google/cloud/runtimeconfig/config.py
+++ b/runtimeconfig/google/cloud/runtimeconfig/config.py
@@ -14,10 +14,10 @@
 
 """Create / interact with Google Cloud RuntimeConfig configs."""
 
+from google.api.core import page_iterator
 from google.cloud.exceptions import NotFound
 from google.cloud.runtimeconfig._helpers import config_name_from_full_name
 from google.cloud.runtimeconfig.variable import Variable
-from google.cloud.iterator import HTTPIterator
 
 
 class Config(object):
@@ -232,16 +232,21 @@ def list_variables(self, page_size=None, page_token=None, client=None):
             (Optional) The client to use.  If not passed, falls back to the
             ``client`` stored on the current config.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns:
             Iterator of :class:`~google.cloud.runtimeconfig.variable.Variable`
             belonging to this project.
         """
         path = '%s/variables' % (self.path,)
-        iterator = HTTPIterator(
-            client=self._require_client(client), path=path,
-            item_to_value=_item_to_variable, items_key='variables',
-            page_token=page_token, max_results=page_size)
+        client = self._require_client(client)
+        iterator = page_iterator.HTTPIterator(
+            client=client,
+            api_request=client._connection.api_request,
+            path=path,
+            item_to_value=_item_to_variable,
+            items_key='variables',
+            page_token=page_token,
+            max_results=page_size)
         iterator._MAX_RESULTS = 'pageSize'
         iterator.config = self
         return iterator
@@ -250,7 +255,7 @@ def list_variables(self, page_size=None, page_token=None, client=None):
 def _item_to_variable(iterator, resource):
     """Convert a JSON variable to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that has retrieved the item.
 
     :type resource: dict
diff --git a/spanner/google/cloud/spanner/client.py b/spanner/google/cloud/spanner/client.py
index 6274d28d9e184..34e0a81c4fc42 100644
--- a/spanner/google/cloud/spanner/client.py
+++ b/spanner/google/cloud/spanner/client.py
@@ -24,6 +24,7 @@
   :class:`~google.cloud.spanner.database.Database`
 """
 
+from google.api.core import page_iterator
 from google.gax import INITIAL_PAGE
 # pylint: disable=line-too-long
 from google.cloud.gapic.spanner_admin_database.v1.database_admin_client import (  # noqa
@@ -34,7 +35,6 @@
 
 from google.cloud._http import DEFAULT_USER_AGENT
 from google.cloud.client import ClientWithProject
-from google.cloud.iterator import GAXIterator
 from google.cloud.spanner import __version__
 from google.cloud.spanner._helpers import _options_with_prefix
 from google.cloud.spanner.instance import DEFAULT_NODE_COUNT
@@ -194,7 +194,7 @@ def list_instance_configs(self, page_size=None, page_token=None):
         :type page_token: str
         :param page_token: (Optional) Token for fetching next page of results.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns:
             Iterator of
             :class:`~google.cloud.spanner.instance.InstanceConfig`
@@ -207,7 +207,8 @@ def list_instance_configs(self, page_size=None, page_token=None):
         path = 'projects/%s' % (self.project,)
         page_iter = self.instance_admin_api.list_instance_configs(
             path, page_size=page_size, options=options)
-        return GAXIterator(self, page_iter, _item_to_instance_config)
+        return page_iterator._GAXIterator(
+            self, page_iter, _item_to_instance_config)
 
     def instance(self, instance_id,
                  configuration_name=None,
@@ -257,7 +258,7 @@ def list_instances(self, filter_='', page_size=None, page_token=None):
         :type page_token: str
         :param page_token: (Optional) Token for fetching next page of results.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns:
             Iterator of :class:`~google.cloud.spanner.instance.Instance`
             resources within the client's project.
@@ -269,14 +270,15 @@ def list_instances(self, filter_='', page_size=None, page_token=None):
         path = 'projects/%s' % (self.project,)
         page_iter = self.instance_admin_api.list_instances(
             path, filter_=filter_, page_size=page_size, options=options)
-        return GAXIterator(self, page_iter, _item_to_instance)
+        return page_iterator._GAXIterator(
+            self, page_iter, _item_to_instance)
 
 
 def _item_to_instance_config(
         iterator, config_pb):  # pylint: disable=unused-argument
     """Convert an instance config protobuf to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type config_pb:
@@ -292,7 +294,7 @@ def _item_to_instance_config(
 def _item_to_instance(iterator, instance_pb):
     """Convert an instance protobuf to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type instance_pb: :class:`~google.spanner.admin.instance.v1.Instance`
diff --git a/spanner/google/cloud/spanner/instance.py b/spanner/google/cloud/spanner/instance.py
index 7d715c94c5908..34cb5b1b0bc29 100644
--- a/spanner/google/cloud/spanner/instance.py
+++ b/spanner/google/cloud/spanner/instance.py
@@ -16,6 +16,7 @@
 
 import re
 
+from google.api.core import page_iterator
 from google.gax import INITIAL_PAGE
 from google.gax.errors import GaxError
 from google.gax.grpc import exc_to_code
@@ -27,7 +28,6 @@
 # pylint: disable=ungrouped-imports
 from google.cloud.exceptions import Conflict
 from google.cloud.exceptions import NotFound
-from google.cloud.iterator import GAXIterator
 from google.cloud.spanner._helpers import _options_with_prefix
 from google.cloud.spanner.database import Database
 from google.cloud.spanner.pool import BurstyPool
@@ -374,7 +374,7 @@ def list_databases(self, page_size=None, page_token=None):
         :type page_token: str
         :param page_token: (Optional) Token for fetching next page of results.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns:
             Iterator of :class:`~google.cloud.spanner.database.Database`
             resources within the current instance.
@@ -384,7 +384,8 @@ def list_databases(self, page_size=None, page_token=None):
         options = _options_with_prefix(self.name, page_token=page_token)
         page_iter = self._client.database_admin_api.list_databases(
             self.name, page_size=page_size, options=options)
-        iterator = GAXIterator(self._client, page_iter, _item_to_database)
+        iterator = page_iterator._GAXIterator(
+            self._client, page_iter, _item_to_database)
         iterator.instance = self
         return iterator
 
@@ -392,7 +393,7 @@ def list_databases(self, page_size=None, page_token=None):
 def _item_to_database(iterator, database_pb):
     """Convert a database protobuf to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type database_pb: :class:`~google.spanner.admin.database.v1.Database`
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index 06550b09ffcbf..ad3a20e3aef0e 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -22,12 +22,12 @@
 import google.auth.credentials
 import six
 
+from google.api.core import page_iterator
 from google.cloud._helpers import _datetime_to_rfc3339
 from google.cloud._helpers import _NOW
 from google.cloud._helpers import _rfc3339_to_datetime
 from google.cloud.exceptions import NotFound
 from google.cloud.iam import Policy
-from google.cloud.iterator import HTTPIterator
 from google.cloud.storage._helpers import _PropertyMixin
 from google.cloud.storage._helpers import _scalar_property
 from google.cloud.storage._helpers import _validate_name
@@ -40,7 +40,7 @@
 def _blobs_page_start(iterator, page, response):
     """Grab prefixes after a :class:`~google.cloud.iterator.Page` started.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type page: :class:`~google.cloud.iterator.Page`
@@ -61,7 +61,7 @@ def _item_to_blob(iterator, item):
         This assumes that the ``bucket`` attribute has been
         added to the iterator after being created.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that has retrieved the item.
 
     :type item: dict
@@ -316,7 +316,7 @@ def list_blobs(self, max_results=None, page_token=None, prefix=None,
         :param client: (Optional) The client to use.  If not passed, falls back
                        to the ``client`` stored on the current bucket.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of all :class:`~google.cloud.storage.blob.Blob`
                   in this bucket matching the arguments.
         """
@@ -338,10 +338,15 @@ def list_blobs(self, max_results=None, page_token=None, prefix=None,
 
         client = self._require_client(client)
         path = self.path + '/o'
-        iterator = HTTPIterator(
-            client=client, path=path, item_to_value=_item_to_blob,
-            page_token=page_token, max_results=max_results,
-            extra_params=extra_params, page_start=_blobs_page_start)
+        iterator = page_iterator.HTTPIterator(
+            client=client,
+            api_request=client._connection.api_request,
+            path=path,
+            item_to_value=_item_to_blob,
+            page_token=page_token,
+            max_results=max_results,
+            extra_params=extra_params,
+            page_start=_blobs_page_start)
         iterator.bucket = self
         iterator.prefixes = set()
         return iterator
diff --git a/storage/google/cloud/storage/client.py b/storage/google/cloud/storage/client.py
index 42b4bb7d9592d..5743dc0599368 100644
--- a/storage/google/cloud/storage/client.py
+++ b/storage/google/cloud/storage/client.py
@@ -15,10 +15,10 @@
 """Client for interacting with the Google Cloud Storage API."""
 
 
+from google.api.core import page_iterator
 from google.cloud._helpers import _LocalStack
 from google.cloud.client import ClientWithProject
 from google.cloud.exceptions import NotFound
-from google.cloud.iterator import HTTPIterator
 from google.cloud.storage._http import Connection
 from google.cloud.storage.batch import Batch
 from google.cloud.storage.bucket import Bucket
@@ -255,7 +255,7 @@ def list_buckets(self, max_results=None, page_token=None, prefix=None,
             response with just the next page token and the language of each
             bucket returned: 'items/id,nextPageToken'
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Iterator of all :class:`~google.cloud.storage.bucket.Bucket`
                   belonging to this project.
         """
@@ -269,16 +269,20 @@ def list_buckets(self, max_results=None, page_token=None, prefix=None,
         if fields is not None:
             extra_params['fields'] = fields
 
-        return HTTPIterator(
-            client=self, path='/b', item_to_value=_item_to_bucket,
-            page_token=page_token, max_results=max_results,
+        return page_iterator.HTTPIterator(
+            client=self,
+            api_request=self._connection.api_request,
+            path='/b',
+            item_to_value=_item_to_bucket,
+            page_token=page_token,
+            max_results=max_results,
             extra_params=extra_params)
 
 
 def _item_to_bucket(iterator, item):
     """Convert a JSON bucket to the native object.
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that has retrieved the item.
 
     :type item: dict
diff --git a/storage/tests/unit/test_bucket.py b/storage/tests/unit/test_bucket.py
index 0df94dc5db3de..ece5c54117737 100644
--- a/storage/tests/unit/test_bucket.py
+++ b/storage/tests/unit/test_bucket.py
@@ -1190,14 +1190,14 @@ def test_make_public_recursive_too_many(self):
         self.assertRaises(ValueError, bucket.make_public, recursive=True)
 
     def test_page_empty_response(self):
-        from google.cloud.iterator import Page
+        from google.api.core import page_iterator
 
         connection = _Connection()
         client = _Client(connection)
         name = 'name'
         bucket = self._make_one(client=client, name=name)
         iterator = bucket.list_blobs()
-        page = Page(iterator, (), None)
+        page = page_iterator.Page(iterator, (), None)
         iterator._page = page
         blobs = list(page)
         self.assertEqual(blobs, [])
diff --git a/storage/tests/unit/test_client.py b/storage/tests/unit/test_client.py
index ab75d9be8fcaf..39a27b9c07735 100644
--- a/storage/tests/unit/test_client.py
+++ b/storage/tests/unit/test_client.py
@@ -404,13 +404,13 @@ def test_list_buckets_all_arguments(self):
         self.assertEqual(parse_qs(uri_parts.query), expected_query)
 
     def test_page_empty_response(self):
-        from google.cloud.iterator import Page
+        from google.api.core import page_iterator
 
         project = 'PROJECT'
         credentials = _make_credentials()
         client = self._make_one(project=project, credentials=credentials)
         iterator = client.list_buckets()
-        page = Page(iterator, (), None)
+        page = page_iterator.Page(iterator, (), None)
         iterator._page = page
         self.assertEqual(list(page), [])
 
diff --git a/trace/google/cloud/trace/_gax.py b/trace/google/cloud/trace/_gax.py
index b412b54ee8566..8ba4a456768fb 100644
--- a/trace/google/cloud/trace/_gax.py
+++ b/trace/google/cloud/trace/_gax.py
@@ -14,13 +14,13 @@
 
 """GAX Wrapper for interacting with the Stackdriver Trace API."""
 
+from google.api.core import page_iterator
 from google.cloud.gapic.trace.v1 import trace_service_client
 from google.cloud.proto.devtools.cloudtrace.v1 import trace_pb2
 from google.gax import CallOptions
 from google.gax import INITIAL_PAGE
 from google.cloud._helpers import make_secure_channel
 from google.cloud._http import DEFAULT_USER_AGENT
-from google.cloud.iterator import GAXIterator
 from google.protobuf.json_format import MessageToDict
 from google.protobuf.json_format import ParseDict
 
@@ -131,7 +131,7 @@ def list_traces(
                            passed, the API will return the first page of
                            entries.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Traces that match the specified filter conditions.
         """
         if page_token is None:
@@ -147,7 +147,8 @@ def list_traces(
             order_by=order_by,
             options=options)
         item_to_value = _item_to_mapping
-        return GAXIterator(self.client, page_iter, item_to_value)
+        return page_iterator._GAXIterator(
+            self.client, page_iter, item_to_value)
 
 
 def _parse_trace_pb(trace_pb):
@@ -169,7 +170,7 @@ def _parse_trace_pb(trace_pb):
 def _item_to_mapping(iterator, trace_pb):
     """Helper callable function for the GAXIterator
 
-    :type iterator: :class:`~google.cloud.iterator.Iterator`
+    :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
     :type trace_pb: :class:`google.cloud.proto.devtools.cloudtrace.v1.
diff --git a/trace/google/cloud/trace/client.py b/trace/google/cloud/trace/client.py
index d2104924a2bff..96635e14e1072 100644
--- a/trace/google/cloud/trace/client.py
+++ b/trace/google/cloud/trace/client.py
@@ -144,7 +144,7 @@ def list_traces(
                            passed, the API will return the first page of
                            entries.
 
-        :rtype: :class:`~google.cloud.iterator.Iterator`
+        :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns: Traces that match the specified filter conditions.
         """
         if project_id is None:

From 1fcd53dd32cff0caf4089e0a4f01a5342835a384 Mon Sep 17 00:00:00 2001
From: Leon de Almeida <leondealmeida@users.noreply.github.com>
Date: Wed, 9 Aug 2017 17:28:44 -0300
Subject: [PATCH 177/211] nullMarker support for BigQuery Load Jobs (#3449)
 (#3777)

---
 bigquery/google/cloud/bigquery/job.py | 8 ++++++++
 bigquery/tests/unit/test_job.py       | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/bigquery/google/cloud/bigquery/job.py b/bigquery/google/cloud/bigquery/job.py
index 43d7fd8f23c31..48d440063fa3e 100644
--- a/bigquery/google/cloud/bigquery/job.py
+++ b/bigquery/google/cloud/bigquery/job.py
@@ -518,6 +518,7 @@ class _LoadConfiguration(object):
     _field_delimiter = None
     _ignore_unknown_values = None
     _max_bad_records = None
+    _null_marker = None
     _quote_character = None
     _skip_leading_rows = None
     _source_format = None
@@ -672,6 +673,11 @@ def output_rows(self):
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.maxBadRecords
     """
 
+    null_marker = _TypedProperty('null_marker', six.string_types)
+    """See
+    https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.nullMarker
+    """
+
     quote_character = _TypedProperty('quote_character', six.string_types)
     """See
     https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.load.quote
@@ -710,6 +716,8 @@ def _populate_config_resource(self, configuration):
             configuration['ignoreUnknownValues'] = self.ignore_unknown_values
         if self.max_bad_records is not None:
             configuration['maxBadRecords'] = self.max_bad_records
+        if self.null_marker is not None:
+            configuration['nullMarker'] = self.null_marker
         if self.quote_character is not None:
             configuration['quote'] = self.quote_character
         if self.skip_leading_rows is not None:
diff --git a/bigquery/tests/unit/test_job.py b/bigquery/tests/unit/test_job.py
index 46326441a5e19..81d07b122eb00 100644
--- a/bigquery/tests/unit/test_job.py
+++ b/bigquery/tests/unit/test_job.py
@@ -247,6 +247,11 @@ def _verifyResourceProperties(self, job, resource):
                              config['maxBadRecords'])
         else:
             self.assertIsNone(job.max_bad_records)
+        if 'nullMarker' in config:
+            self.assertEqual(job.null_marker,
+                             config['nullMarker'])
+        else:
+            self.assertIsNone(job.null_marker)
         if 'quote' in config:
             self.assertEqual(job.quote_character,
                              config['quote'])
@@ -288,6 +293,7 @@ def test_ctor(self):
         self.assertIsNone(job.field_delimiter)
         self.assertIsNone(job.ignore_unknown_values)
         self.assertIsNone(job.max_bad_records)
+        self.assertIsNone(job.null_marker)
         self.assertIsNone(job.quote_character)
         self.assertIsNone(job.skip_leading_rows)
         self.assertIsNone(job.source_format)
@@ -592,6 +598,7 @@ def test_begin_w_alternate_client(self):
             'fieldDelimiter': '|',
             'ignoreUnknownValues': True,
             'maxBadRecords': 100,
+            'nullMarker': r'\N',
             'quote': "'",
             'skipLeadingRows': 1,
             'sourceFormat': 'CSV',
@@ -619,6 +626,7 @@ def test_begin_w_alternate_client(self):
         job.field_delimiter = '|'
         job.ignore_unknown_values = True
         job.max_bad_records = 100
+        job.null_marker = r'\N'
         job.quote_character = "'"
         job.skip_leading_rows = 1
         job.source_format = 'CSV'

From a1942ba678cd30234f80b689da879663e691742b Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Wed, 9 Aug 2017 13:29:07 -0700
Subject: [PATCH 178/211] Allow job_id to be explicitly specified. (#3779)

---
 bigquery/google/cloud/bigquery/dbapi/cursor.py | 9 +++++++--
 bigquery/tests/unit/test_dbapi_cursor.py       | 8 ++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/dbapi/cursor.py b/bigquery/google/cloud/bigquery/dbapi/cursor.py
index 7519c762ae1e5..167afb45e285f 100644
--- a/bigquery/google/cloud/bigquery/dbapi/cursor.py
+++ b/bigquery/google/cloud/bigquery/dbapi/cursor.py
@@ -100,7 +100,7 @@ def _set_rowcount(self, query_results):
             total_rows = num_dml_affected_rows
         self.rowcount = total_rows
 
-    def execute(self, operation, parameters=None):
+    def execute(self, operation, parameters=None, job_id=None):
         """Prepare and execute a database operation.
 
         .. note::
@@ -128,12 +128,17 @@ def execute(self, operation, parameters=None):
         :type parameters: Mapping[str, Any] or Sequence[Any]
         :param parameters:
             (Optional) dictionary or sequence of parameter values.
+
+        :type job_id: str
+        :param job_id: (Optional) The job_id to use. If not set, a job ID
+            is generated at random.
         """
         self._query_results = None
         self._page_token = None
         self._has_fetched_all_rows = False
         client = self.connection._client
-        job_id = str(uuid.uuid4())
+        if job_id is None:
+            job_id = str(uuid.uuid4())
 
         # The DB-API uses the pyformat formatting, since the way BigQuery does
         # query parameters was not one of the standard options. Convert both
diff --git a/bigquery/tests/unit/test_dbapi_cursor.py b/bigquery/tests/unit/test_dbapi_cursor.py
index 2a2ccfd989a63..49a332999f7e8 100644
--- a/bigquery/tests/unit/test_dbapi_cursor.py
+++ b/bigquery/tests/unit/test_dbapi_cursor.py
@@ -170,6 +170,14 @@ def test_fetchall_w_row(self):
         self.assertEqual(len(rows), 1)
         self.assertEqual(rows[0], (1,))
 
+    def test_execute_custom_job_id(self):
+        from google.cloud.bigquery.dbapi import connect
+        client = self._mock_client(rows=[], num_dml_affected_rows=0)
+        connection = connect(client)
+        cursor = connection.cursor()
+        cursor.execute('SELECT 1;', job_id='foo')
+        self.assertEqual(client.run_async_query.mock_calls[0][1][0], 'foo')
+
     def test_execute_w_dml(self):
         from google.cloud.bigquery.dbapi import connect
         connection = connect(

From 5b4b8fa4aabf1bc65020846b6f0289ad86e0be2b Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Wed, 9 Aug 2017 14:54:32 -0700
Subject: [PATCH 179/211] De-flake the snapshot system test. (#3780)

---
 pubsub/tests/system.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pubsub/tests/system.py b/pubsub/tests/system.py
index bbc4b527db8eb..eddfd1274da08 100644
--- a/pubsub/tests/system.py
+++ b/pubsub/tests/system.py
@@ -348,7 +348,10 @@ def test_create_snapshot(self):
 
         # There is no GET method for snapshot, so check existence using
         # list
-        retry = RetryResult(lambda result: result, max_tries=4)
+        def retry_predicate(result):
+            return len(result) > len(before_snapshots)
+            
+        retry = RetryResult(retry_predicate, max_tries=5)
         after_snapshots = retry(_consume_snapshots)(Config.CLIENT)
         self.assertEqual(len(before_snapshots) + 1, len(after_snapshots))
 
@@ -361,7 +364,6 @@ def full_name(obj):
         with self.assertRaises(Conflict):
             snapshot.create()
 
-
     def test_seek(self):
         TOPIC_NAME = 'seek-e2e' + unique_resource_id('-')
         topic = Config.CLIENT.topic(TOPIC_NAME,

From 1fcc1a42f971926175e2fd02a2d9fff8394327d2 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Wed, 9 Aug 2017 21:19:18 -0400
Subject: [PATCH 180/211]  Add a test which provokes abort-during-read during
 'run_in_transaction'. (#3663)

---
 spanner/google/cloud/spanner/session.py |  16 +++-
 spanner/tests/system/test_system.py     | 119 ++++++++++++++++++++----
 2 files changed, 114 insertions(+), 21 deletions(-)

diff --git a/spanner/google/cloud/spanner/session.py b/spanner/google/cloud/spanner/session.py
index 04fcacea38ee8..33a1a8b2838b2 100644
--- a/spanner/google/cloud/spanner/session.py
+++ b/spanner/google/cloud/spanner/session.py
@@ -24,6 +24,7 @@
 
 # pylint: disable=ungrouped-imports
 from google.cloud.exceptions import NotFound
+from google.cloud.exceptions import GrpcRendezvous
 from google.cloud.spanner._helpers import _options_with_prefix
 from google.cloud.spanner.batch import Batch
 from google.cloud.spanner.snapshot import Snapshot
@@ -286,7 +287,7 @@ def run_in_transaction(self, func, *args, **kw):
                 txn.begin()
             try:
                 return_value = func(txn, *args, **kw)
-            except GaxError as exc:
+            except (GaxError, GrpcRendezvous) as exc:
                 _delay_until_retry(exc, deadline)
                 del self._transaction
                 continue
@@ -318,7 +319,12 @@ def _delay_until_retry(exc, deadline):
     :type deadline: float
     :param deadline: maximum timestamp to continue retrying the transaction.
     """
-    if exc_to_code(exc.cause) != StatusCode.ABORTED:
+    if isinstance(exc, GrpcRendezvous):  # pragma: NO COVER  see #3663
+        cause = exc
+    else:
+        cause = exc.cause
+
+    if exc_to_code(cause) != StatusCode.ABORTED:
         raise
 
     now = time.time()
@@ -326,7 +332,7 @@ def _delay_until_retry(exc, deadline):
     if now >= deadline:
         raise
 
-    delay = _get_retry_delay(exc)
+    delay = _get_retry_delay(cause)
     if delay is not None:
 
         if now + delay > deadline:
@@ -336,7 +342,7 @@ def _delay_until_retry(exc, deadline):
 # pylint: enable=misplaced-bare-raise
 
 
-def _get_retry_delay(exc):
+def _get_retry_delay(cause):
     """Helper for :func:`_delay_until_retry`.
 
     :type exc: :class:`google.gax.errors.GaxError`
@@ -345,7 +351,7 @@ def _get_retry_delay(exc):
     :rtype: float
     :returns: seconds to wait before retrying the transaction.
     """
-    metadata = dict(exc.cause.trailing_metadata())
+    metadata = dict(cause.trailing_metadata())
     retry_info_pb = metadata.get('google.rpc.retryinfo-bin')
     if retry_info_pb is not None:
         retry_info = RetryInfo()
diff --git a/spanner/tests/system/test_system.py b/spanner/tests/system/test_system.py
index f5d15d715ed51..fa70573c88deb 100644
--- a/spanner/tests/system/test_system.py
+++ b/spanner/tests/system/test_system.py
@@ -57,6 +57,8 @@
                                  'google-cloud-python-systest')
 DATABASE_ID = 'test_database'
 EXISTING_INSTANCES = []
+COUNTERS_TABLE = 'counters'
+COUNTERS_COLUMNS = ('name', 'value')
 
 
 class Config(object):
@@ -360,11 +362,6 @@ class TestSessionAPI(unittest.TestCase, _TestData):
         'description',
         'exactly_hwhen',
     )
-    COUNTERS_TABLE = 'counters'
-    COUNTERS_COLUMNS = (
-        'name',
-        'value',
-    )
     SOME_DATE = datetime.date(2011, 1, 17)
     SOME_TIME = datetime.datetime(1989, 1, 17, 17, 59, 12, 345612)
     NANO_TIME = TimestampWithNanoseconds(1995, 8, 31, nanosecond=987654321)
@@ -554,9 +551,7 @@ def _transaction_concurrency_helper(self, unit_of_work, pkey):
 
         with session.batch() as batch:
             batch.insert_or_update(
-                self.COUNTERS_TABLE,
-                self.COUNTERS_COLUMNS,
-                [[pkey, INITIAL_VALUE]])
+                COUNTERS_TABLE, COUNTERS_COLUMNS, [[pkey, INITIAL_VALUE]])
 
         # We don't want to run the threads' transactions in the current
         # session, which would fail.
@@ -582,7 +577,7 @@ def _transaction_concurrency_helper(self, unit_of_work, pkey):
 
         keyset = KeySet(keys=[(pkey,)])
         rows = list(session.read(
-            self.COUNTERS_TABLE, self.COUNTERS_COLUMNS, keyset))
+            COUNTERS_TABLE, COUNTERS_COLUMNS, keyset))
         self.assertEqual(len(rows), 1)
         _, value = rows[0]
         self.assertEqual(value, INITIAL_VALUE + len(threads))
@@ -590,13 +585,11 @@ def _transaction_concurrency_helper(self, unit_of_work, pkey):
     def _read_w_concurrent_update(self, transaction, pkey):
         keyset = KeySet(keys=[(pkey,)])
         rows = list(transaction.read(
-            self.COUNTERS_TABLE, self.COUNTERS_COLUMNS, keyset))
+            COUNTERS_TABLE, COUNTERS_COLUMNS, keyset))
         self.assertEqual(len(rows), 1)
         pkey, value = rows[0]
         transaction.update(
-            self.COUNTERS_TABLE,
-            self.COUNTERS_COLUMNS,
-            [[pkey, value + 1]])
+            COUNTERS_TABLE, COUNTERS_COLUMNS, [[pkey, value + 1]])
 
     def test_transaction_read_w_concurrent_updates(self):
         PKEY = 'read_w_concurrent_updates'
@@ -613,15 +606,48 @@ def _query_w_concurrent_update(self, transaction, pkey):
         self.assertEqual(len(rows), 1)
         pkey, value = rows[0]
         transaction.update(
-                self.COUNTERS_TABLE,
-                self.COUNTERS_COLUMNS,
-                [[pkey, value + 1]])
+            COUNTERS_TABLE, COUNTERS_COLUMNS, [[pkey, value + 1]])
 
     def test_transaction_query_w_concurrent_updates(self):
         PKEY = 'query_w_concurrent_updates'
         self._transaction_concurrency_helper(
             self._query_w_concurrent_update, PKEY)
 
+    def test_transaction_read_w_abort(self):
+
+        retry = RetryInstanceState(_has_all_ddl)
+        retry(self._db.reload)()
+
+        session = self._db.session()
+        session.create()
+
+        trigger = _ReadAbortTrigger()
+
+        with session.batch() as batch:
+            batch.delete(COUNTERS_TABLE, self.ALL)
+            batch.insert(
+                COUNTERS_TABLE,
+                COUNTERS_COLUMNS,
+                [[trigger.KEY1, 0], [trigger.KEY2, 0]])
+
+        provoker = threading.Thread(
+            target=trigger.provoke_abort, args=(self._db,))
+        handler = threading.Thread(
+            target=trigger.handle_abort, args=(self._db,))
+
+        provoker.start()
+        trigger.provoker_started.wait()
+
+        handler.start()
+        trigger.handler_done.wait()
+
+        provoker.join()
+        handler.join()
+
+        rows = list(session.read(COUNTERS_TABLE, COUNTERS_COLUMNS, self.ALL))
+        self._check_row_data(
+            rows, expected=[[trigger.KEY1, 1], [trigger.KEY2, 1]])
+
     @staticmethod
     def _row_data(max_index):
         for index in range(max_index):
@@ -1103,3 +1129,64 @@ def __init__(self, db):
 
     def delete(self):
         self._db.drop()
+
+
+class _ReadAbortTrigger(object):
+    """Helper for tests provoking abort-during-read."""
+
+    KEY1 = 'key1'
+    KEY2 = 'key2'
+
+    def __init__(self):
+        self.provoker_started = threading.Event()
+        self.provoker_done = threading.Event()
+        self.handler_running = threading.Event()
+        self.handler_done = threading.Event()
+
+    def _provoke_abort_unit_of_work(self, transaction):
+        keyset = KeySet(keys=[(self.KEY1,)])
+        rows = list(
+            transaction.read(COUNTERS_TABLE, COUNTERS_COLUMNS, keyset))
+
+        assert len(rows) == 1
+        row = rows[0]
+        value = row[1]
+
+        self.provoker_started.set()
+
+        self.handler_running.wait()
+
+        transaction.update(
+            COUNTERS_TABLE, COUNTERS_COLUMNS, [[self.KEY1, value + 1]])
+
+    def provoke_abort(self, database):
+        database.run_in_transaction(self._provoke_abort_unit_of_work)
+        self.provoker_done.set()
+
+    def _handle_abort_unit_of_work(self, transaction):
+        keyset_1 = KeySet(keys=[(self.KEY1,)])
+        rows_1 = list(
+            transaction.read(COUNTERS_TABLE, COUNTERS_COLUMNS, keyset_1))
+
+        assert len(rows_1) == 1
+        row_1 = rows_1[0]
+        value_1 = row_1[1]
+
+        self.handler_running.set()
+
+        self.provoker_done.wait()
+
+        keyset_2 = KeySet(keys=[(self.KEY2,)])
+        rows_2 = list(
+            transaction.read(COUNTERS_TABLE, COUNTERS_COLUMNS, keyset_2))
+
+        assert len(rows_2) == 1
+        row_2 = rows_2[0]
+        value_2 = row_2[1]
+
+        transaction.update(
+            COUNTERS_TABLE, COUNTERS_COLUMNS, [[self.KEY2, value_1 + value_2]])
+
+    def handle_abort(self, database):
+        database.run_in_transaction(self._handle_abort_unit_of_work)
+        self.handler_done.set()

From 69dc45abf8bcb2e7f80919f34aa886b640d9ff3b Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Thu, 10 Aug 2017 09:30:34 -0700
Subject: [PATCH 181/211] Add support for a custom null marker. (#3776)

---
 bigquery/google/cloud/bigquery/table.py | 14 +++++++++++---
 bigquery/tests/unit/test_table.py       | 12 +++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/table.py b/bigquery/google/cloud/bigquery/table.py
index 87cff2980c7e5..b26125ec9ef4d 100644
--- a/bigquery/google/cloud/bigquery/table.py
+++ b/bigquery/google/cloud/bigquery/table.py
@@ -1043,7 +1043,8 @@ def upload_from_file(self,
                          skip_leading_rows=None,
                          write_disposition=None,
                          client=None,
-                         job_name=None):
+                         job_name=None,
+                         null_marker=None):
         """Upload the contents of this table from a file-like object.
 
         :type file_obj: file
@@ -1116,6 +1117,9 @@ def upload_from_file(self,
         :param job_name: Optional. The id of the job. Generated if not
                          explicitly passed in.
 
+        :type null_marker: str
+        :param null_marker: Optional. A custom null marker (example: "\\N")
+
         :rtype: :class:`~google.cloud.bigquery.jobs.LoadTableFromStorageJob`
 
         :returns: the job instance used to load the data (e.g., for
@@ -1135,7 +1139,7 @@ def upload_from_file(self,
                                 encoding, field_delimiter,
                                 ignore_unknown_values, max_bad_records,
                                 quote_character, skip_leading_rows,
-                                write_disposition, job_name)
+                                write_disposition, job_name, null_marker)
 
         try:
             created_json = self._do_upload(
@@ -1157,7 +1161,8 @@ def _configure_job_metadata(metadata,  # pylint: disable=too-many-arguments
                             quote_character,
                             skip_leading_rows,
                             write_disposition,
-                            job_name):
+                            job_name,
+                            null_marker):
     """Helper for :meth:`Table.upload_from_file`."""
     load_config = metadata['configuration']['load']
 
@@ -1194,6 +1199,9 @@ def _configure_job_metadata(metadata,  # pylint: disable=too-many-arguments
     if job_name is not None:
         load_config['jobReference'] = {'jobId': job_name}
 
+    if null_marker is not None:
+        load_config['nullMarker'] = null_marker
+
 
 def _parse_schema_resource(info):
     """Parse a resource fragment into a schema field.
diff --git a/bigquery/tests/unit/test_table.py b/bigquery/tests/unit/test_table.py
index 125114b6f3acc..aa9e006706550 100644
--- a/bigquery/tests/unit/test_table.py
+++ b/bigquery/tests/unit/test_table.py
@@ -1868,7 +1868,8 @@ def test_upload_file_resumable_metadata(self):
             'quote_character': '"',
             'skip_leading_rows': 1,
             'write_disposition': 'WRITE_APPEND',
-            'job_name': 'oddjob'
+            'job_name': 'oddjob',
+            'null_marker': r'\N',
         }
 
         expected_config = {
@@ -1878,7 +1879,7 @@ def test_upload_file_resumable_metadata(self):
                     'destinationTable': {
                         'projectId': table._dataset._client.project,
                         'datasetId': table.dataset_name,
-                        'tableId': table.name
+                        'tableId': table.name,
                     },
                     'allowJaggedRows': config_args['allow_jagged_rows'],
                     'allowQuotedNewlines':
@@ -1892,9 +1893,10 @@ def test_upload_file_resumable_metadata(self):
                     'quote': config_args['quote_character'],
                     'skipLeadingRows': config_args['skip_leading_rows'],
                     'writeDisposition': config_args['write_disposition'],
-                    'jobReference': {'jobId': config_args['job_name']}
-                }
-            }
+                    'jobReference': {'jobId': config_args['job_name']},
+                    'nullMarker': config_args['null_marker'],
+                },
+            },
         }
 
         do_upload_patch = self._make_do_upload_patch(

From 1d08991d35c0b15d86861846ed40e97fa93c9a8f Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Thu, 10 Aug 2017 09:30:51 -0700
Subject: [PATCH 182/211] Document to_legacy_urlsafe as being equivalent to
 ndb. (#3783)

---
 datastore/google/cloud/datastore/key.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/datastore/google/cloud/datastore/key.py b/datastore/google/cloud/datastore/key.py
index 615cab6965683..03bcb303b5940 100644
--- a/datastore/google/cloud/datastore/key.py
+++ b/datastore/google/cloud/datastore/key.py
@@ -307,6 +307,11 @@ def to_legacy_urlsafe(self):
         argument to ``ndb.Key(urlsafe=...)``. The base64 encoded values
         will have padding removed.
 
+        .. note::
+
+            The string returned by ``to_legacy_urlsafe`` is equivalent, but
+            not identical, to the string returned by ``ndb``.
+
         :rtype: bytes
         :returns: A bytestring containing the key encoded as URL-safe base64.
         """

From 87a46a81216e7446cb044e793f92a2c50cd8a3ce Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Thu, 10 Aug 2017 13:58:00 -0400
Subject: [PATCH 183/211] Block creation of transaction for session w/ existing
 txn. (#3785)

Closes #3476.
---
 spanner/google/cloud/spanner/session.py     |  1 +
 spanner/google/cloud/spanner/transaction.py | 14 +++++++++++++-
 spanner/tests/unit/test_transaction.py      |  6 ++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/spanner/google/cloud/spanner/session.py b/spanner/google/cloud/spanner/session.py
index 33a1a8b2838b2..d513889053a77 100644
--- a/spanner/google/cloud/spanner/session.py
+++ b/spanner/google/cloud/spanner/session.py
@@ -249,6 +249,7 @@ def transaction(self):
 
         if self._transaction is not None:
             self._transaction._rolled_back = True
+            del self._transaction
 
         txn = self._transaction = Transaction(self)
         return txn
diff --git a/spanner/google/cloud/spanner/transaction.py b/spanner/google/cloud/spanner/transaction.py
index e440210bf1225..7ac4251dea7dc 100644
--- a/spanner/google/cloud/spanner/transaction.py
+++ b/spanner/google/cloud/spanner/transaction.py
@@ -24,12 +24,24 @@
 
 
 class Transaction(_SnapshotBase, _BatchBase):
-    """Implement read-write transaction semantics for a session."""
+    """Implement read-write transaction semantics for a session.
+
+    :type session: :class:`~google.cloud.spanner.session.Session`
+    :param session: the session used to perform the commit
+
+    :raises ValueError: if session has an existing transaction
+    """
     committed = None
     """Timestamp at which the transaction was successfully committed."""
     _rolled_back = False
     _multi_use = True
 
+    def __init__(self, session):
+        if session._transaction is not None:
+            raise ValueError("Session has existing transaction.")
+
+        super(Transaction, self).__init__(session)
+
     def _check_state(self):
         """Helper for :meth:`commit` et al.
 
diff --git a/spanner/tests/unit/test_transaction.py b/spanner/tests/unit/test_transaction.py
index 9bb36d1f5435e..98b25186ff1e2 100644
--- a/spanner/tests/unit/test_transaction.py
+++ b/spanner/tests/unit/test_transaction.py
@@ -47,6 +47,12 @@ def _make_one(self, session, *args, **kwargs):
         session._transaction = transaction
         return transaction
 
+    def test_ctor_session_w_existing_txn(self):
+        session = _Session()
+        session._transaction = object()
+        with self.assertRaises(ValueError):
+            transaction = self._make_one(session)
+
     def test_ctor_defaults(self):
         session = _Session()
         transaction = self._make_one(session)

From 957f6e09599a72982bae069d6606ed27f4706e12 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Thu, 10 Aug 2017 11:34:25 -0700
Subject: [PATCH 184/211] Add SchemaField serialization and deserialization.
 (#3786)

---
 bigquery/google/cloud/bigquery/schema.py | 41 ++++++++++++++++++++++++
 bigquery/tests/unit/test_schema.py       | 41 ++++++++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/bigquery/google/cloud/bigquery/schema.py b/bigquery/google/cloud/bigquery/schema.py
index e98d67c30fb69..4aea34ac22e0e 100644
--- a/bigquery/google/cloud/bigquery/schema.py
+++ b/bigquery/google/cloud/bigquery/schema.py
@@ -43,6 +43,25 @@ def __init__(self, name, field_type, mode='NULLABLE',
         self._description = description
         self._fields = tuple(fields)
 
+    @classmethod
+    def from_api_repr(cls, api_repr):
+        """Return a ``SchemaField`` object deserialized from a dictionary.
+
+        Args:
+            api_repr (Mapping[str, str]): The serialized representation
+                of the SchemaField, such as what is output by
+                :meth:`to_api_repr`.
+
+        Returns:
+            SchemaField: The ``SchemaField`` object.
+        """
+        return cls(
+            field_type=api_repr['type'].upper(),
+            fields=[cls.from_api_repr(f) for f in api_repr.get('fields', ())],
+            mode=api_repr['mode'].upper(),
+            name=api_repr['name'],
+        )
+
     @property
     def name(self):
         """str: The name of the field."""
@@ -84,6 +103,28 @@ def fields(self):
         """
         return self._fields
 
+    def to_api_repr(self):
+        """Return a dictionary representing this schema field.
+
+        Returns:
+            dict: A dictionary representing the SchemaField in a serialized
+                form.
+        """
+        # Put together the basic representation. See http://bit.ly/2hOAT5u.
+        answer = {
+            'mode': self.mode.lower(),
+            'name': self.name,
+            'type': self.field_type.lower(),
+        }
+
+        # If this is a RECORD type, then sub-fields are also included,
+        # add this to the serialized representation.
+        if self.field_type.upper() == 'RECORD':
+            answer['fields'] = [f.to_api_repr() for f in self.fields]
+
+        # Done; return the serialized dictionary.
+        return answer
+
     def _key(self):
         """A tuple key that unique-ly describes this field.
 
diff --git a/bigquery/tests/unit/test_schema.py b/bigquery/tests/unit/test_schema.py
index 84f910a10d8eb..d08e7757063e1 100644
--- a/bigquery/tests/unit/test_schema.py
+++ b/bigquery/tests/unit/test_schema.py
@@ -61,6 +61,47 @@ def test_constructor_subfields(self):
         self.assertIs(field._fields[0], sub_field1)
         self.assertIs(field._fields[1], sub_field2)
 
+    def test_to_api_repr(self):
+        field = self._make_one('foo', 'INTEGER', 'NULLABLE')
+        self.assertEqual(field.to_api_repr(), {
+            'mode': 'nullable',
+            'name': 'foo',
+            'type': 'integer',
+        })
+
+    def test_to_api_repr_with_subfield(self):
+        subfield = self._make_one('bar', 'INTEGER', 'NULLABLE')
+        field = self._make_one('foo', 'RECORD', 'REQUIRED', fields=(subfield,))
+        self.assertEqual(field.to_api_repr(), {
+            'fields': [{
+                'mode': 'nullable',
+                'name': 'bar',
+                'type': 'integer',
+            }],
+            'mode': 'required',
+            'name': 'foo',
+            'type': 'record',
+        })
+
+    def test_from_api_repr(self):
+        field = self._get_target_class().from_api_repr({
+            'fields': [{
+                'mode': 'nullable',
+                'name': 'bar',
+                'type': 'integer',
+            }],
+            'mode': 'required',
+            'name': 'foo',
+            'type': 'record',
+        })
+        self.assertEqual(field.name, 'foo')
+        self.assertEqual(field.field_type, 'RECORD')
+        self.assertEqual(field.mode, 'REQUIRED')
+        self.assertEqual(len(field.fields), 1)
+        self.assertEqual(field.fields[0].name, 'bar')
+        self.assertEqual(field.fields[0].field_type, 'INTEGER')
+        self.assertEqual(field.fields[0].mode, 'NULLABLE')
+
     def test_name_property(self):
         name = 'lemon-ness'
         schema_field = self._make_one(name, 'INTEGER')

From 64d1728da1706cf4b77df3db95d1c59f1de6da28 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Thu, 10 Aug 2017 11:38:15 -0700
Subject: [PATCH 185/211] Storage: Track deleted labels; make Bucket.patch()
 send them. (#3737)

---
 storage/google/cloud/storage/_helpers.py |  2 ++
 storage/google/cloud/storage/bucket.py   | 40 ++++++++++++++++++++++++
 storage/tests/system.py                  |  2 +-
 storage/tests/unit/test_bucket.py        | 27 ++++++++++++++++
 4 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/storage/google/cloud/storage/_helpers.py b/storage/google/cloud/storage/_helpers.py
index 56a75c684f4c5..3a4eb2e232a26 100644
--- a/storage/google/cloud/storage/_helpers.py
+++ b/storage/google/cloud/storage/_helpers.py
@@ -142,6 +142,8 @@ def patch(self, client=None):
         # to work properly w/ 'noAcl'.
         update_properties = {key: self._properties[key]
                              for key in self._changes}
+
+        # Make the API call.
         api_response = client._connection.api_request(
             method='PATCH', path=self.path, data=update_properties,
             query_params={'projection': 'full'}, _target_object=self)
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index ad3a20e3aef0e..f1b50841aba23 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -115,6 +115,7 @@ def __init__(self, client, name=None):
         self._client = client
         self._acl = BucketACL(self)
         self._default_object_acl = DefaultObjectACL(self)
+        self._label_removals = set()
 
     def __repr__(self):
         return '<Bucket: %s>' % (self.name,)
@@ -124,6 +125,15 @@ def client(self):
         """The client bound to this bucket."""
         return self._client
 
+    def _set_properties(self, value):
+        """Set the properties for the current object.
+
+        :type value: dict or :class:`google.cloud.storage.batch._FutureDict`
+        :param value: The properties to be set.
+        """
+        self._label_removals.clear()
+        return super(Bucket, self)._set_properties(value)
+
     def blob(self, blob_name, chunk_size=None, encryption_key=None):
         """Factory constructor for blob object.
 
@@ -199,6 +209,27 @@ def create(self, client=None):
             data=properties, _target_object=self)
         self._set_properties(api_response)
 
+    def patch(self, client=None):
+        """Sends all changed properties in a PATCH request.
+
+        Updates the ``_properties`` with the response from the backend.
+
+        :type client: :class:`~google.cloud.storage.client.Client` or
+                      ``NoneType``
+        :param client: the client to use.  If not passed, falls back to the
+                       ``client`` stored on the current object.
+        """
+        # Special case: For buckets, it is possible that labels are being
+        # removed; this requires special handling.
+        if self._label_removals:
+            self._changes.add('labels')
+            self._properties.setdefault('labels', {})
+            for removed_label in self._label_removals:
+                self._properties['labels'][removed_label] = None
+
+        # Call the superclass method.
+        return super(Bucket, self).patch(client=client)
+
     @property
     def acl(self):
         """Create our ACL on demand."""
@@ -624,6 +655,15 @@ def labels(self, mapping):
         :type mapping: :class:`dict`
         :param mapping: Name-value pairs (string->string) labelling the bucket.
         """
+        # If any labels have been expressly removed, we need to track this
+        # so that a future .patch() call can do the correct thing.
+        existing = set([k for k in self.labels.keys()])
+        incoming = set([k for k in mapping.keys()])
+        self._label_removals = self._label_removals.union(
+            existing.difference(incoming),
+        )
+
+        # Actually update the labels on the object.
         self._patch_property('labels', copy.deepcopy(mapping))
 
     @property
diff --git a/storage/tests/system.py b/storage/tests/system.py
index bc8169c356b38..e51cfcaeccb26 100644
--- a/storage/tests/system.py
+++ b/storage/tests/system.py
@@ -127,7 +127,7 @@ def test_bucket_update_labels(self):
 
         new_labels = {'another-label': 'another-value'}
         bucket.labels = new_labels
-        bucket.update()
+        bucket.patch()
         self.assertEqual(bucket.labels, new_labels)
 
         bucket.labels = {}
diff --git a/storage/tests/unit/test_bucket.py b/storage/tests/unit/test_bucket.py
index ece5c54117737..1fd2da1287562 100644
--- a/storage/tests/unit/test_bucket.py
+++ b/storage/tests/unit/test_bucket.py
@@ -710,6 +710,33 @@ def test_labels_setter(self):
         self.assertIsNot(bucket._properties['labels'], LABELS)
         self.assertIn('labels', bucket._changes)
 
+    def test_labels_setter_with_removal(self):
+        # Make sure the bucket labels look correct and follow the expected
+        # public structure.
+        bucket = self._make_one(name='name')
+        self.assertEqual(bucket.labels, {})
+        bucket.labels = {'color': 'red', 'flavor': 'cherry'}
+        self.assertEqual(bucket.labels, {'color': 'red', 'flavor': 'cherry'})
+        bucket.labels = {'color': 'red'}
+        self.assertEqual(bucket.labels, {'color': 'red'})
+
+        # Make sure that a patch call correctly removes the flavor label.
+        client = mock.NonCallableMock(spec=('_connection',))
+        client._connection = mock.NonCallableMock(spec=('api_request',))
+        bucket.patch(client=client)
+        client._connection.api_request.assert_called()
+        _, _, kwargs = client._connection.api_request.mock_calls[0]
+        self.assertEqual(len(kwargs['data']['labels']), 2)
+        self.assertEqual(kwargs['data']['labels']['color'], 'red')
+        self.assertIsNone(kwargs['data']['labels']['flavor'])
+
+        # A second patch call should be a no-op for labels.
+        client._connection.api_request.reset_mock()
+        bucket.patch(client=client)
+        client._connection.api_request.assert_called()
+        _, _, kwargs = client._connection.api_request.mock_calls[0]
+        self.assertNotIn('labels', kwargs['data'])
+
     def test_get_logging_w_prefix(self):
         NAME = 'name'
         LOG_BUCKET = 'logs'

From ebecc7d0da7a6f9e02ea1c81cd85e80276b58e3b Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Thu, 10 Aug 2017 15:33:38 -0400
Subject: [PATCH 186/211] Drop 'Database.read' and 'Database.execute_sql'
 convenience methods. (#3787)

Because the context managers they use returned the session to the database's
pool, application code could not safely iterate over the result sets
returned by the methods.

Update docs for 'Snapshot.read' and 'Snapshot.execute_sql' to emphasize
iteration of their results sets before the session is returned to the
database pool (i.e., within the 'with' block which constructs the snapshot).

Closes #3769.
---
 docs/spanner/snapshot-usage.rst          | 44 ++++++++++++-----
 spanner/google/cloud/spanner/database.py | 62 ------------------------
 spanner/tests/system/test_system.py      | 19 ++++----
 spanner/tests/unit/test_database.py      | 55 ---------------------
 4 files changed, 42 insertions(+), 138 deletions(-)

diff --git a/docs/spanner/snapshot-usage.rst b/docs/spanner/snapshot-usage.rst
index d67533edb8f73..a23ff114c2fa4 100644
--- a/docs/spanner/snapshot-usage.rst
+++ b/docs/spanner/snapshot-usage.rst
@@ -45,12 +45,22 @@ fails if the result set is too large,
 
 .. code:: python
 
-    result = snapshot.read(
-        table='table-name', columns=['first_name', 'last_name', 'age'],
-        key_set=['phred@example.com', 'bharney@example.com'])
+    with database.snapshot() as snapshot:
+        result = snapshot.read(
+            table='table-name', columns=['first_name', 'last_name', 'age'],
+            key_set=['phred@example.com', 'bharney@example.com'])
 
-    for row in result.rows:
-        print(row)
+        for row in result.rows:
+            print(row)
+
+.. note::
+
+   The result set returned by
+   :meth:`~google.cloud.spanner.snapshot.Snapshot.execute_sql` *must not* be
+   iterated after the snapshot's session has been returned to the database's
+   session pool.  Therefore, unless your application creates sessions
+   manually, perform all iteration within the context of  the
+   ``with database.snapshot()`` block.
 
 .. note::
 
@@ -68,14 +78,24 @@ fails if the result set is too large,
 
 .. code:: python
 
-    QUERY = (
-        'SELECT e.first_name, e.last_name, p.telephone '
-        'FROM employees as e, phones as p '
-        'WHERE p.employee_id == e.employee_id')
-    result = snapshot.execute_sql(QUERY)
+    with database.snapshot() as snapshot:
+        QUERY = (
+            'SELECT e.first_name, e.last_name, p.telephone '
+            'FROM employees as e, phones as p '
+            'WHERE p.employee_id == e.employee_id')
+        result = snapshot.execute_sql(QUERY)
+
+        for row in result.rows:
+            print(row)
+
+.. note::
 
-    for row in result.rows:
-        print(row)
+   The result set returned by
+   :meth:`~google.cloud.spanner.snapshot.Snapshot.execute_sql` *must not* be
+   iterated after the snapshot's session has been returned to the database's
+   session pool.  Therefore, unless your application creates sessions
+   manually, perform all iteration within the context of  the
+   ``with database.snapshot()`` block.
 
 
 Next Step
diff --git a/spanner/google/cloud/spanner/database.py b/spanner/google/cloud/spanner/database.py
index a984b88ed4b24..b098f7684b7cd 100644
--- a/spanner/google/cloud/spanner/database.py
+++ b/spanner/google/cloud/spanner/database.py
@@ -313,68 +313,6 @@ def session(self):
         """
         return Session(self)
 
-    def read(self, table, columns, keyset, index='', limit=0,
-             resume_token=b''):
-        """Perform a ``StreamingRead`` API request for rows in a table.
-
-        :type table: str
-        :param table: name of the table from which to fetch data
-
-        :type columns: list of str
-        :param columns: names of columns to be retrieved
-
-        :type keyset: :class:`~google.cloud.spanner.keyset.KeySet`
-        :param keyset: keys / ranges identifying rows to be retrieved
-
-        :type index: str
-        :param index: (Optional) name of index to use, rather than the
-                      table's primary key
-
-        :type limit: int
-        :param limit: (Optional) maxiumn number of rows to return
-
-        :type resume_token: bytes
-        :param resume_token: token for resuming previously-interrupted read
-
-        :rtype: :class:`~google.cloud.spanner.streamed.StreamedResultSet`
-        :returns: a result set instance which can be used to consume rows.
-        """
-        with SessionCheckout(self._pool) as session:
-            return session.read(
-                table, columns, keyset, index, limit, resume_token)
-
-    def execute_sql(self, sql, params=None, param_types=None, query_mode=None,
-                    resume_token=b''):
-        """Perform an ``ExecuteStreamingSql`` API request.
-
-        :type sql: str
-        :param sql: SQL query statement
-
-        :type params: dict, {str -> column value}
-        :param params: values for parameter replacement.  Keys must match
-                       the names used in ``sql``.
-
-        :type param_types:
-            dict, {str -> :class:`google.spanner.v1.type_pb2.TypeCode`}
-        :param param_types: (Optional) explicit types for one or more param
-                            values;  overrides default type detection on the
-                            back-end.
-
-        :type query_mode:
-            :class:`google.spanner.v1.spanner_pb2.ExecuteSqlRequest.QueryMode`
-        :param query_mode: Mode governing return of results / query plan. See
-            https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.ExecuteSqlRequest.QueryMode1
-
-        :type resume_token: bytes
-        :param resume_token: token for resuming previously-interrupted query
-
-        :rtype: :class:`~google.cloud.spanner.streamed.StreamedResultSet`
-        :returns: a result set instance which can be used to consume rows.
-        """
-        with SessionCheckout(self._pool) as session:
-            return session.execute_sql(
-                sql, params, param_types, query_mode, resume_token)
-
     def run_in_transaction(self, func, *args, **kw):
         """Perform a unit of work in a transaction, retrying on abort.
 
diff --git a/spanner/tests/system/test_system.py b/spanner/tests/system/test_system.py
index fa70573c88deb..f20ce592070a1 100644
--- a/spanner/tests/system/test_system.py
+++ b/spanner/tests/system/test_system.py
@@ -297,7 +297,7 @@ def test_update_database_ddl(self):
 
         self.assertEqual(len(temp_db.ddl_statements), len(DDL_STATEMENTS))
 
-    def test_db_batch_insert_then_db_snapshot_read_and_db_read(self):
+    def test_db_batch_insert_then_db_snapshot_read(self):
         retry = RetryInstanceState(_has_all_ddl)
         retry(self._db.reload)()
 
@@ -310,10 +310,7 @@ def test_db_batch_insert_then_db_snapshot_read_and_db_read(self):
 
         self._check_row_data(from_snap)
 
-        from_db = list(self._db.read(self.TABLE, self.COLUMNS, self.ALL))
-        self._check_row_data(from_db)
-
-    def test_db_run_in_transaction_then_db_execute_sql(self):
+    def test_db_run_in_transaction_then_snapshot_execute_sql(self):
         retry = RetryInstanceState(_has_all_ddl)
         retry(self._db.reload)()
 
@@ -329,7 +326,8 @@ def _unit_of_work(transaction, test):
 
         self._db.run_in_transaction(_unit_of_work, test=self)
 
-        rows = list(self._db.execute_sql(self.SQL))
+        with self._db.snapshot() as after:
+            rows = list(after.execute_sql(self.SQL))
         self._check_row_data(rows)
 
     def test_db_run_in_transaction_twice(self):
@@ -346,7 +344,8 @@ def _unit_of_work(transaction, test):
         self._db.run_in_transaction(_unit_of_work, test=self)
         self._db.run_in_transaction(_unit_of_work, test=self)
 
-        rows = list(self._db.execute_sql(self.SQL))
+        with self._db.snapshot() as after:
+            rows = list(after.execute_sql(self.SQL))
         self._check_row_data(rows)
 
 
@@ -1085,7 +1084,8 @@ def setUpClass(cls):
 
     def _verify_one_column(self, table_desc):
         sql = 'SELECT chunk_me FROM {}'.format(table_desc.table)
-        rows = list(self._db.execute_sql(sql))
+        with self._db.snapshot() as snapshot:
+            rows = list(snapshot.execute_sql(sql))
         self.assertEqual(len(rows), table_desc.row_count)
         expected = table_desc.value()
         for row in rows:
@@ -1093,7 +1093,8 @@ def _verify_one_column(self, table_desc):
 
     def _verify_two_columns(self, table_desc):
         sql = 'SELECT chunk_me, chunk_me_2 FROM {}'.format(table_desc.table)
-        rows = list(self._db.execute_sql(sql))
+        with self._db.snapshot() as snapshot:
+            rows = list(snapshot.execute_sql(sql))
         self.assertEqual(len(rows), table_desc.row_count)
         expected = table_desc.value()
         for row in rows:
diff --git a/spanner/tests/unit/test_database.py b/spanner/tests/unit/test_database.py
index 40e10ec971a99..c1218599b3b37 100644
--- a/spanner/tests/unit/test_database.py
+++ b/spanner/tests/unit/test_database.py
@@ -621,21 +621,6 @@ def test_session_factory(self):
         self.assertIs(session.session_id, None)
         self.assertIs(session._database, database)
 
-    def test_execute_sql_defaults(self):
-        QUERY = 'SELECT * FROM employees'
-        client = _Client()
-        instance = _Instance(self.INSTANCE_NAME, client=client)
-        pool = _Pool()
-        session = _Session()
-        pool.put(session)
-        session._execute_result = []
-        database = self._make_one(self.DATABASE_ID, instance, pool=pool)
-
-        rows = list(database.execute_sql(QUERY))
-
-        self.assertEqual(rows, [])
-        self.assertEqual(session._executed, (QUERY, None, None, None, b''))
-
     def test_run_in_transaction_wo_args(self):
         import datetime
 
@@ -678,38 +663,6 @@ def test_run_in_transaction_w_args(self):
         self.assertEqual(session._retried,
                          (_unit_of_work, (SINCE,), {'until': UNTIL}))
 
-    def test_read(self):
-        from google.cloud.spanner.keyset import KeySet
-
-        TABLE_NAME = 'citizens'
-        COLUMNS = ['email', 'first_name', 'last_name', 'age']
-        KEYS = ['bharney@example.com', 'phred@example.com']
-        KEYSET = KeySet(keys=KEYS)
-        INDEX = 'email-address-index'
-        LIMIT = 20
-        TOKEN = b'DEADBEEF'
-        client = _Client()
-        instance = _Instance(self.INSTANCE_NAME, client=client)
-        pool = _Pool()
-        session = _Session()
-        pool.put(session)
-        database = self._make_one(self.DATABASE_ID, instance, pool=pool)
-
-        rows = list(database.read(
-            TABLE_NAME, COLUMNS, KEYSET, INDEX, LIMIT, TOKEN))
-
-        self.assertEqual(rows, [])
-
-        (table, columns, key_set, index, limit,
-         resume_token) = session._read_with
-
-        self.assertEqual(table, TABLE_NAME)
-        self.assertEqual(columns, COLUMNS)
-        self.assertEqual(key_set, KEYSET)
-        self.assertEqual(index, INDEX)
-        self.assertEqual(limit, LIMIT)
-        self.assertEqual(resume_token, TOKEN)
-
     def test_batch(self):
         from google.cloud.spanner.database import BatchCheckout
 
@@ -951,18 +904,10 @@ def __init__(self, database=None, name=_BaseTest.SESSION_NAME):
         self._database = database
         self.name = name
 
-    def execute_sql(self, sql, params, param_types, query_mode, resume_token):
-        self._executed = (sql, params, param_types, query_mode, resume_token)
-        return iter(self._rows)
-
     def run_in_transaction(self, func, *args, **kw):
         self._retried = (func, args, kw)
         return self._committed
 
-    def read(self, table, columns, keyset, index, limit, resume_token):
-        self._read_with = (table, columns, keyset, index, limit, resume_token)
-        return iter(self._rows)
-
 
 class _SessionPB(object):
     name = TestDatabase.SESSION_NAME

From 19e9579b11d128aaab95c6e04f1abf7fb5d6d581 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Thu, 10 Aug 2017 15:38:40 -0400
Subject: [PATCH 187/211] Update spanner docs to show correct 'Batch.delete'
 usage.

Closes #3773.
---
 docs/spanner/batch-usage.rst | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/docs/spanner/batch-usage.rst b/docs/spanner/batch-usage.rst
index 1bdce70e5342d..b22c3b832c12d 100644
--- a/docs/spanner/batch-usage.rst
+++ b/docs/spanner/batch-usage.rst
@@ -124,8 +124,14 @@ rows do not cause errors.
 
 .. code:: python
 
-    batch.delete('citizens',
-        keyset['bharney@example.com', 'nonesuch@example.com'])
+    from google.cloud.spanner.keyset import KeySet
+
+    to_delete = KeySet(keys=[
+        ('bharney@example.com',)
+        ('nonesuch@example.com',)
+    ])
+
+    batch.delete('citizens', to_delete)
 
 
 Commit changes for a Batch
@@ -151,6 +157,13 @@ if the ``with`` block exits without raising an exception.
 
 .. code:: python
 
+    from google.cloud.spanner.keyset import KeySet
+
+    to_delete = KeySet(keys=[
+        ('bharney@example.com',)
+        ('nonesuch@example.com',)
+    ])
+
     with session.batch() as batch:
 
         batch.insert(
@@ -169,8 +182,7 @@ if the ``with`` block exits without raising an exception.
 
         ...
 
-        batch.delete('citizens',
-            keyset['bharney@example.com', 'nonesuch@example.com'])
+        batch.delete('citizens', to_delete)
 
 
 Next Step

From edc7c27cd750c61f60f9a67c7efe73e2ed8f6f95 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Thu, 10 Aug 2017 15:09:33 -0700
Subject: [PATCH 188/211] Prevent nested transactions. (#3789)

---
 spanner/google/cloud/spanner/database.py | 18 ++++++++++++--
 spanner/tests/unit/test_database.py      | 31 ++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/spanner/google/cloud/spanner/database.py b/spanner/google/cloud/spanner/database.py
index b098f7684b7cd..40dcc471d1c4e 100644
--- a/spanner/google/cloud/spanner/database.py
+++ b/spanner/google/cloud/spanner/database.py
@@ -15,6 +15,7 @@
 """User friendly container for Cloud Spanner Database."""
 
 import re
+import threading
 
 import google.auth.credentials
 from google.gax.errors import GaxError
@@ -79,6 +80,7 @@ def __init__(self, database_id, instance, ddl_statements=(), pool=None):
         self.database_id = database_id
         self._instance = instance
         self._ddl_statements = _check_ddl_statements(ddl_statements)
+        self._local = threading.local()
 
         if pool is None:
             pool = BurstyPool()
@@ -332,8 +334,20 @@ def run_in_transaction(self, func, *args, **kw):
         :rtype: :class:`datetime.datetime`
         :returns: timestamp of committed transaction
         """
-        with SessionCheckout(self._pool) as session:
-            return session.run_in_transaction(func, *args, **kw)
+        # Sanity check: Is there a transaction already running?
+        # If there is, then raise a red flag. Otherwise, mark that this one
+        # is running.
+        if getattr(self._local, 'transaction_running', False):
+            raise RuntimeError('Spanner does not support nested transactions.')
+        self._local.transaction_running = True
+
+        # Check out a session and run the function in a transaction; once
+        # done, flip the sanity check bit back.
+        try:
+            with SessionCheckout(self._pool) as session:
+                return session.run_in_transaction(func, *args, **kw)
+        finally:
+            self._local.transaction_running = False
 
     def batch(self):
         """Return an object which wraps a batch.
diff --git a/spanner/tests/unit/test_database.py b/spanner/tests/unit/test_database.py
index c1218599b3b37..c812176499dd2 100644
--- a/spanner/tests/unit/test_database.py
+++ b/spanner/tests/unit/test_database.py
@@ -223,7 +223,7 @@ def __init__(self, scopes=(), source=None):
                 self._scopes = scopes
                 self._source = source
 
-            def requires_scopes(self): # pragma: NO COVER
+            def requires_scopes(self):  # pragma: NO COVER
                 return True
 
             def with_scopes(self, scopes):
@@ -663,6 +663,29 @@ def test_run_in_transaction_w_args(self):
         self.assertEqual(session._retried,
                          (_unit_of_work, (SINCE,), {'until': UNTIL}))
 
+    def test_run_in_transaction_nested(self):
+        from datetime import datetime
+
+        # Perform the various setup tasks.
+        instance = _Instance(self.INSTANCE_NAME, client=_Client())
+        pool = _Pool()
+        session = _Session(run_transaction_function=True)
+        session._committed = datetime.now()
+        pool.put(session)
+        database = self._make_one(self.DATABASE_ID, instance, pool=pool)
+
+        # Define the inner function.
+        inner = mock.Mock(spec=())
+
+        # Define the nested transaction.
+        def nested_unit_of_work():
+            return database.run_in_transaction(inner)
+
+        # Attempting to run this transaction should raise RuntimeError.
+        with self.assertRaises(RuntimeError):
+            database.run_in_transaction(nested_unit_of_work)
+        self.assertEqual(inner.call_count, 0)
+
     def test_batch(self):
         from google.cloud.spanner.database import BatchCheckout
 
@@ -900,11 +923,15 @@ class _Session(object):
 
     _rows = ()
 
-    def __init__(self, database=None, name=_BaseTest.SESSION_NAME):
+    def __init__(self, database=None, name=_BaseTest.SESSION_NAME,
+                 run_transaction_function=False):
         self._database = database
         self.name = name
+        self._run_transaction_function = run_transaction_function
 
     def run_in_transaction(self, func, *args, **kw):
+        if self._run_transaction_function:
+            func(*args, **kw)
         self._retried = (func, args, kw)
         return self._committed
 

From 5145022d09d3369810153cb007d6f78ddd1ab966 Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Thu, 10 Aug 2017 19:34:10 -0700
Subject: [PATCH 189/211] Wait for load jobs to complete in system tests.
 (#3782)

---
 bigquery/tests/system.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bigquery/tests/system.py b/bigquery/tests/system.py
index 9d3bb77942567..5d0b38ffac41e 100644
--- a/bigquery/tests/system.py
+++ b/bigquery/tests/system.py
@@ -35,6 +35,7 @@
 from test_utils.system import unique_resource_id
 
 
+JOB_TIMEOUT = 120  # 2 minutes
 WHERE = os.path.abspath(os.path.dirname(__file__))
 
 
@@ -381,8 +382,7 @@ def test_load_table_from_local_file_then_dump_table(self):
                 )
 
         # Retry until done.
-        retry = RetryInstanceState(_job_done, max_tries=8)
-        retry(job.reload)()
+        job.result(timeout=JOB_TIMEOUT)
 
         self.assertEqual(job.output_rows, len(ROWS))
 
@@ -419,8 +419,7 @@ def test_load_table_from_local_avro_file_then_dump_table(self):
             )
 
         # Retry until done.
-        retry = RetryInstanceState(_job_done, max_tries=8)
-        retry(job.reload)()
+        job.result(timeout=JOB_TIMEOUT)
 
         self.assertEqual(job.output_rows, len(ROWS))
 
@@ -770,8 +769,7 @@ def _load_table_for_dml(self, rows, dataset_name, table_name):
                 )
 
         # Retry until done.
-        retry = RetryInstanceState(_job_done, max_tries=8)
-        retry(job.reload)()
+        job.result(timeout=JOB_TIMEOUT)
         self._fetch_single_page(table)
 
     def test_sync_query_w_dml(self):
@@ -799,7 +797,9 @@ def test_dbapi_w_dml(self):
             WHERE greeting = 'Hello World'
             """
 
-        Config.CURSOR.execute(query_template.format(dataset_name, table_name))
+        Config.CURSOR.execute(
+            query_template.format(dataset_name, table_name),
+            job_id='test_dbapi_w_dml_{}'.format(unique_resource_id()))
         self.assertEqual(Config.CURSOR.rowcount, 1)
         self.assertIsNone(Config.CURSOR.fetchone())
 
@@ -1086,7 +1086,7 @@ def test_async_query_future(self):
             str(uuid.uuid4()), 'SELECT 1')
         query_job.use_legacy_sql = False
 
-        iterator = query_job.result().fetch_data()
+        iterator = query_job.result(timeout=JOB_TIMEOUT).fetch_data()
         rows = list(iterator)
         self.assertEqual(rows, [(1,)])
 

From 4817fb77152a606bdab3d1eabfab0e650b2871a4 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Fri, 11 Aug 2017 12:48:44 -0400
Subject: [PATCH 190/211] Document retry of exceptions while streaming
 'read'/'execute_sql' results. (#3790)

See: #3775.
---
 docs/spanner/snapshot-usage.rst | 41 ++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/docs/spanner/snapshot-usage.rst b/docs/spanner/snapshot-usage.rst
index a23ff114c2fa4..ba31425a54b44 100644
--- a/docs/spanner/snapshot-usage.rst
+++ b/docs/spanner/snapshot-usage.rst
@@ -64,9 +64,24 @@ fails if the result set is too large,
 
 .. note::
 
-   If streaming a chunk fails due to a "resumable" error,
-   :meth:`Session.read` retries the ``StreamingRead`` API reqeust,
-   passing the ``resume_token`` from the last partial result streamed.
+   If streaming a chunk raises an exception, the application can
+   retry the ``read``, passing the ``resume_token`` from ``StreamingResultSet``
+   which raised the error.  E.g.:
+
+   .. code:: python
+
+      result = snapshot.read(table, columns, keys)
+      while True:
+          try:
+              for row in result.rows:
+                  print row
+          except Exception:
+               result = snapshot.read(
+                  table, columns, keys, resume_token=result.resume_token)
+               continue
+          else:
+              break
+
 
 
 Execute a SQL Select Statement
@@ -97,6 +112,26 @@ fails if the result set is too large,
    manually, perform all iteration within the context of  the
    ``with database.snapshot()`` block.
 
+.. note::
+
+   If streaming a chunk raises an exception, the application can
+   retry the query, passing the ``resume_token`` from ``StreamingResultSet``
+   which raised the error.  E.g.:
+
+   .. code:: python
+
+      result = snapshot.execute_sql(QUERY)
+      while True:
+          try:
+              for row in result.rows:
+                  print row
+          except Exception:
+               result = snapshot.execute_sql(
+                  QUERY, resume_token=result.resume_token)
+               continue
+          else:
+              break
+
 
 Next Step
 ---------

From 6c15d8122c583d8f50d4c140aa97a502ade55e03 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 11 Aug 2017 09:51:04 -0700
Subject: [PATCH 191/211] Make the Spanner README better. (#3791)

---
 spanner/README.rst | 129 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)

diff --git a/spanner/README.rst b/spanner/README.rst
index 1580c27a71a0f..109b9289923ab 100644
--- a/spanner/README.rst
+++ b/spanner/README.rst
@@ -12,3 +12,132 @@ Quick Start
 .. code-block:: console
 
     $ pip install --upgrade google-cloud-spanner
+
+
+Authentication
+--------------
+
+With ``google-cloud-python`` we try to make authentication as painless as
+possible. Check out the `Authentication section`_ in our documentation to
+learn more. You may also find the `authentication document`_ shared by all
+the ``google-cloud-*`` libraries to be helpful.
+
+.. _Authentication section: https://google-cloud-python.readthedocs.io/en/latest/core/auth.html
+.. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
+
+
+Using the API
+-------------
+
+Cloud Spanner is the world’s first fully managed relational database service
+to offer both strong consistency and horizontal scalability for
+mission-critical online transaction processing (OLTP) applications. With Cloud
+Spanner you enjoy all the traditional benefits of a relational database; but
+unlike any other relational database service, Cloud Spanner scales
+horizontally to hundreds or thousands of servers to handle the biggest
+transactional workloads. (`About Cloud Spanner`_)
+
+.. _About Cloud Spanner: https://cloud.google.com/spanner/
+
+
+Executing Arbitrary SQL in a Transaction
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Generally, to work with Cloud Spanner, you will want a transaction. The
+preferred mechanism for this is to create a single function, which executes
+as a callback to ``database.run_in_transaction``:
+
+.. code:: python
+
+    # First, define the function that represents a single "unit of work"
+    # that should be run within the transaction.
+    def update_anniversary(transaction, person_id, unix_timestamp):
+        # The query itself is just a string.
+        #
+        # The use of @parameters is recommended rather than doing your
+        # own string interpolation; this provides protections against
+        # SQL injection attacks.
+        query = """UPDATE people
+            SET anniversary = @uxts
+            WHERE id = @person_id"""
+
+        # When executing the SQL statement, the query and parameters are sent
+        # as separate arguments. When using parameters, you must specify
+        # both the parameters themselves and their types.
+        transaction.execute_sql(
+            query=query,
+            params={'person_id': person_id, 'uxts': unix_timestamp},
+            param_types={
+                'person_id': types.INT64_PARAM_TYPE,
+                'uxts': types.INT64_PARAM_TYPE,
+            },
+        )
+
+    # Actually run the `update_anniversary` function in a transaction.
+    database.run_in_transaction(update_anniversary,
+        person_id=42,
+        unix_timestamp=1335020400,
+    )
+
+
+Select records using a Transaction
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Once you have a transaction object (such as the first argument sent to
+``run_in_transaction``), reading data is easy:
+
+.. code:: python
+
+    # Define a SELECT query.
+    query = """SELECT e.first_name, e.last_name, p.telephone
+        FROM employees as e, phones as p
+        WHERE p.employee_id == e.employee_id"""
+
+    # Execute the query and return results.
+    result = transaction.execute_sql(query)
+    for row in result.rows:
+        print(row)
+
+
+Insert records using a Transaction
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To add one or more records to a table, use ``insert``:
+
+.. code:: python
+
+    transaction.insert(
+        'citizens',
+        columns=['email', 'first_name', 'last_name', 'age'],
+        values=[
+            ['phred@exammple.com', 'Phred', 'Phlyntstone', 32],
+            ['bharney@example.com', 'Bharney', 'Rhubble', 31],
+        ],
+    )
+
+
+Update records using a Transaction
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``Transaction.update`` updates one or more existing records in a table.  Fails
+if any of the records does not already exist.
+
+.. code:: python
+
+    transaction.update(
+        'citizens',
+        columns=['email', 'age'],
+        values=[
+            ['phred@exammple.com', 33],
+            ['bharney@example.com', 32],
+        ],
+    )
+
+
+Learn More
+----------
+
+See the ``google-cloud-python`` API `Cloud Spanner documentation`_ to learn how
+to connect to Cloud Spanner using this Client Library.
+
+.. _Cloud Spanner documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/bigquery/usage.html

From 7e960e6915997a64c9ee1424978f94cfd7e9a7b9 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 11 Aug 2017 09:52:13 -0700
Subject: [PATCH 192/211] Add a .one and .one_or_none method. (#3784)

---
 spanner/google/cloud/spanner/streamed.py | 43 ++++++++++++++++
 spanner/tests/unit/test_streamed.py      | 63 ++++++++++++++++++++++--
 2 files changed, 101 insertions(+), 5 deletions(-)

diff --git a/spanner/google/cloud/spanner/streamed.py b/spanner/google/cloud/spanner/streamed.py
index f44d0278a22aa..c7d950d766d7e 100644
--- a/spanner/google/cloud/spanner/streamed.py
+++ b/spanner/google/cloud/spanner/streamed.py
@@ -16,6 +16,7 @@
 
 from google.protobuf.struct_pb2 import ListValue
 from google.protobuf.struct_pb2 import Value
+from google.cloud import exceptions
 from google.cloud.proto.spanner.v1 import type_pb2
 import six
 
@@ -169,6 +170,48 @@ def __iter__(self):
             while iter_rows:
                 yield iter_rows.pop(0)
 
+    def one(self):
+        """Return exactly one result, or raise an exception.
+
+        :raises: :exc:`NotFound`: If there are no results.
+        :raises: :exc:`ValueError`: If there are multiple results.
+        :raises: :exc:`RuntimeError`: If consumption has already occurred,
+            in whole or in part.
+        """
+        answer = self.one_or_none()
+        if answer is None:
+            raise exceptions.NotFound('No rows matched the given query.')
+        return answer
+
+    def one_or_none(self):
+        """Return exactly one result, or None if there are no results.
+
+        :raises: :exc:`ValueError`: If there are multiple results.
+        :raises: :exc:`RuntimeError`: If consumption has already occurred,
+            in whole or in part.
+        """
+        # Sanity check: Has consumption of this query already started?
+        # If it has, then this is an exception.
+        if self._metadata is not None:
+            raise RuntimeError('Can not call `.one` or `.one_or_none` after '
+                               'stream consumption has already started.')
+
+        # Consume the first result of the stream.
+        # If there is no first result, then return None.
+        iterator = iter(self)
+        try:
+            answer = next(iterator)
+        except StopIteration:
+            return None
+
+        # Attempt to consume more. This should no-op; if we get additional
+        # rows, then this is an error case.
+        try:
+            next(iterator)
+            raise ValueError('Expected one result; got more.')
+        except StopIteration:
+            return answer
+
 
 class Unmergeable(ValueError):
     """Unable to merge two values.
diff --git a/spanner/tests/unit/test_streamed.py b/spanner/tests/unit/test_streamed.py
index 2e31f4dfad2cf..0e0bcb7aff6b3 100644
--- a/spanner/tests/unit/test_streamed.py
+++ b/spanner/tests/unit/test_streamed.py
@@ -53,7 +53,7 @@ def test_fields_unset(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)
         with self.assertRaises(AttributeError):
-            _ = streamed.fields
+            streamed.fields
 
     @staticmethod
     def _make_scalar_field(name, type_):
@@ -243,13 +243,24 @@ def test__merge_chunk_string_w_bytes(self):
             self._make_scalar_field('image', 'BYTES'),
         ]
         streamed._metadata = self._make_result_set_metadata(FIELDS)
-        streamed._pending_chunk = self._make_value(u'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA\n')
-        chunk = self._make_value(u'B3RJTUUH4QQGFwsBTL3HMwAAABJpVFh0Q29tbWVudAAAAAAAU0FNUExFMG3E+AAAAApJREFUCNdj\nYAAAAAIAAeIhvDMAAAAASUVORK5CYII=\n')
+        streamed._pending_chunk = self._make_value(
+            u'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA'
+            u'6fptVAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA\n',
+        )
+        chunk = self._make_value(
+            u'B3RJTUUH4QQGFwsBTL3HMwAAABJpVFh0Q29tbWVudAAAAAAAU0FNUExF'
+            u'MG3E+AAAAApJREFUCNdj\nYAAAAAIAAeIhvDMAAAAASUVORK5CYII=\n',
+        )
 
         merged = streamed._merge_chunk(chunk)
 
-        self.assertEqual(merged.string_value, u'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA\nB3RJTUUH4QQGFwsBTL3HMwAAABJpVFh0Q29tbWVudAAAAAAAU0FNUExFMG3E+AAAAApJREFUCNdj\nYAAAAAIAAeIhvDMAAAAASUVORK5CYII=\n')
-        self.assertIsNone(streamed._pending_chunk)     
+        self.assertEqual(
+            merged.string_value,
+            u'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACXBIWXMAAAsTAAAL'
+            u'EwEAmpwYAAAA\nB3RJTUUH4QQGFwsBTL3HMwAAABJpVFh0Q29tbWVudAAAAAAAU0'
+            u'FNUExFMG3E+AAAAApJREFUCNdj\nYAAAAAIAAeIhvDMAAAAASUVORK5CYII=\n',
+        )
+        self.assertIsNone(streamed._pending_chunk)
 
     def test__merge_chunk_array_of_bool(self):
         iterator = _MockCancellableIterator()
@@ -591,6 +602,48 @@ def test_merge_values_partial_and_filled_plus(self):
         self.assertEqual(streamed.rows, [VALUES[0:3], VALUES[3:6]])
         self.assertEqual(streamed._current_row, VALUES[6:])
 
+    def test_one_or_none_no_value(self):
+        streamed = self._make_one(_MockCancellableIterator())
+        with mock.patch.object(streamed, 'consume_next') as consume_next:
+            consume_next.side_effect = StopIteration
+            self.assertIsNone(streamed.one_or_none())
+
+    def test_one_or_none_single_value(self):
+        streamed = self._make_one(_MockCancellableIterator())
+        streamed._rows = ['foo']
+        with mock.patch.object(streamed, 'consume_next') as consume_next:
+            consume_next.side_effect = StopIteration
+            self.assertEqual(streamed.one_or_none(), 'foo')
+
+    def test_one_or_none_multiple_values(self):
+        streamed = self._make_one(_MockCancellableIterator())
+        streamed._rows = ['foo', 'bar']
+        with self.assertRaises(ValueError):
+            streamed.one_or_none()
+
+    def test_one_or_none_consumed_stream(self):
+        streamed = self._make_one(_MockCancellableIterator())
+        streamed._metadata = object()
+        with self.assertRaises(RuntimeError):
+            streamed.one_or_none()
+
+    def test_one_single_value(self):
+        streamed = self._make_one(_MockCancellableIterator())
+        streamed._rows = ['foo']
+        with mock.patch.object(streamed, 'consume_next') as consume_next:
+            consume_next.side_effect = StopIteration
+            self.assertEqual(streamed.one(), 'foo')
+
+    def test_one_no_value(self):
+        from google.cloud import exceptions
+
+        iterator = _MockCancellableIterator(['foo'])
+        streamed = self._make_one(iterator)
+        with mock.patch.object(streamed, 'consume_next') as consume_next:
+            consume_next.side_effect = StopIteration
+            with self.assertRaises(exceptions.NotFound):
+                streamed.one()
+
     def test_consume_next_empty(self):
         iterator = _MockCancellableIterator()
         streamed = self._make_one(iterator)

From d750a1394781dbe33679057c02233d2dfc2540e1 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Fri, 11 Aug 2017 13:10:03 -0400
Subject: [PATCH 193/211] Drop 'Session' as a promoted, top-level entity in
 docs. (#3792)

---
 docs/spanner/advanced-session-pool-topics.rst |  98 +++++++++
 docs/spanner/database-usage.rst               | 139 +++++++++++-
 docs/spanner/session-crud-usage.rst           |  80 -------
 docs/spanner/session-implicit-txn-usage.rst   |  54 -----
 docs/spanner/session-pool-usage.rst           | 198 ------------------
 docs/spanner/usage.rst                        |   4 +-
 spanner/google/cloud/spanner/database.py      |  60 +++---
 spanner/tests/unit/test_database.py           |  98 ++++-----
 8 files changed, 314 insertions(+), 417 deletions(-)
 create mode 100644 docs/spanner/advanced-session-pool-topics.rst
 delete mode 100644 docs/spanner/session-crud-usage.rst
 delete mode 100644 docs/spanner/session-implicit-txn-usage.rst
 delete mode 100644 docs/spanner/session-pool-usage.rst

diff --git a/docs/spanner/advanced-session-pool-topics.rst b/docs/spanner/advanced-session-pool-topics.rst
new file mode 100644
index 0000000000000..b8b4e8c9253a5
--- /dev/null
+++ b/docs/spanner/advanced-session-pool-topics.rst
@@ -0,0 +1,98 @@
+Advanced Session Pool Topics
+============================
+
+Custom Session Pool Implementations
+-----------------------------------
+
+You can supply your own pool implementation, which must satisfy the
+contract laid out in
+:class:`~google.cloud.spanner.pool.AbstractSessionPool`:
+
+.. code-block:: python
+
+   from google.cloud.spanner.pool import AbstractSessionPool
+
+   class MyCustomPool(AbstractSessionPool):
+
+        def __init__(self, custom_param):
+            super(MyCustomPool, self).__init__()
+            self.custom_param = custom_param
+
+        def bind(self, database):
+            ...
+
+        def get(self, read_only=False):
+            ...
+
+        def put(self, session, discard_if_full=True):
+            ...
+
+   pool = MyCustomPool(custom_param=42)
+   database = instance.database(DATABASE_NAME, pool=pool)
+
+Lowering latency for read / query operations
+--------------------------------------------
+
+Some applications may need to minimize latency for read operations, including
+particularly the overhead of making an API request to create or refresh a
+session.  :class:`~google.cloud.spanner.pool.PingingPool` is designed for such
+applications, which need to configure a background thread to do the work of
+keeping the sessions fresh.
+
+Create an instance of :class:`~google.cloud.spanner.pool.PingingPool`:
+
+.. code-block:: python
+
+   from google.cloud.spanner import Client
+   from google.cloud.spanner.pool import PingingPool
+
+   client = Client()
+   instance = client.instance(INSTANCE_NAME)
+   pool = PingingPool(size=10, default_timeout=5, ping_interval=300)
+   database = instance.database(DATABASE_NAME, pool=pool)
+
+Set up a background thread to ping the pool's session, keeping them
+from becoming stale:
+
+.. code-block:: python
+
+   import threading
+
+   background = threading.Thread(target=pool.ping, name='ping-pool')
+   background.daemon = True
+   background.start()
+
+Lowering latency for mixed read-write operations
+------------------------------------------------
+
+Some applications may need to minimize latency for read write operations,
+including particularly the overhead of making an API request to create or
+refresh a session or to begin a session's transaction.
+:class:`~google.cloud.spanner.pool.TransactionPingingPool` is designed for
+such applications, which need to configure a background thread to do the work
+of keeping the sessions fresh and starting their transactions after use.
+
+Create an instance of
+:class:`~google.cloud.spanner.pool.TransactionPingingPool`:
+
+.. code-block:: python
+
+   from google.cloud.spanner import Client
+   from google.cloud.spanner.pool import TransactionPingingPool
+
+   client = Client()
+   instance = client.instance(INSTANCE_NAME)
+   pool = TransactionPingingPool(size=10, default_timeout=5, ping_interval=300)
+   database = instance.database(DATABASE_NAME, pool=pool)
+
+Set up a background thread to ping the pool's session, keeping them
+from becoming stale, and ensuring that each session has a new transaction
+started before it is used:
+
+.. code-block:: python
+
+   import threading
+
+   background = threading.Thread(target=pool.ping, name='ping-pool')
+   background.daemon = True
+   background.start()
diff --git a/docs/spanner/database-usage.rst b/docs/spanner/database-usage.rst
index aecd1ab12ccc3..529010c8443fc 100644
--- a/docs/spanner/database-usage.rst
+++ b/docs/spanner/database-usage.rst
@@ -117,8 +117,141 @@ method:
     :meth:`~google.cloud.spanner.instance.Operation.finished`
     will result in an :exc`ValueError` being raised.
 
+Non-Admin Database Usage
+========================
 
-Next Step
----------
+Use a Snapshot to Read / Query the Database
+-------------------------------------------
 
-Next, learn about :doc:`session-crud-usage`.
+A snapshot represents a read-only point-in-time view of the database.
+
+Calling :meth:`~google.cloud.spanner.database.Database.snapshot` with
+no arguments creates a snapshot with strong concurrency:
+
+.. code:: python
+
+   with database.snapshot() as snapshot:
+       do_something_with(snapshot)
+
+See :class:`~google.cloud.spanner.snapshot.Snapshot` for the other options
+which can be passed.
+
+.. note::
+
+   :meth:`~google.cloud.spanner.database.Database.snapshot` returns an
+   object intended to be used as a Python context manager (i.e., as the
+   target of a ``with`` statement).  Use the instance, and any result
+   sets returned by its ``read`` or ``execute_sql`` methods, only inside
+   the block created by the ``with`` statement.
+
+See :doc:`snapshot-usage` for more complete examples of snapshot usage.
+
+Use a Batch to Modify Rows in the Database
+------------------------------------------
+
+A batch represents a bundled set of insert/upsert/update/delete operations
+on the rows of tables in the database.
+
+.. code:: python
+
+   with database.batch() as batch:
+        batch.insert_or_update(table, columns, rows)
+        batch.delete(table, keyset_to_delete)
+
+.. note::
+
+   :meth:`~google.cloud.spanner.database.Database.batch` returns an
+   object intended to be used as a Python context manager (i.e., as the
+   target of a ``with`` statement).  It applies any changes made inside
+   the block of its ``with`` statement when exiting the block, unless an
+   exception is raised within the block.  Use the batch only inside
+   the block created by the ``with`` statement.
+
+See :doc:`batch-usage` for more complete examples of batch usage.
+
+Use a Transaction to Query / Modify Rows in the Database
+--------------------------------------------------------
+
+A transaction represents the union of a "strong" snapshot and a batch:
+it allows ``read`` and ``execute_sql`` operations, and accumulates
+insert/upsert/update/delete operations.
+
+Because other applications may be performing concurrent updates which
+would invalidate the reads / queries, the work done by a transaction needs
+to be bundled as a retryable "unit of work" function, which takes the
+transaction as a required argument:
+
+.. code:: python
+
+   def unit_of_work(transaction):
+       result = transaction.execute_sql(QUERY)
+
+       for emp_id, hours, pay in _compute_pay(result):
+           transaction.insert_or_update(
+               table='monthly_hours',
+               columns=['employee_id', 'month', 'hours', 'pay'],
+               values=[emp_id, month_start, hours, pay])
+
+   database.run_in_transaction(unit_of_work)
+
+.. note::
+
+   :meth:`~google.cloud.spanner.database.Database.run_in_transaction`
+   commits the transaction automatically if the "unit of work" function
+   returns without raising an exception.
+
+.. note::
+
+   :meth:`~google.cloud.spanner.database.Database.run_in_transaction`
+   retries the "unit of work" function if the read / query operatoins
+   or the commit are aborted due to concurrent updates
+
+See :doc:`transaction-usage` for more complete examples of transaction usage.
+
+Configuring a session pool for a database
+-----------------------------------------
+
+Under the covers, the ``snapshot``, ``batch``, and ``run_in_transaction``
+methods use a pool of :class:`~google.cloud.spanner.session.Session` objects
+to manage their communication with the back-end.  You can configure
+one of the pools manually to control the number of sessions, timeouts, etc.,
+and then passing it to the :class:`~google.cloud.spanner.database.Database`
+constructor:
+
+.. code-block:: python
+
+   from google.cloud.spanner import Client
+   from google.cloud.spanner import FixedSizePool
+   client = Client()
+   instance = client.instance(INSTANCE_NAME)
+   pool = FixedSizePool(size=10, default_timeout=5)
+   database = instanc.database(DATABASE_NAME, pool=pool)
+
+Note that creating a database with a pool may presume that its database
+already exists, as it may need to pre-create sessions (rather than creating
+them on demand, as the default implementation does).
+
+You can supply your own pool implementation, which must satisfy the
+contract laid out in :class:`~google.cloud.spanner.pool.AbstractSessionPool`:
+
+.. code-block:: python
+
+   from google.cloud.pool import AbstractSessionPool
+
+   class MyCustomPool(AbstractSessionPool):
+
+        def __init__(self, database, custom_param):
+            super(MyCustomPool, self).__init__(database)
+            self.custom_param = custom_param
+
+        def get(self, read_only=False):
+            ...
+
+        def put(self, session, discard_if_full=True):
+            ...
+
+   database = instance.database(DATABASE_NAME, pool=pool)
+   pool = MyCustomPool(database, custom_param=42)
+
+See :doc:`advanced-session-pool-topics` for more advanced coverage of
+session pools.
diff --git a/docs/spanner/session-crud-usage.rst b/docs/spanner/session-crud-usage.rst
deleted file mode 100644
index e0734bee10665..0000000000000
--- a/docs/spanner/session-crud-usage.rst
+++ /dev/null
@@ -1,80 +0,0 @@
-Session Creation / Deletion
-===========================
-
-Outside of the admin APIs, all work with actual table data in a database
-occurs in the context of a session.
-
-
-Session Factory
----------------
-
-To create a :class:`~google.cloud.spanner.session.Session` object:
-
-.. code:: python
-
-    session = database.session()
-
-
-Create a new Session
---------------------
-
-After creating the session object, use its
-:meth:`~google.cloud.spanner.session.Session.create` method to
-trigger its creation on the server:
-
-.. code:: python
-
-    session.create()
-
-
-Test for the existence of a Session
------------------------------------
-
-After creating the session object, use its
-:meth:`~google.cloud.spanner.session.Session.exists` method to determine
-whether the session still exists on the server:
-
-.. code:: python
-
-    assert session.exists()
-
-
-Delete a Session
-----------------
-
-Once done with the session object, use its
-:meth:`~google.cloud.spanner.session.Session.delete` method to free up
-its resources on the server:
-
-.. code:: python
-
-    session.delete()
-
-
-Using a Session as a Context Manager
-------------------------------------
-
-Rather than calling the Session's
-:meth:`~google.cloud.spanner.session.Session.create` and
-:meth:`~google.cloud.spanner.session.Session.delete` methods directly,
-you can use the session as a Python context manager:
-
-.. code:: python
-
-    with database.session() as session:
-
-        assert session.exists()
-        # perform session operations here
-
-.. note::
-
-   At the beginning of the ``with`` block, the session's
-   :meth:`~google.cloud.spanner.session.Session.create` method is called.
-   At the end of the ``with`` block, the session's
-   :meth:`~google.cloud.spanner.session.Session.delete` method is called.
-
-
-Next Step
----------
-
-Next, learn about :doc:`session-implicit-txn-usage`.
diff --git a/docs/spanner/session-implicit-txn-usage.rst b/docs/spanner/session-implicit-txn-usage.rst
deleted file mode 100644
index 5c7d3025f5662..0000000000000
--- a/docs/spanner/session-implicit-txn-usage.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-Implicit Transactions
-#####################
-
-The following operations on a session to not require creating an explicit
-:class:`~google.cloud.spanner.snapshot.Snapshot` or
-:class:`~google.cloud.spanner.transaction.Transaction`.
-
-
-Read Table Data
----------------
-
-Read data for selected rows from a table in the session's database.  Calls
-the ``Read`` API, which returns all rows specified in ``key_set``, or else
-fails if the result set is too large,
-
-.. code:: python
-
-    result = session.read(
-        table='table-name', columns=['first_name', 'last_name', 'age'],
-        key_set=['phred@example.com', 'bharney@example.com'])
-
-    for row in result.rows:
-        print(row)
-
-.. note::
-
-   If streaming a chunk fails due to a "resumable" error,
-   :meth:`Session.read` retries the ``StreamingRead`` API reqeust,
-   passing the ``resume_token`` from the last partial result streamed.
-
-
-Execute a SQL Select Statement
-------------------------------
-
-Read data from a query against tables in the session's database.  Calls
-the ``ExecuteSql`` API, which returns all rows matching the query, or else
-fails if the result set is too large,
-
-.. code:: python
-
-    QUERY = (
-        'SELECT e.first_name, e.last_name, p.telephone '
-        'FROM employees as e, phones as p '
-        'WHERE p.employee_id == e.employee_id')
-    result = session.execute_sql(QUERY)
-
-    for row in result.rows:
-        print(row)
-
-
-Next Step
----------
-
-Next, learn about :doc:`batch-usage`.
diff --git a/docs/spanner/session-pool-usage.rst b/docs/spanner/session-pool-usage.rst
deleted file mode 100644
index 883bb6d720b2f..0000000000000
--- a/docs/spanner/session-pool-usage.rst
+++ /dev/null
@@ -1,198 +0,0 @@
-Session Pools
-#############
-
-In order to minimize the latency of session creation, you can set up a
-session pool on your database.  For instance, to use a pool which does *not*
-block when exhausted, and which pings each session at checkout:
-
-Configuring a session pool for a database
------------------------------------------
-
-.. code-block:: python
-
-   from google.cloud.spanner import Client
-   from google.cloud.spanner import FixedSizePool
-   client = Client()
-   instance = client.instance(INSTANCE_NAME)
-   database = instance.database(DATABASE_NAME)
-   pool = FixedSizePool(database, size=10, default_timeout=5)
-
-Note that creating the pool presumes that its database already exists, as
-it may need to pre-create sessions (rather than creating them on demand).
-
-You can supply your own pool implementation, which must satisfy the
-contract laid out in
-:class:`~google.cloud.spanner.session.AbstractSessionPool`:
-
-.. code-block:: python
-
-   from google.cloud.spanner import AbstractSessionPool
-
-   class MyCustomPool(AbstractSessionPool):
-
-        def __init__(self, database, custom_param):
-            super(MyCustomPool, self).__init__(database)
-            self.custom_param = custom_param
-
-        def get(self, read_only=False):
-            ...
-
-        def put(self, session, discard_if_full=True):
-            ...
-
-   database = instance.database(DATABASE_NAME, pool=pool)
-   pool = MyCustomPool(database, custom_param=42)
-
-
-Checking out sessions from the pool
------------------------------------
-
-No matter what kind of pool you create for the database, you can check out
-a session from the pool, rather than creating it manually.  The
-:meth:`~google.cloud.spanner.session.AbstractSessionPool.session` method
-returns an object designed to be used as a context manager, checking the
-session out from the pool and returning it automatically:
-
-.. code-block:: python
-
-    with pool.session() as session:
-
-        snapshot = session.snapshot()
-
-        result = snapshot.read(
-            table='table-name', columns=['first_name', 'last_name', 'age'],
-            key_set=['phred@example.com', 'bharney@example.com'])
-
-        for row in result.rows:
-            print(row)
-
-Some pool implementations may allow additional keyword arguments when checked
-out:
-
-.. code-block:: python
-
-    with pool.session(read_only=True) as session:
-
-        snapshot = session.snapshot()
-
-        result = snapshot.read(
-            table='table-name', columns=['first_name', 'last_name', 'age'],
-            key_set=['phred@example.com', 'bharney@example.com'])
-
-        for row in result.rows:
-            print(row)
-
-
-Lowering latency for read / query operations
---------------------------------------------
-
-Some applications may need to minimize latency for read operations, including
-particularly the overhead of making an API request to create or refresh a
-session.  :class:`~google.cloud.spanner.pool.PingingPool` is designed for such
-applications, which need to configure a background thread to do the work of
-keeping the sessions fresh.
-
-Create an instance of :class:`~google.cloud.spanner.pool.PingingPool`:
-
-.. code-block:: python
-
-   from google.cloud.spanner import Client
-   from google.cloud.spanner import PingingPool
-
-   client = Client()
-   instance = client.instance(INSTANCE_NAME)
-   pool = PingingPool(size=10, default_timeout=5, ping_interval=300)
-   database = instance.database(DATABASE_NAME, pool=pool)
-
-Set up a background thread to ping the pool's session, keeping them
-from becoming stale:
-
-.. code-block:: python
-
-   import threading
-
-   background = threading.Thread(target=pool.ping, name='ping-pool')
-   background.daemon = True
-   background.start()
-
-``database.execute_sql()`` is a shortcut, which checks out a session, creates a
-snapshot, and uses the snapshot to execute a query:
-
-.. code-block:: python
-
-   QUERY = """\
-   SELECT first_name, last_name, age FROM table-name
-   WHERE email in ["phred@example.com", "bharney@example.com"]
-   """
-   result = database.execute_sql(QUERY)
-
-   for row in result:
-       do_something_with(row)
-
-
-Lowering latency for mixed read-write operations
-------------------------------------------------
-
-Some applications may need to minimize latency for read write operations,
-including particularly the overhead of making an API request to create or
-refresh a session or to begin a session's transaction.
-:class:`~google.cloud.spanner.pool.TransactionPingingPool` is designed for
-such applications, which need to configure a background thread to do the work
-of keeping the sessions fresh and starting their transactions after use.
-
-Create an instance of
-:class:`~google.cloud.spanner.pool.TransactionPingingPool`:
-
-.. code-block:: python
-
-   from google.cloud.spanner import Client
-   from google.cloud.spanner import TransactionPingingPool
-
-   client = Client()
-   instance = client.instance(INSTANCE_NAME)
-   pool = TransactionPingingPool(size=10, default_timeout=5, ping_interval=300)
-   database = instance.database(DATABASE_NAME, pool=pool)
-
-Set up a background thread to ping the pool's session, keeping them
-from becoming stale, and ensuring that each session has a new transaction
-started before it is used:
-
-.. code-block:: python
-
-   import threading
-
-   background = threading.Thread(target=pool.ping, name='ping-pool')
-   background.daemon = True
-   background.start()
-
-``database.run_in_transaction()`` is a shortcut:  it checks out a session
-and uses it to perform a set of read and write operations inside the context
-of a transaction, retrying if aborted.  The application must supply a callback
-function,  which is passed a transaction (plus any additional parameters
-passed), and does its work using that transaction.
-
-.. code-block:: python
-
-   import datetime
-
-   QUERY = """\
-   SELECT employee_id, sum(hours) FROM daily_hours
-   WHERE start_date >= %s AND end_date < %s
-   GROUP BY employee_id id ORDER BY employee_id id"""
-
-   def unit_of_work(transaction, month_start, month_end):
-       """Compute rolled-up hours for a given month."""
-       query = QUERY % (month_start.isoformat(),
-              (month_end + datetime.timedelta(1)).isoformat())
-       row_iter = transaction.execute_sql(query)
-
-       for emp_id, hours, pay in _compute_pay(row_iter):
-           transaction.insert_or_update(
-               table='monthly_hours',
-               columns=['employee_id', 'month', 'hours', 'pay'],
-               values=[emp_id, month_start, hours, pay])
-
-   database.run_in_transaction(
-       unit_of_work,
-       month_start=datetime.date(2016, 12, 1),
-       month_end.date(2016, 12, 31))
diff --git a/docs/spanner/usage.rst b/docs/spanner/usage.rst
index 2d61fbaed9c7f..762ec3894b034 100644
--- a/docs/spanner/usage.rst
+++ b/docs/spanner/usage.rst
@@ -8,12 +8,10 @@ Spanner
   client-usage
   instance-usage
   database-usage
-  session-crud-usage
-  session-implicit-txn-usage
-  session-pool-usage
   batch-usage
   snapshot-usage
   transaction-usage
+  advanced-session-pool-topics
 
   client-api
   instance-api
diff --git a/spanner/google/cloud/spanner/database.py b/spanner/google/cloud/spanner/database.py
index 40dcc471d1c4e..728acadc61373 100644
--- a/spanner/google/cloud/spanner/database.py
+++ b/spanner/google/cloud/spanner/database.py
@@ -315,6 +315,36 @@ def session(self):
         """
         return Session(self)
 
+    def snapshot(self, **kw):
+        """Return an object which wraps a snapshot.
+
+        The wrapper *must* be used as a context manager, with the snapshot
+        as the value returned by the wrapper.
+
+        See
+        https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.TransactionOptions.ReadOnly
+
+        :type kw: dict
+        :param kw:
+            Passed through to
+            :class:`~google.cloud.spanner.snapshot.Snapshot` constructor.
+
+        :rtype: :class:`~google.cloud.spanner.database.SnapshotCheckout`
+        :returns: new wrapper
+        """
+        return SnapshotCheckout(self, **kw)
+
+    def batch(self):
+        """Return an object which wraps a batch.
+
+        The wrapper *must* be used as a context manager, with the batch
+        as the value returned by the wrapper.
+
+        :rtype: :class:`~google.cloud.spanner.database.BatchCheckout`
+        :returns: new wrapper
+        """
+        return BatchCheckout(self)
+
     def run_in_transaction(self, func, *args, **kw):
         """Perform a unit of work in a transaction, retrying on abort.
 
@@ -349,36 +379,6 @@ def run_in_transaction(self, func, *args, **kw):
         finally:
             self._local.transaction_running = False
 
-    def batch(self):
-        """Return an object which wraps a batch.
-
-        The wrapper *must* be used as a context manager, with the batch
-        as the value returned by the wrapper.
-
-        :rtype: :class:`~google.cloud.spanner.database.BatchCheckout`
-        :returns: new wrapper
-        """
-        return BatchCheckout(self)
-
-    def snapshot(self, **kw):
-        """Return an object which wraps a snapshot.
-
-        The wrapper *must* be used as a context manager, with the snapshot
-        as the value returned by the wrapper.
-
-        See
-        https://cloud.google.com/spanner/reference/rpc/google.spanner.v1#google.spanner.v1.TransactionOptions.ReadOnly
-
-        :type kw: dict
-        :param kw:
-            Passed through to
-            :class:`~google.cloud.spanner.snapshot.Snapshot` constructor.
-
-        :rtype: :class:`~google.cloud.spanner.database.SnapshotCheckout`
-        :returns: new wrapper
-        """
-        return SnapshotCheckout(self, **kw)
-
 
 class BatchCheckout(object):
     """Context manager for using a batch from a database.
diff --git a/spanner/tests/unit/test_database.py b/spanner/tests/unit/test_database.py
index c812176499dd2..851fec4a2175a 100644
--- a/spanner/tests/unit/test_database.py
+++ b/spanner/tests/unit/test_database.py
@@ -621,6 +621,55 @@ def test_session_factory(self):
         self.assertIs(session.session_id, None)
         self.assertIs(session._database, database)
 
+    def test_snapshot_defaults(self):
+        from google.cloud.spanner.database import SnapshotCheckout
+
+        client = _Client()
+        instance = _Instance(self.INSTANCE_NAME, client=client)
+        pool = _Pool()
+        session = _Session()
+        pool.put(session)
+        database = self._make_one(self.DATABASE_ID, instance, pool=pool)
+
+        checkout = database.snapshot()
+        self.assertIsInstance(checkout, SnapshotCheckout)
+        self.assertIs(checkout._database, database)
+        self.assertEqual(checkout._kw, {})
+
+    def test_snapshot_w_read_timestamp_and_multi_use(self):
+        import datetime
+        from google.cloud._helpers import UTC
+        from google.cloud.spanner.database import SnapshotCheckout
+
+        now = datetime.datetime.utcnow().replace(tzinfo=UTC)
+        client = _Client()
+        instance = _Instance(self.INSTANCE_NAME, client=client)
+        pool = _Pool()
+        session = _Session()
+        pool.put(session)
+        database = self._make_one(self.DATABASE_ID, instance, pool=pool)
+
+        checkout = database.snapshot(read_timestamp=now, multi_use=True)
+
+        self.assertIsInstance(checkout, SnapshotCheckout)
+        self.assertIs(checkout._database, database)
+        self.assertEqual(
+            checkout._kw, {'read_timestamp': now, 'multi_use': True})
+
+    def test_batch(self):
+        from google.cloud.spanner.database import BatchCheckout
+
+        client = _Client()
+        instance = _Instance(self.INSTANCE_NAME, client=client)
+        pool = _Pool()
+        session = _Session()
+        pool.put(session)
+        database = self._make_one(self.DATABASE_ID, instance, pool=pool)
+
+        checkout = database.batch()
+        self.assertIsInstance(checkout, BatchCheckout)
+        self.assertIs(checkout._database, database)
+
     def test_run_in_transaction_wo_args(self):
         import datetime
 
@@ -686,55 +735,6 @@ def nested_unit_of_work():
             database.run_in_transaction(nested_unit_of_work)
         self.assertEqual(inner.call_count, 0)
 
-    def test_batch(self):
-        from google.cloud.spanner.database import BatchCheckout
-
-        client = _Client()
-        instance = _Instance(self.INSTANCE_NAME, client=client)
-        pool = _Pool()
-        session = _Session()
-        pool.put(session)
-        database = self._make_one(self.DATABASE_ID, instance, pool=pool)
-
-        checkout = database.batch()
-        self.assertIsInstance(checkout, BatchCheckout)
-        self.assertIs(checkout._database, database)
-
-    def test_snapshot_defaults(self):
-        from google.cloud.spanner.database import SnapshotCheckout
-
-        client = _Client()
-        instance = _Instance(self.INSTANCE_NAME, client=client)
-        pool = _Pool()
-        session = _Session()
-        pool.put(session)
-        database = self._make_one(self.DATABASE_ID, instance, pool=pool)
-
-        checkout = database.snapshot()
-        self.assertIsInstance(checkout, SnapshotCheckout)
-        self.assertIs(checkout._database, database)
-        self.assertEqual(checkout._kw, {})
-
-    def test_snapshot_w_read_timestamp_and_multi_use(self):
-        import datetime
-        from google.cloud._helpers import UTC
-        from google.cloud.spanner.database import SnapshotCheckout
-
-        now = datetime.datetime.utcnow().replace(tzinfo=UTC)
-        client = _Client()
-        instance = _Instance(self.INSTANCE_NAME, client=client)
-        pool = _Pool()
-        session = _Session()
-        pool.put(session)
-        database = self._make_one(self.DATABASE_ID, instance, pool=pool)
-
-        checkout = database.snapshot(read_timestamp=now, multi_use=True)
-
-        self.assertIsInstance(checkout, SnapshotCheckout)
-        self.assertIs(checkout._database, database)
-        self.assertEqual(
-            checkout._kw, {'read_timestamp': now, 'multi_use': True})
-
 
 class TestBatchCheckout(_BaseTest):
 

From 09b0cb70e2f7a0b487ee7ac1913113932264a08c Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 11 Aug 2017 10:42:13 -0700
Subject: [PATCH 194/211] Make Datastore doctests use a namespace. (#3793)

---
 datastore/google/cloud/datastore/client.py    | 66 ++++++++------
 datastore/google/cloud/datastore/entity.py    | 28 +++---
 .../google/cloud/datastore/transaction.py     | 90 +++++++++++--------
 3 files changed, 104 insertions(+), 80 deletions(-)

diff --git a/datastore/google/cloud/datastore/client.py b/datastore/google/cloud/datastore/client.py
index 0ccef9f5f8f02..71144e1e3aa24 100644
--- a/datastore/google/cloud/datastore/client.py
+++ b/datastore/google/cloud/datastore/client.py
@@ -504,56 +504,64 @@ def query(self, **kwargs):
 
         .. testsetup:: query
 
-           from google.cloud import datastore
+            import os
+            import uuid
 
-           client = datastore.Client()
-           query = client.query(kind='_Doctest')
+            from google.cloud import datastore
 
-           def do_something(entity):
-               pass
+            unique = os.getenv('CIRCLE_BUILD_NUM', str(uuid.uuid4())[0:8])
+            client = datastore.Client(namespace='ns{}'.format(unique))
+            query = client.query(kind='_Doctest')
+
+            def do_something(entity):
+                pass
 
         .. doctest:: query
 
-           >>> query = client.query(kind='MyKind')
-           >>> query.add_filter('property', '=', 'val')
+            >>> query = client.query(kind='MyKind')
+            >>> query.add_filter('property', '=', 'val')
 
         Using the query iterator
 
         .. doctest:: query
 
-           >>> query_iter = query.fetch()
-           >>> for entity in query_iter:
-           ...     do_something(entity)
+            >>> query_iter = query.fetch()
+            >>> for entity in query_iter:
+            ...     do_something(entity)
 
         or manually page through results
 
         .. testsetup:: query-page
 
-           from google.cloud import datastore
-           from tests.system.test_system import Config  # system tests
+            import os
+            import uuid
+
+            from google.cloud import datastore
+            from tests.system.test_system import Config  # system tests
 
-           client = datastore.Client()
+            unique = os.getenv('CIRCLE_BUILD_NUM', str(uuid.uuid4())[0:8])
+            client = datastore.Client(namespace='ns{}'.format(unique))
 
-           key = client.key('_Doctest')
-           entity1 = datastore.Entity(key=key)
-           entity1['foo'] = 1337
-           entity2 = datastore.Entity(key=key)
-           entity2['foo'] = 42
-           Config.TO_DELETE.extend([entity1, entity2])
-           client.put_multi([entity1, entity2])
+            key = client.key('_Doctest')
+            entity1 = datastore.Entity(key=key)
+            entity1['foo'] = 1337
+            entity2 = datastore.Entity(key=key)
+            entity2['foo'] = 42
+            Config.TO_DELETE.extend([entity1, entity2])
+            client.put_multi([entity1, entity2])
 
-           query = client.query(kind='_Doctest')
-           cursor = None
+            query = client.query(kind='_Doctest')
+            cursor = None
 
         .. doctest:: query-page
 
-           >>> query_iter = query.fetch(start_cursor=cursor)
-           >>> pages = query_iter.pages
-           >>>
-           >>> first_page = next(pages)
-           >>> first_page_entities = list(first_page)
-           >>> query_iter.next_page_token
-           b'...'
+            >>> query_iter = query.fetch(start_cursor=cursor)
+            >>> pages = query_iter.pages
+            >>>
+            >>> first_page = next(pages)
+            >>> first_page_entities = list(first_page)
+            >>> query_iter.next_page_token
+            b'...'
 
         :type kwargs: dict
         :param kwargs: Parameters for initializing and instance of
diff --git a/datastore/google/cloud/datastore/entity.py b/datastore/google/cloud/datastore/entity.py
index be30aa9151728..bf3b99be20666 100644
--- a/datastore/google/cloud/datastore/entity.py
+++ b/datastore/google/cloud/datastore/entity.py
@@ -42,29 +42,33 @@ class Entity(dict):
 
     .. testsetup:: entity-ctor
 
-       from google.cloud import datastore
-       from tests.system.test_system import Config  # system tests
+        import os
+        import uuid
+
+        from google.cloud import datastore
+        from tests.system.test_system import Config  # system tests
 
-       client = datastore.Client()
-       key = client.key('EntityKind', 1234, namespace='_Doctest')
-       entity = datastore.Entity(key=key)
-       entity['property'] = 'value'
-       Config.TO_DELETE.append(entity)
+        unique = os.getenv('CIRCLE_BUILD_NUM', str(uuid.uuid4())[0:8])
+        client = datastore.Client(namespace='ns{}'.format(unique))
+        key = client.key('EntityKind', 1234, namespace='_Doctest')
+        entity = datastore.Entity(key=key)
+        entity['property'] = 'value'
+        Config.TO_DELETE.append(entity)
 
-       client.put(entity)
+        client.put(entity)
 
     .. doctest:: entity-ctor
 
-       >>> client.get(key)
-       <Entity('EntityKind', 1234) {'property': 'value'}>
+        >>> client.get(key)
+        <Entity('EntityKind', 1234) {'property': 'value'}>
 
     You can the set values on the entity just like you would on any
     other dictionary.
 
     .. doctest:: entity-ctor
 
-       >>> entity['age'] = 20
-       >>> entity['name'] = 'JJ'
+        >>> entity['age'] = 20
+        >>> entity['name'] = 'JJ'
 
     However, not all types are allowed as a value for a Google Cloud Datastore
     entity. The following basic types are supported by the API:
diff --git a/datastore/google/cloud/datastore/transaction.py b/datastore/google/cloud/datastore/transaction.py
index 6108bd80647a6..9b755f2210eb6 100644
--- a/datastore/google/cloud/datastore/transaction.py
+++ b/datastore/google/cloud/datastore/transaction.py
@@ -29,24 +29,28 @@ class Transaction(Batch):
 
     .. testsetup:: txn-put-multi, txn-api
 
-       from google.cloud import datastore
-       from tests.system.test_system import Config  # system tests
+        import os
+        import uuid
 
-       client = datastore.Client()
-       key1 = client.key('_Doctest')
-       entity1 = datastore.Entity(key=key1)
-       entity1['foo'] = 1337
+        from google.cloud import datastore
+        from tests.system.test_system import Config  # system tests
 
-       key2 = client.key('_Doctest', 'abcd1234')
-       entity2 = datastore.Entity(key=key2)
-       entity2['foo'] = 42
+        unique = os.getenv('CIRCLE_BUILD_NUM', str(uuid.uuid4())[0:8])
+        client = datastore.Client(namespace='ns{}'.format(unique))
+        key1 = client.key('_Doctest')
+        entity1 = datastore.Entity(key=key1)
+        entity1['foo'] = 1337
 
-       Config.TO_DELETE.extend([entity1, entity2])
+        key2 = client.key('_Doctest', 'abcd1234')
+        entity2 = datastore.Entity(key=key2)
+        entity2['foo'] = 42
+
+        Config.TO_DELETE.extend([entity1, entity2])
 
     .. doctest:: txn-put-multi
 
-       >>> with client.transaction():
-       ...     client.put_multi([entity1, entity2])
+        >>> with client.transaction():
+        ...     client.put_multi([entity1, entity2])
 
     Because it derives from :class:`~google.cloud.datastore.batch.Batch`,
     :class:`Transaction` also provides :meth:`put` and :meth:`delete` methods:
@@ -62,51 +66,59 @@ class Transaction(Batch):
 
     .. testsetup:: txn-error
 
-       from google.cloud import datastore
+        import os
+        import uuid
+
+        from google.cloud import datastore
 
-       client = datastore.Client()
+        unique = os.getenv('CIRCLE_BUILD_NUM', str(uuid.uuid4())[0:8])
+        client = datastore.Client(namespace='ns{}'.format(unique))
 
-       def do_some_work():
-           return
+        def do_some_work():
+            return
 
-       class SomeException(Exception):
-           pass
+        class SomeException(Exception):
+            pass
 
     .. doctest:: txn-error
 
-       >>> with client.transaction():
-       ...     do_some_work()
-       ...     raise SomeException  # rolls back
-       Traceback (most recent call last):
-         ...
-       SomeException
+        >>> with client.transaction():
+        ...     do_some_work()
+        ...     raise SomeException  # rolls back
+        Traceback (most recent call last):
+          ...
+        SomeException
 
     If the transaction block exits without an exception, it will commit
     by default.
 
     .. warning::
 
-       Inside a transaction, automatically assigned IDs for
-       entities will not be available at save time!  That means, if you
-       try:
+        Inside a transaction, automatically assigned IDs for
+        entities will not be available at save time!  That means, if you
+        try:
+
+        .. testsetup:: txn-entity-key, txn-entity-key-after, txn-manual
 
-       .. testsetup:: txn-entity-key, txn-entity-key-after, txn-manual
+            import os
+            import uuid
 
-          from google.cloud import datastore
-          from tests.system.test_system import Config  # system tests
+            from google.cloud import datastore
+            from tests.system.test_system import Config  # system tests
 
-          client = datastore.Client()
+            unique = os.getenv('CIRCLE_BUILD_NUM', str(uuid.uuid4())[0:8])
+            client = datastore.Client(namespace='ns{}'.format(unique))
 
-          def Entity(*args, **kwargs):
-              entity = datastore.Entity(*args, **kwargs)
-              Config.TO_DELETE.append(entity)
-              return entity
+            def Entity(*args, **kwargs):
+                entity = datastore.Entity(*args, **kwargs)
+                Config.TO_DELETE.append(entity)
+                return entity
 
-       .. doctest:: txn-entity-key
+        .. doctest:: txn-entity-key
 
-          >>> with client.transaction():
-          ...     entity = Entity(key=client.key('Thing'))
-          ...     client.put(entity)
+            >>> with client.transaction():
+            ...     entity = Entity(key=client.key('Thing'))
+            ...     client.put(entity)
 
        ``entity`` won't have a complete key until the transaction is
        committed.

From ba4e8c8502e6de0de23734cf8a8a58ce54b3b4fa Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 11 Aug 2017 11:12:13 -0700
Subject: [PATCH 195/211] Accurately document system test permissions. (#3795)

---
 CONTRIBUTING.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 25c449a2bad56..94c2e657f11b5 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -206,8 +206,12 @@ Running System Tests
     can be downloaded directly from the developer's console by clicking
     "Generate new JSON key". See private key
     `docs <https://cloud.google.com/storage/docs/authentication#generating-a-private-key>`__
-    for more details. In order for Logging system tests to work, the Service Account
-    will also have to be made a project Owner. This can be changed under "IAM & Admin".
+    for more details.
+
+  - In order for Logging system tests to work, the Service Account
+    will also have to be made a project ``Owner``. This can be changed under
+    "IAM & Admin". Additionally, ``cloud-logs@google.com`` must be given
+    ``Editor`` permissions on the project.
 
 - Examples of these can be found in ``system_tests/local_test_setup.sample``. We
   recommend copying this to ``system_tests/local_test_setup``, editing the

From c33e9d4087d78481fa412c3d6038b748382497b2 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 11 Aug 2017 12:55:59 -0700
Subject: [PATCH 196/211] Make unsigned credentials error DRY. (#3794)

---
 storage/google/cloud/storage/_signing.py | 27 ++++++++++++++++--------
 storage/google/cloud/storage/bucket.py   | 13 ++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/storage/google/cloud/storage/_signing.py b/storage/google/cloud/storage/_signing.py
index 58e62ac1502dc..ba602133ea2f9 100644
--- a/storage/google/cloud/storage/_signing.py
+++ b/storage/google/cloud/storage/_signing.py
@@ -25,6 +25,23 @@
 NOW = datetime.datetime.utcnow  # To be replaced by tests.
 
 
+def ensure_signed_credentials(credentials):
+    """Raise AttributeError if the credentials are unsigned.
+
+    :type credentials: :class:`google.auth.credentials.Signer`
+    :param credentials: The credentials used to create a private key
+                        for signing text.
+    """
+    if not isinstance(credentials, google.auth.credentials.Signing):
+        auth_uri = ('https://google-cloud-python.readthedocs.io/en/latest/'
+                    'core/auth.html?highlight=authentication#setting-up-'
+                    'a-service-account')
+        raise AttributeError('you need a private key to sign credentials.'
+                             'the credentials you are currently using %s '
+                             'just contains a token. see %s for more '
+                             'details.' % (type(credentials), auth_uri))
+
+
 def get_signed_query_params(credentials, expiration, string_to_sign):
     """Gets query parameters for creating a signed URL.
 
@@ -44,15 +61,7 @@ def get_signed_query_params(credentials, expiration, string_to_sign):
     :returns: Query parameters matching the signing credentials with a
               signed payload.
     """
-    if not isinstance(credentials, google.auth.credentials.Signing):
-        auth_uri = ('https://google-cloud-python.readthedocs.io/en/latest/'
-                    'core/auth.html?highlight=authentication#setting-up-'
-                    'a-service-account')
-        raise AttributeError('you need a private key to sign credentials.'
-                             'the credentials you are currently using %s '
-                             'just contains a token. see %s for more '
-                             'details.' % (type(credentials), auth_uri))
-
+    ensure_signed_credentials(credentials)
     signature_bytes = credentials.sign_bytes(string_to_sign)
     signature = base64.b64encode(signature_bytes)
     service_account_name = credentials.signer_email
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index f1b50841aba23..e5d0e4f5072e7 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -19,7 +19,6 @@
 import datetime
 import json
 
-import google.auth.credentials
 import six
 
 from google.api.core import page_iterator
@@ -28,6 +27,7 @@
 from google.cloud._helpers import _rfc3339_to_datetime
 from google.cloud.exceptions import NotFound
 from google.cloud.iam import Policy
+from google.cloud.storage import _signing
 from google.cloud.storage._helpers import _PropertyMixin
 from google.cloud.storage._helpers import _scalar_property
 from google.cloud.storage._helpers import _validate_name
@@ -1112,16 +1112,7 @@ def generate_upload_policy(
         """
         client = self._require_client(client)
         credentials = client._base_connection.credentials
-
-        if not isinstance(credentials, google.auth.credentials.Signing):
-            auth_uri = ('https://google-cloud-python.readthedocs.io/en/latest/'
-                        'core/auth.html?highlight=authentication#setting-up-'
-                        'a-service-account')
-            raise AttributeError(
-                'you need a private key to sign credentials.'
-                'the credentials you are currently using %s '
-                'just contains a token. see %s for more '
-                'details.' % (type(credentials), auth_uri))
+        _signing.ensure_signed_credentials(credentials)
 
         if expiration is None:
             expiration = _NOW() + datetime.timedelta(hours=1)

From cd3a05d1d6f27daf1dedf2425310e9f60dbd06b4 Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 11 Aug 2017 16:43:30 -0700
Subject: [PATCH 197/211] Fix Spanner README. (#3796)

---
 spanner/README.rst | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/spanner/README.rst b/spanner/README.rst
index 109b9289923ab..7626cbe7696e6 100644
--- a/spanner/README.rst
+++ b/spanner/README.rst
@@ -57,20 +57,27 @@ as a callback to ``database.run_in_transaction``:
         # The use of @parameters is recommended rather than doing your
         # own string interpolation; this provides protections against
         # SQL injection attacks.
-        query = """UPDATE people
-            SET anniversary = @uxts
+        query = """SELECT anniversary FROM people
             WHERE id = @person_id"""
 
         # When executing the SQL statement, the query and parameters are sent
         # as separate arguments. When using parameters, you must specify
         # both the parameters themselves and their types.
-        transaction.execute_sql(
+        row = transaction.execute_sql(
             query=query,
-            params={'person_id': person_id, 'uxts': unix_timestamp},
+            params={'person_id': person_id},
             param_types={
                 'person_id': types.INT64_PARAM_TYPE,
-                'uxts': types.INT64_PARAM_TYPE,
             },
+        ).one()
+
+        # Now perform an update on the data.
+        old_anniversary = row[0]
+        new_anniversary = _compute_anniversary(old_anniversary, years)
+        transaction.update(
+            'people',
+            ['person_id', 'anniversary'],
+            [person_id, new_anniversary],
         )
 
     # Actually run the `update_anniversary` function in a transaction.
@@ -140,4 +147,4 @@ Learn More
 See the ``google-cloud-python`` API `Cloud Spanner documentation`_ to learn how
 to connect to Cloud Spanner using this Client Library.
 
-.. _Cloud Spanner documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/bigquery/usage.html
+.. _Cloud Spanner documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/spanner/usage.html

From 0723a9cb802a08c828af83049c80b68036fcfc3c Mon Sep 17 00:00:00 2001
From: Alan Yee <alyee@ucsd.edu>
Date: Mon, 14 Aug 2017 07:26:06 -0700
Subject: [PATCH 198/211] Update README.rst (#3805)

-Clarifying what is a bucket id
-Minor url cleanups
---
 storage/README.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/storage/README.rst b/storage/README.rst
index 40e9e2edf5a96..2d8a2aa596ea1 100644
--- a/storage/README.rst
+++ b/storage/README.rst
@@ -55,6 +55,7 @@ how to create a bucket.
 
     from google.cloud import storage
     client = storage.Client()
+    # https://console.cloud.google.com/storage/browser/[bucket-id]/
     bucket = client.get_bucket('bucket-id-here')
     # Then do other things...
     blob = bucket.get_blob('remote/path/to/file.txt')
@@ -64,6 +65,6 @@ how to create a bucket.
     blob2.upload_from_filename(filename='/local/path.txt')
 
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-storage.svg
-   :target: https://pypi.org/project/google-cloud-storage/
+   :target: https://pypi.org/project/google-cloud-storage
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-storage.svg
-   :target: https://pypi.org/project/google-cloud-storage/
+   :target: https://pypi.org/project/google-cloud-storage

From 3facccbe85885ab13147da7120a35720494297f9 Mon Sep 17 00:00:00 2001
From: Alan Yee <alyee@ucsd.edu>
Date: Tue, 15 Aug 2017 11:43:41 -0700
Subject: [PATCH 199/211] Update reference to bytes signing issue in blob.py
 (#3816)

---
 storage/google/cloud/storage/blob.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
index dd76def82ba78..d2784d6e9ad6f 100644
--- a/storage/google/cloud/storage/blob.py
+++ b/storage/google/cloud/storage/blob.py
@@ -241,12 +241,12 @@ def generate_signed_url(self, expiration, method='GET',
         .. note::
 
             If you are on Google Compute Engine, you can't generate a signed
-            URL. Follow `Issue 922`_ for updates on this. If you'd like to
+            URL. Follow `Issue 50`_ for updates on this. If you'd like to
             be able to generate a signed URL from GCE, you can use a standard
             service account from a JSON file rather than a GCE service account.
 
-        .. _Issue 922: https://github.com/GoogleCloudPlatform/\
-                       google-cloud-python/issues/922
+        .. _Issue 50: https://github.com/GoogleCloudPlatform/\
+                      google-auth-library-python/issues/50
 
         If you have a blob that you want to allow access to for a set
         amount of time, you can use this method to generate a URL that

From 75f0a0963e23bab5114d88029e19c9c7ac58f988 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Wed, 16 Aug 2017 10:30:26 -0700
Subject: [PATCH 200/211] Fix doc build by swapping install order (#3828)

---
 nox.py                                 | 8 ++++----
 storage/google/cloud/storage/bucket.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nox.py b/nox.py
index 664ab65992ac0..4bd4fae6be552 100644
--- a/nox.py
+++ b/nox.py
@@ -30,13 +30,13 @@ def docs(session):
     # Install Sphinx and also all of the google-cloud-* packages.
     session.chdir(os.path.realpath(os.path.dirname(__file__)))
     session.install('Sphinx >= 1.6.2', 'sphinx_rtd_theme')
+    session.install('.')
     session.install(
-        'core/', 'bigquery/', 'bigtable/', 'datastore/', 'dns/', 'language/',
-        'logging/', 'error_reporting/', 'monitoring/', 'pubsub/',
+        'core/', 'storage/', 'bigquery/', 'bigtable/', 'datastore/', 'dns/',
+        'language/', 'logging/', 'error_reporting/', 'monitoring/', 'pubsub/',
         'resource_manager/', 'runtimeconfig/', 'spanner/', 'speech/',
-        'storage/', 'trace/', 'translate/', 'vision/',
+        'trace/', 'translate/', 'vision/',
     )
-    session.install('.')
 
     # Build the docs!
     session.run('bash', './test_utils/scripts/update_docs.sh')
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index e5d0e4f5072e7..88ac69566e461 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -43,7 +43,7 @@ def _blobs_page_start(iterator, page, response):
     :type iterator: :class:`~google.api.core.page_iterator.Iterator`
     :param iterator: The iterator that is currently in use.
 
-    :type page: :class:`~google.cloud.iterator.Page`
+    :type page: :class:`~google.cloud.api.core.page_iterator.Page`
     :param page: The page that was just created.
 
     :type response: dict

From d7b625cae8976d5355a7e67928a82ea491464f4c Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Wed, 16 Aug 2017 11:09:12 -0700
Subject: [PATCH 201/211] Add google.api.core.retry with base retry
 functionality (#3819)

Add google.api.core.retry with base retry functionality

Additionally:
* Add google.api.core.exceptions.RetryError
* Add google.api.core.helpers package
* Add google.api.core.helpers.datetime_helpers module
---
 core/google/api/core/exceptions.py            |  23 +++
 core/google/api/core/helpers/__init__.py      |   0
 .../api/core/helpers/datetime_helpers.py      |  22 +++
 core/google/api/core/retry.py                 | 148 ++++++++++++++++++
 core/tests/unit/api_core/helpers/__init__.py  |   0
 .../api_core/helpers/test_datetime_helpers.py |  22 +++
 core/tests/unit/api_core/test_retry.py        | 129 +++++++++++++++
 7 files changed, 344 insertions(+)
 create mode 100644 core/google/api/core/helpers/__init__.py
 create mode 100644 core/google/api/core/helpers/datetime_helpers.py
 create mode 100644 core/google/api/core/retry.py
 create mode 100644 core/tests/unit/api_core/helpers/__init__.py
 create mode 100644 core/tests/unit/api_core/helpers/test_datetime_helpers.py
 create mode 100644 core/tests/unit/api_core/test_retry.py

diff --git a/core/google/api/core/exceptions.py b/core/google/api/core/exceptions.py
index c25816abce341..38e30718fe832 100644
--- a/core/google/api/core/exceptions.py
+++ b/core/google/api/core/exceptions.py
@@ -40,6 +40,29 @@ class GoogleAPIError(Exception):
     pass
 
 
+@six.python_2_unicode_compatible
+class RetryError(GoogleAPIError):
+    """Raised when a function has exhausted all of its available retries.
+
+    Args:
+        message (str): The exception message.
+        cause (Exception): The last exception raised when retring the
+            function.
+    """
+    def __init__(self, message, cause):
+        super(RetryError, self).__init__(message)
+        self.message = message
+        self._cause = cause
+
+    @property
+    def cause(self):
+        """The last exception raised when retrying the function."""
+        return self._cause
+
+    def __str__(self):
+        return '{}, last exception: {}'.format(self.message, self.cause)
+
+
 class _GoogleAPICallErrorMeta(type):
     """Metaclass for registering GoogleAPICallError subclasses."""
     def __new__(mcs, name, bases, class_dict):
diff --git a/core/google/api/core/helpers/__init__.py b/core/google/api/core/helpers/__init__.py
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/core/google/api/core/helpers/datetime_helpers.py b/core/google/api/core/helpers/datetime_helpers.py
new file mode 100644
index 0000000000000..cfc817bc16faf
--- /dev/null
+++ b/core/google/api/core/helpers/datetime_helpers.py
@@ -0,0 +1,22 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Helpers for :mod:`datetime`."""
+
+import datetime
+
+
+def utcnow():
+    """A :meth:`datetime.datetime.utcnow()` alias to allow mocking in tests."""
+    return datetime.datetime.utcnow()
diff --git a/core/google/api/core/retry.py b/core/google/api/core/retry.py
new file mode 100644
index 0000000000000..b5a550faa584d
--- /dev/null
+++ b/core/google/api/core/retry.py
@@ -0,0 +1,148 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Helpers for retrying functions with exponential back-off."""
+
+import datetime
+import logging
+import random
+import time
+
+import six
+
+from google.api.core import exceptions
+from google.api.core.helpers import datetime_helpers
+
+_LOGGER = logging.getLogger(__name__)
+_DEFAULT_MAX_JITTER = 0.2
+
+
+def if_exception_type(*exception_types):
+    """Creates a predicate to check if the exception is of a given type.
+
+    Args:
+        exception_types (Sequence[type]): The exception types to check for.
+
+    Returns:
+        Callable[Exception]: A predicate that returns True if the provided
+            exception is of the given type(s).
+    """
+    def inner(exception):
+        """Bound predicate for checking an exception type."""
+        return isinstance(exception, exception_types)
+    return inner
+
+
+# pylint: disable=invalid-name
+# Pylint sees this as a constant, but it is also an alias that should be
+# considered a function.
+if_transient_error = if_exception_type((
+    exceptions.InternalServerError,
+    exceptions.TooManyRequests))
+"""A predicate that checks if an exception is a transient API error.
+
+The following server errors are considered transient:
+
+- :class:`google.api.core.exceptions.InternalServerError` - HTTP 500, gRPC
+    ``INTERNAL(13)`` and its subclasses.
+- :class:`google.api.core.exceptions.TooManyRequests` - HTTP 429
+- :class:`google.api.core.exceptions.ResourceExhausted` - gRPC
+    ``RESOURCE_EXHAUSTED(8)``
+"""
+# pylint: enable=invalid-name
+
+
+def exponential_sleep_generator(
+        initial, maximum, multiplier=2, jitter=_DEFAULT_MAX_JITTER):
+    """Generates sleep intervals based on the exponential back-off algorithm.
+
+    This implements the `Truncated Exponential Back-off`_ algorithm.
+
+    .. _Truncated Exponential Back-off:
+        https://cloud.google.com/storage/docs/exponential-backoff
+
+    Args:
+        initial (float): The minimum about of time to delay. This must
+            be greater than 0.
+        maximum (float): The maximum about of time to delay.
+        multiplier (float): The multiplier applied to the delay.
+        jitter (float): The maximum about of randomness to apply to the delay.
+
+    Yields:
+        float: successive sleep intervals.
+    """
+    delay = initial
+    while True:
+        yield delay
+        delay = min(
+            delay * multiplier + random.uniform(0, jitter), maximum)
+
+
+def retry_target(target, predicate, sleep_generator, deadline):
+    """Call a function and retry if it fails.
+
+    This is the lowest-level retry helper. Generally, you'll use the
+    higher-level retry helper :class:`Retry`.
+
+    Args:
+        target(Callable): The function to call and retry. This must be a
+            nullary function - apply arguments with `functools.partial`.
+        predicate (Callable[Exception]): A callable used to determine if an
+            exception raised by the target should be considered retryable.
+            It should return True to retry or False otherwise.
+        sleep_generator (Iterator[float]): An infinite iterator that determines
+            how long to sleep between retries.
+        deadline (float): How long to keep retrying the target.
+
+    Returns:
+        Any: the return value of the target function.
+
+    Raises:
+        google.api.core.RetryError: If the deadline is exceeded while retrying.
+        ValueError: If the sleep generator stops yielding values.
+        Exception: If the target raises a method that isn't retryable.
+    """
+    if deadline is not None:
+        deadline_datetime = (
+            datetime_helpers.utcnow() + datetime.timedelta(seconds=deadline))
+    else:
+        deadline_datetime = None
+
+    last_exc = None
+
+    for sleep in sleep_generator:
+        try:
+            return target()
+
+        # pylint: disable=broad-except
+        # This function explicitly must deal with broad exceptions.
+        except Exception as exc:
+            if not predicate(exc):
+                raise
+            last_exc = exc
+
+        now = datetime_helpers.utcnow()
+        if deadline_datetime is not None and deadline_datetime < now:
+            six.raise_from(
+                exceptions.RetryError(
+                    'Deadline of {:.1f}s exceeded while calling {}'.format(
+                        deadline, target),
+                    last_exc),
+                last_exc)
+
+        _LOGGER.debug('Retrying due to {}, sleeping {:.1f}s ...'.format(
+            last_exc, sleep))
+        time.sleep(sleep)
+
+    raise ValueError('Sleep generator stopped yielding sleep values.')
diff --git a/core/tests/unit/api_core/helpers/__init__.py b/core/tests/unit/api_core/helpers/__init__.py
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/core/tests/unit/api_core/helpers/test_datetime_helpers.py b/core/tests/unit/api_core/helpers/test_datetime_helpers.py
new file mode 100644
index 0000000000000..cf1db713b5fa3
--- /dev/null
+++ b/core/tests/unit/api_core/helpers/test_datetime_helpers.py
@@ -0,0 +1,22 @@
+# Copyright 2017, Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import datetime
+
+from google.api.core.helpers import datetime_helpers
+
+
+def test_utcnow():
+    result = datetime_helpers.utcnow()
+    assert isinstance(result, datetime.datetime)
diff --git a/core/tests/unit/api_core/test_retry.py b/core/tests/unit/api_core/test_retry.py
new file mode 100644
index 0000000000000..5ad5612482dc0
--- /dev/null
+++ b/core/tests/unit/api_core/test_retry.py
@@ -0,0 +1,129 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import datetime
+import itertools
+
+import mock
+import pytest
+
+from google.api.core import exceptions
+from google.api.core import retry
+
+
+def test_if_exception_type():
+    predicate = retry.if_exception_type(ValueError)
+
+    assert predicate(ValueError())
+    assert not predicate(TypeError())
+
+
+def test_if_exception_type_multiple():
+    predicate = retry.if_exception_type(ValueError, TypeError)
+
+    assert predicate(ValueError())
+    assert predicate(TypeError())
+    assert not predicate(RuntimeError())
+
+
+def test_if_transient_error():
+    assert retry.if_transient_error(exceptions.InternalServerError(''))
+    assert retry.if_transient_error(exceptions.TooManyRequests(''))
+    assert not retry.if_transient_error(exceptions.InvalidArgument(''))
+
+
+def test_exponential_sleep_generator_base_2():
+    gen = retry.exponential_sleep_generator(
+        1, 60, 2, jitter=0.0)
+
+    result = list(itertools.islice(gen, 8))
+    assert result == [1, 2, 4, 8, 16, 32, 60, 60]
+
+
+@mock.patch('random.uniform')
+def test_exponential_sleep_generator_jitter(uniform):
+    uniform.return_value = 1
+    gen = retry.exponential_sleep_generator(
+        1, 60, 2, jitter=2.2)
+
+    result = list(itertools.islice(gen, 7))
+    assert result == [1, 3, 7, 15, 31, 60, 60]
+    uniform.assert_called_with(0.0, 2.2)
+
+
+@mock.patch('time.sleep')
+@mock.patch(
+    'google.api.core.helpers.datetime_helpers.utcnow',
+    return_value=datetime.datetime.min)
+def test_retry_target_success(utcnow, sleep):
+    predicate = retry.if_exception_type(ValueError)
+    call_count = [0]
+
+    def target():
+        call_count[0] += 1
+        if call_count[0] < 3:
+            raise ValueError()
+        return 42
+
+    result = retry.retry_target(target, predicate, range(10), None)
+
+    assert result == 42
+    assert call_count[0] == 3
+    sleep.assert_has_calls([mock.call(0), mock.call(1)])
+
+
+@mock.patch('time.sleep')
+@mock.patch(
+    'google.api.core.helpers.datetime_helpers.utcnow',
+    return_value=datetime.datetime.min)
+def test_retry_target_non_retryable_error(utcnow, sleep):
+    predicate = retry.if_exception_type(ValueError)
+    exception = TypeError()
+    target = mock.Mock(side_effect=exception)
+
+    with pytest.raises(TypeError) as exc_info:
+        retry.retry_target(target, predicate, range(10), None)
+
+    assert exc_info.value == exception
+    sleep.assert_not_called()
+
+
+@mock.patch('time.sleep')
+@mock.patch(
+    'google.api.core.helpers.datetime_helpers.utcnow')
+def test_retry_target_deadline_exceeded(utcnow, sleep):
+    predicate = retry.if_exception_type(ValueError)
+    exception = ValueError('meep')
+    target = mock.Mock(side_effect=exception)
+    # Setup the timeline so that the first call takes 5 seconds but the second
+    # call takes 6, which puts the retry over the deadline.
+    utcnow.side_effect = [
+        # The first call to utcnow establishes the start of the timeline.
+        datetime.datetime.min,
+        datetime.datetime.min + datetime.timedelta(seconds=5),
+        datetime.datetime.min + datetime.timedelta(seconds=11)]
+
+    with pytest.raises(exceptions.RetryError) as exc_info:
+        retry.retry_target(target, predicate, range(10), deadline=10)
+
+    assert exc_info.value.cause == exception
+    assert exc_info.match('Deadline of 10.0s exceeded')
+    assert exc_info.match('last exception: meep')
+    assert target.call_count == 2
+
+
+def test_retry_target_bad_sleep_generator():
+    with pytest.raises(ValueError, match='Sleep generator'):
+        retry.retry_target(
+            mock.sentinel.target, mock.sentinel.predicate, [], None)

From 13cdb0c4e13c8ca637474ad9490a39bf6db408e8 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Wed, 16 Aug 2017 11:19:10 -0700
Subject: [PATCH 202/211] Dropping umbrella package from nox docs sessions.
 (#3829)

Follow up to #3828.
---
 docs/conf.py |  2 +-
 nox.py       | 23 ++++++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 86ee7d427928e..77055b522cc27 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -70,7 +70,7 @@
 # built documents.
 #
 # The short X.Y version.
-distro = pkg_resources.get_distribution('google-cloud')
+distro = pkg_resources.get_distribution('google-cloud-core')
 release = os.getenv('SPHINX_RELEASE', distro.version)
 
 # The language for content autogenerated by Sphinx. Refer to documentation
diff --git a/nox.py b/nox.py
index 4bd4fae6be552..b845db18f74f8 100644
--- a/nox.py
+++ b/nox.py
@@ -30,12 +30,25 @@ def docs(session):
     # Install Sphinx and also all of the google-cloud-* packages.
     session.chdir(os.path.realpath(os.path.dirname(__file__)))
     session.install('Sphinx >= 1.6.2', 'sphinx_rtd_theme')
-    session.install('.')
     session.install(
-        'core/', 'storage/', 'bigquery/', 'bigtable/', 'datastore/', 'dns/',
-        'language/', 'logging/', 'error_reporting/', 'monitoring/', 'pubsub/',
-        'resource_manager/', 'runtimeconfig/', 'spanner/', 'speech/',
-        'trace/', 'translate/', 'vision/',
+        'core/',
+        'storage/',
+        'bigquery/',
+        'bigtable/',
+        'datastore/',
+        'dns/',
+        'language/',
+        'logging/',
+        'error_reporting/',
+        'monitoring/',
+        'pubsub/',
+        'resource_manager/',
+        'runtimeconfig/',
+        'spanner/',
+        'speech/',
+        'trace/',
+        'translate/',
+        'vision/',
     )
 
     # Build the docs!

From 36304f7448677cff2f89558ef87c374e904a0492 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Thu, 17 Aug 2017 15:34:08 -0700
Subject: [PATCH 203/211] Add google.api.core.retry.Retry decorator (#3835)

* Add google.api.core.retry.Retry decorator
* Add futures dependency
* Change jitter algorithm
---
 core/google/api/core/retry.py          | 181 +++++++++++++++++++++++--
 core/setup.py                          |   5 +
 core/tests/unit/api_core/test_retry.py | 129 +++++++++++++++---
 3 files changed, 287 insertions(+), 28 deletions(-)

diff --git a/core/google/api/core/retry.py b/core/google/api/core/retry.py
index b5a550faa584d..fe85ce48cf1ba 100644
--- a/core/google/api/core/retry.py
+++ b/core/google/api/core/retry.py
@@ -12,9 +12,52 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Helpers for retrying functions with exponential back-off."""
+"""Helpers for retrying functions with exponential back-off.
+
+The :cls:`Retry` decorator can be used to retry functions that raise exceptions
+using exponential backoff. Because a exponential sleep algorithm is used,
+the retry is limited by a `deadline`. The deadline is the maxmimum amount of
+time a method can block. This is used instead of total number of retries
+because it is difficult to ascertain the amount of time a function can block
+when using total number of retries and exponential backoff.
+
+By default, this decorator will retry transient
+API errors (see :func:`if_transient_error`). For example:
+
+.. code-block:: python
+
+    @retry.Retry()
+    def call_flaky_rpc():
+        return client.flaky_rpc()
+
+    # Will retry flaky_rpc() if it raises transient API errors.
+    result = call_flaky_rpc()
+
+You can pass a custom predicate to retry on different exceptions, such as
+waiting for an eventually consistent item to be available:
+
+.. code-block:: python
+
+    @retry.Retry(predicate=if_exception_type(exceptions.NotFound))
+    def check_if_exists():
+        return client.does_thing_exist()
+
+    is_available = check_if_exists()
+
+Some client library methods apply retry automatically. These methods can accept
+a ``retry`` parameter that allows you to configure the behavior:
+
+.. code-block:: python
+
+    my_retry = retry.Retry(deadline=60)
+    result = client.some_method(retry=my_retry)
+
+"""
+
+from __future__ import unicode_literals
 
 import datetime
+import functools
 import logging
 import random
 import time
@@ -25,7 +68,10 @@
 from google.api.core.helpers import datetime_helpers
 
 _LOGGER = logging.getLogger(__name__)
-_DEFAULT_MAX_JITTER = 0.2
+_DEFAULT_INITIAL_DELAY = 1.0
+_DEFAULT_MAXIMUM_DELAY = 60.0
+_DEFAULT_DELAY_MULTIPLIER = 2.0
+_DEFAULT_DEADLINE = 60.0 * 2.0
 
 
 def if_exception_type(*exception_types):
@@ -38,10 +84,10 @@ def if_exception_type(*exception_types):
         Callable[Exception]: A predicate that returns True if the provided
             exception is of the given type(s).
     """
-    def inner(exception):
+    def if_exception_type_predicate(exception):
         """Bound predicate for checking an exception type."""
         return isinstance(exception, exception_types)
-    return inner
+    return if_exception_type_predicate
 
 
 # pylint: disable=invalid-name
@@ -64,7 +110,7 @@ def inner(exception):
 
 
 def exponential_sleep_generator(
-        initial, maximum, multiplier=2, jitter=_DEFAULT_MAX_JITTER):
+        initial, maximum, multiplier=_DEFAULT_DELAY_MULTIPLIER):
     """Generates sleep intervals based on the exponential back-off algorithm.
 
     This implements the `Truncated Exponential Back-off`_ algorithm.
@@ -77,16 +123,16 @@ def exponential_sleep_generator(
             be greater than 0.
         maximum (float): The maximum about of time to delay.
         multiplier (float): The multiplier applied to the delay.
-        jitter (float): The maximum about of randomness to apply to the delay.
 
     Yields:
         float: successive sleep intervals.
     """
     delay = initial
     while True:
-        yield delay
-        delay = min(
-            delay * multiplier + random.uniform(0, jitter), maximum)
+        # Introduce jitter by yielding a delay that is uniformly distributed
+        # to average out to the delay time.
+        yield min(random.uniform(0.0, delay * 2.0), maximum)
+        delay = delay * multiplier
 
 
 def retry_target(target, predicate, sleep_generator, deadline):
@@ -146,3 +192,120 @@ def retry_target(target, predicate, sleep_generator, deadline):
         time.sleep(sleep)
 
     raise ValueError('Sleep generator stopped yielding sleep values.')
+
+
+@six.python_2_unicode_compatible
+class Retry(object):
+    """Exponential retry decorator.
+
+    This class is a decorator used to add exponential back-off retry behavior
+    to an RPC call.
+
+    Although the default behavior is to retry transient API errors, a
+    different predicate can be provided to retry other exceptions.
+
+    Args:
+        predicate (Callable[Exception]): A callable that should return ``True``
+            if the given exception is retryable.
+        initial (float): The minimum about of time to delay in seconds. This
+            must be greater than 0.
+        maximum (float): The maximum about of time to delay in seconds.
+        multiplier (float): The multiplier applied to the delay.
+        deadline (float): How long to keep retrying in seconds.
+    """
+    def __init__(
+            self,
+            predicate=if_transient_error,
+            initial=_DEFAULT_INITIAL_DELAY,
+            maximum=_DEFAULT_MAXIMUM_DELAY,
+            multiplier=_DEFAULT_DELAY_MULTIPLIER,
+            deadline=_DEFAULT_DEADLINE):
+        self._predicate = predicate
+        self._initial = initial
+        self._multiplier = multiplier
+        self._maximum = maximum
+        self._deadline = deadline
+
+    def __call__(self, func):
+        """Wrap a callable with retry behavior.
+
+        Args:
+            func (Callable): The callable to add retry behavior to.
+
+        Returns:
+            Callable: A callable that will invoke ``func`` with retry
+                behavior.
+        """
+        @six.wraps(func)
+        def retry_wrapped_func(*args, **kwargs):
+            """A wrapper that calls target function with retry."""
+            target = functools.partial(func, *args, **kwargs)
+            sleep_generator = exponential_sleep_generator(
+                self._initial, self._maximum, multiplier=self._multiplier)
+            return retry_target(
+                target,
+                self._predicate,
+                sleep_generator,
+                self._deadline)
+
+        return retry_wrapped_func
+
+    def with_deadline(self, deadline):
+        """Return a copy of this retry with the given deadline.
+
+        Args:
+            deadline (float): How long to keep retrying.
+
+        Returns:
+            Retry: A new retry instance with the given deadline.
+        """
+        return Retry(
+            predicate=self._predicate,
+            initial=self._initial,
+            maximum=self._maximum,
+            multiplier=self._multiplier,
+            deadline=deadline)
+
+    def with_predicate(self, predicate):
+        """Return a copy of this retry with the given predicate.
+
+        Args:
+            predicate (Callable[Exception]): A callable that should return
+                ``True`` if the given exception is retryable.
+
+        Returns:
+            Retry: A new retry instance with the given predicate.
+        """
+        return Retry(
+            predicate=predicate,
+            initial=self._initial,
+            maximum=self._maximum,
+            multiplier=self._multiplier,
+            deadline=self._deadline)
+
+    def with_delay(
+            self, initial=None, maximum=None, multiplier=None):
+        """Return a copy of this retry with the given delay options.
+
+        Args:
+            initial (float): The minimum about of time to delay. This must
+                be greater than 0.
+            maximum (float): The maximum about of time to delay.
+            multiplier (float): The multiplier applied to the delay.
+
+        Returns:
+            Retry: A new retry instance with the given predicate.
+        """
+        return Retry(
+            predicate=self._predicate,
+            initial=initial if initial is not None else self._initial,
+            maximum=maximum if maximum is not None else self._maximum,
+            multiplier=multiplier if maximum is not None else self._multiplier,
+            deadline=self._deadline)
+
+    def __str__(self):
+        return (
+            '<Retry predicate={}, initial={:.1f}, maximum={:.1f}, '
+            'multiplier={:.1f}, deadline={:.1f}>'.format(
+                self._predicate, self._initial, self._maximum,
+                self._multiplier, self._deadline))
diff --git a/core/setup.py b/core/setup.py
index 96d7567b9de63..c45f7dd24ac21 100644
--- a/core/setup.py
+++ b/core/setup.py
@@ -60,6 +60,10 @@
     'tenacity >= 4.0.0, <5.0.0dev'
 ]
 
+EXTRAS_REQUIREMENTS = {
+    ':python_version<"3.2"': ['futures >= 3.0.0'],
+}
+
 setup(
     name='google-cloud-core',
     version='0.26.0',
@@ -72,5 +76,6 @@
     ],
     packages=find_packages(exclude=('tests*',)),
     install_requires=REQUIREMENTS,
+    extras_require=EXTRAS_REQUIREMENTS,
     **SETUP_BASE
 )
diff --git a/core/tests/unit/api_core/test_retry.py b/core/tests/unit/api_core/test_retry.py
index 5ad5612482dc0..71569137b94f6 100644
--- a/core/tests/unit/api_core/test_retry.py
+++ b/core/tests/unit/api_core/test_retry.py
@@ -14,6 +14,7 @@
 
 import datetime
 import itertools
+import re
 
 import mock
 import pytest
@@ -43,29 +44,22 @@ def test_if_transient_error():
     assert not retry.if_transient_error(exceptions.InvalidArgument(''))
 
 
-def test_exponential_sleep_generator_base_2():
+# Make uniform return half of its maximum, which will be the calculated
+# sleep time.
+@mock.patch('random.uniform', autospec=True, side_effect=lambda m, n: n/2.0)
+def test_exponential_sleep_generator_base_2(uniform):
     gen = retry.exponential_sleep_generator(
-        1, 60, 2, jitter=0.0)
+        1, 60, multiplier=2)
 
     result = list(itertools.islice(gen, 8))
     assert result == [1, 2, 4, 8, 16, 32, 60, 60]
 
 
-@mock.patch('random.uniform')
-def test_exponential_sleep_generator_jitter(uniform):
-    uniform.return_value = 1
-    gen = retry.exponential_sleep_generator(
-        1, 60, 2, jitter=2.2)
-
-    result = list(itertools.islice(gen, 7))
-    assert result == [1, 3, 7, 15, 31, 60, 60]
-    uniform.assert_called_with(0.0, 2.2)
-
-
-@mock.patch('time.sleep')
+@mock.patch('time.sleep', autospec=True)
 @mock.patch(
     'google.api.core.helpers.datetime_helpers.utcnow',
-    return_value=datetime.datetime.min)
+    return_value=datetime.datetime.min,
+    autospec=True)
 def test_retry_target_success(utcnow, sleep):
     predicate = retry.if_exception_type(ValueError)
     call_count = [0]
@@ -83,10 +77,11 @@ def target():
     sleep.assert_has_calls([mock.call(0), mock.call(1)])
 
 
-@mock.patch('time.sleep')
+@mock.patch('time.sleep', autospec=True)
 @mock.patch(
     'google.api.core.helpers.datetime_helpers.utcnow',
-    return_value=datetime.datetime.min)
+    return_value=datetime.datetime.min,
+    autospec=True)
 def test_retry_target_non_retryable_error(utcnow, sleep):
     predicate = retry.if_exception_type(ValueError)
     exception = TypeError()
@@ -99,9 +94,9 @@ def test_retry_target_non_retryable_error(utcnow, sleep):
     sleep.assert_not_called()
 
 
-@mock.patch('time.sleep')
+@mock.patch('time.sleep', autospec=True)
 @mock.patch(
-    'google.api.core.helpers.datetime_helpers.utcnow')
+    'google.api.core.helpers.datetime_helpers.utcnow', autospec=True)
 def test_retry_target_deadline_exceeded(utcnow, sleep):
     predicate = retry.if_exception_type(ValueError)
     exception = ValueError('meep')
@@ -127,3 +122,99 @@ def test_retry_target_bad_sleep_generator():
     with pytest.raises(ValueError, match='Sleep generator'):
         retry.retry_target(
             mock.sentinel.target, mock.sentinel.predicate, [], None)
+
+
+class TestRetry(object):
+    def test_constructor_defaults(self):
+        retry_ = retry.Retry()
+        assert retry_._predicate == retry.if_transient_error
+        assert retry_._initial == 1
+        assert retry_._maximum == 60
+        assert retry_._multiplier == 2
+        assert retry_._deadline == 120
+
+    def test_constructor_options(self):
+        retry_ = retry.Retry(
+            predicate=mock.sentinel.predicate,
+            initial=1,
+            maximum=2,
+            multiplier=3,
+            deadline=4)
+        assert retry_._predicate == mock.sentinel.predicate
+        assert retry_._initial == 1
+        assert retry_._maximum == 2
+        assert retry_._multiplier == 3
+        assert retry_._deadline == 4
+
+    def test_with_deadline(self):
+        retry_ = retry.Retry()
+        new_retry = retry_.with_deadline(42)
+        assert retry_ is not new_retry
+        assert new_retry._deadline == 42
+
+    def test_with_predicate(self):
+        retry_ = retry.Retry()
+        new_retry = retry_.with_predicate(mock.sentinel.predicate)
+        assert retry_ is not new_retry
+        assert new_retry._predicate == mock.sentinel.predicate
+
+    def test_with_delay_noop(self):
+        retry_ = retry.Retry()
+        new_retry = retry_.with_delay()
+        assert retry_ is not new_retry
+        assert new_retry._initial == retry_._initial
+        assert new_retry._maximum == retry_._maximum
+        assert new_retry._multiplier == retry_._multiplier
+
+    def test_with_delay(self):
+        retry_ = retry.Retry()
+        new_retry = retry_.with_delay(
+            initial=1, maximum=2, multiplier=3)
+        assert retry_ is not new_retry
+        assert new_retry._initial == 1
+        assert new_retry._maximum == 2
+        assert new_retry._multiplier == 3
+
+    def test___str__(self):
+        retry_ = retry.Retry()
+        assert re.match((
+            r'<Retry predicate=<function.*?if_exception_type.*?>, '
+            r'initial=1.0, maximum=60.0, multiplier=2.0, deadline=120.0>'),
+            str(retry_))
+
+    @mock.patch('time.sleep', autospec=True)
+    def test___call___and_execute_success(self, sleep):
+        retry_ = retry.Retry()
+        target = mock.Mock(spec=['__call__'], return_value=42)
+        # __name__ is needed by functools.partial.
+        target.__name__ = 'target'
+
+        decorated = retry_(target)
+        target.assert_not_called()
+
+        result = decorated('meep')
+
+        assert result == 42
+        target.assert_called_once_with('meep')
+        sleep.assert_not_called()
+
+    # Make uniform return half of its maximum, which will be the calculated
+    # sleep time.
+    @mock.patch(
+        'random.uniform', autospec=True, side_effect=lambda m, n: n/2.0)
+    @mock.patch('time.sleep', autospec=True)
+    def test___call___and_execute_retry(self, sleep, uniform):
+        retry_ = retry.Retry(predicate=retry.if_exception_type(ValueError))
+        target = mock.Mock(spec=['__call__'], side_effect=[ValueError(), 42])
+        # __name__ is needed by functools.partial.
+        target.__name__ = 'target'
+
+        decorated = retry_(target)
+        target.assert_not_called()
+
+        result = decorated('meep')
+
+        assert result == 42
+        assert target.call_count == 2
+        target.assert_has_calls([mock.call('meep'), mock.call('meep')])
+        sleep.assert_called_once_with(retry_._initial)

From fbda27c3e760989f23210fed1fb46ffd54a4d5d3 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Fri, 18 Aug 2017 09:01:30 -0700
Subject: [PATCH 204/211] Drop tenacity dependency; use google.api.core.retry
 in google.api.core.future (#3837)

---
 core/google/api/core/future/polling.py | 46 +++++++++++---------------
 core/setup.py                          |  1 -
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/core/google/api/core/future/polling.py b/core/google/api/core/future/polling.py
index 40380d6ad938d..9e3d07e7128f0 100644
--- a/core/google/api/core/future/polling.py
+++ b/core/google/api/core/future/polling.py
@@ -16,16 +16,18 @@
 
 import abc
 import concurrent.futures
-import functools
-import operator
-
-import six
-import tenacity
 
+from google.api.core import exceptions
+from google.api.core import retry
 from google.api.core.future import _helpers
 from google.api.core.future import base
 
 
+class _OperationNotComplete(Exception):
+    """Private exception used for polling via retry."""
+    pass
+
+
 class PollingFuture(base.Future):
     """A Future that needs to poll some service to check its status.
 
@@ -55,6 +57,11 @@ def done(self):
         # pylint: disable=redundant-returns-doc, missing-raises-doc
         raise NotImplementedError()
 
+    def _done_or_raise(self):
+        """Check if the future is done and raise if it's not."""
+        if not self.done():
+            raise _OperationNotComplete()
+
     def running(self):
         """True if the operation is currently running."""
         return not self.done()
@@ -69,29 +76,16 @@ def _blocking_poll(self, timeout=None):
         if self._result_set:
             return
 
-        retry_on = tenacity.retry_if_result(
-            functools.partial(operator.is_not, True))
-        # Use exponential backoff with jitter.
-        wait_on = (
-            tenacity.wait_exponential(multiplier=1, max=10) +
-            tenacity.wait_random(0, 1))
-
-        if timeout is None:
-            retry = tenacity.retry(retry=retry_on, wait=wait_on)
-        else:
-            retry = tenacity.retry(
-                retry=retry_on,
-                wait=wait_on,
-                stop=tenacity.stop_after_delay(timeout))
+        retry_ = retry.Retry(
+            predicate=retry.if_exception_type(_OperationNotComplete),
+            deadline=timeout)
 
         try:
-            retry(self.done)()
-        except tenacity.RetryError as exc:
-            six.raise_from(
-                concurrent.futures.TimeoutError(
-                    'Operation did not complete within the designated '
-                    'timeout.'),
-                exc)
+            retry_(self._done_or_raise)()
+        except exceptions.RetryError:
+            raise concurrent.futures.TimeoutError(
+                'Operation did not complete within the designated '
+                'timeout.')
 
     def result(self, timeout=None):
         """Get the result of the operation, blocking if necessary.
diff --git a/core/setup.py b/core/setup.py
index c45f7dd24ac21..6adacb0e6c1b2 100644
--- a/core/setup.py
+++ b/core/setup.py
@@ -57,7 +57,6 @@
     'requests >= 2.18.0, < 3.0.0dev',
     'setuptools >= 34.0.0',
     'six',
-    'tenacity >= 4.0.0, <5.0.0dev'
 ]
 
 EXTRAS_REQUIREMENTS = {

From df37095e1a9b2df6216f11e5ddb0d434abecae3c Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Fri, 18 Aug 2017 09:32:13 -0700
Subject: [PATCH 205/211] Fix documentation link. (#3825)

---
 bigquery/google/cloud/bigquery/dataset.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigquery/google/cloud/bigquery/dataset.py b/bigquery/google/cloud/bigquery/dataset.py
index d25f6747285f9..645a68deada48 100644
--- a/bigquery/google/cloud/bigquery/dataset.py
+++ b/bigquery/google/cloud/bigquery/dataset.py
@@ -536,7 +536,7 @@ def delete(self, client=None):
         """API call:  delete the dataset via a DELETE request.
 
         See
-        https://cloud.google.com/bigquery/docs/reference/rest/v2/tables/delete
+        https://cloud.google.com/bigquery/docs/reference/rest/v2/datasets/delete
 
         :type client: :class:`~google.cloud.bigquery.client.Client` or
                       ``NoneType``

From 813b53449e7d629afa2b0cec010d3d676b38d668 Mon Sep 17 00:00:00 2001
From: Jaeyeon Baek <oops.jybaek@gmail.com>
Date: Sat, 19 Aug 2017 02:04:53 +0900
Subject: [PATCH 206/211] Fix broken link in Speech README. (#3821)

---
 docs/speech/index.rst | 22 +++++++++-------------
 speech/README.rst     |  4 ++--
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/docs/speech/index.rst b/docs/speech/index.rst
index 9373e830cff37..bcec5b4d8536e 100644
--- a/docs/speech/index.rst
+++ b/docs/speech/index.rst
@@ -266,19 +266,15 @@ If ``interim_results`` is set to :data:`True`, interim results
     ...     requests = [speech.types.StreamingRecognizeRequest(
     ...         audio_content=stream.read(),
     ...     )]
-    >>> results = sample.streaming_recognize(
-    ...     config=speech.types.StreamingRecognitionConfig(
-    ...         config=config,
-    ...         iterim_results=True,
-    ...     ),
-    ...     requests,
-    ... )
-    >>> for result in results:
-    ...     for alternative in result.alternatives:
-    ...         print('=' * 20)
-    ...         print('transcript: ' + alternative.transcript)
-    ...         print('confidence: ' + str(alternative.confidence))
-    ...         print('is_final:' + str(result.is_final))
+    >>> config = speech.types.StreamingRecognitionConfig(config=config)
+    >>> responses = client.streaming_recognize(config,requests)
+    >>> for response in responses:
+    ...     for result in response:
+    ...         for alternative in result.alternatives:
+    ...             print('=' * 20)
+    ...             print('transcript: ' + alternative.transcript)
+    ...             print('confidence: ' + str(alternative.confidence))
+    ...             print('is_final:' + str(result.is_final))
     ====================
     'he'
     None
diff --git a/speech/README.rst b/speech/README.rst
index 21042f6053bf2..789cd3aabe936 100644
--- a/speech/README.rst
+++ b/speech/README.rst
@@ -9,7 +9,7 @@ Python Client for Google Cloud Speech
 
 -  `Documentation`_
 
-.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/speech/usage.html
+.. _Documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/speech/
 
 Quick Start
 -----------
@@ -41,7 +41,7 @@ and receive a text transcription from the Cloud Speech API service.
 See the ``google-cloud-python`` API `speech documentation`_ to learn how to
 connect to the Google Cloud Speech API using this Client Library.
 
-.. _speech documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/speech/usage.html
+.. _speech documentation: https://googlecloudplatform.github.io/google-cloud-python/latest/speech/
 .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-speech.svg
    :target: https://pypi.org/project/google-cloud-speech/
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-speech.svg

From 406ecad4719b3591427b1201ebb81b4d5968cd4e Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Fri, 18 Aug 2017 13:40:31 -0700
Subject: [PATCH 207/211] Add google.api.page_iterator.GRPCIterator (#3843)

---
 core/google/api/core/page_iterator.py         | 87 +++++++++++++++++++
 .../tests/unit/api_core/test_page_iterator.py | 84 ++++++++++++++++++
 2 files changed, 171 insertions(+)

diff --git a/core/google/api/core/page_iterator.py b/core/google/api/core/page_iterator.py
index 147c9f47e35ad..23c469f9bc1d9 100644
--- a/core/google/api/core/page_iterator.py
+++ b/core/google/api/core/page_iterator.py
@@ -423,3 +423,90 @@ def _next_page(self):
             return page
         except StopIteration:
             return None
+
+
+class GRPCIterator(Iterator):
+    """A generic class for iterating through gRPC list responses.
+
+    .. note:: The class does not take a ``page_token`` argument because it can
+        just be specified in the ``request``.
+
+    Args:
+        client (google.cloud.client.Client): The API client. This unused by
+            this class, but kept to satisfy the :class:`Iterator` interface.
+        method (Callable[protobuf.Message]): A bound gRPC method that should
+            take a single message for the request.
+        request (protobuf.Message): The request message.
+        items_field (str): The field in the response message that has the
+            items for the page.
+        item_to_value (Callable[Iterator, Any]): Callable to convert an item
+            from the type in the JSON response into a native object. Will
+            be called with the iterator and a single item.
+        request_token_field (str): The field in the request message used to
+            specify the page token.
+        response_token_field (str): The field in the response message that has
+            the token for the next page.
+        max_results (int): The maximum number of results to fetch.
+
+    .. autoattribute:: pages
+    """
+
+    _DEFAULT_REQUEST_TOKEN_FIELD = 'page_token'
+    _DEFAULT_RESPONSE_TOKEN_FIELD = 'next_page_token'
+
+    def __init__(
+            self,
+            client,
+            method,
+            request,
+            items_field,
+            item_to_value=_item_to_value_identity,
+            request_token_field=_DEFAULT_REQUEST_TOKEN_FIELD,
+            response_token_field=_DEFAULT_RESPONSE_TOKEN_FIELD,
+            max_results=None):
+        super(GRPCIterator, self).__init__(
+            client, item_to_value, max_results=max_results)
+        self._method = method
+        self._request = request
+        self._items_field = items_field
+        self._request_token_field = request_token_field
+        self._response_token_field = response_token_field
+
+    def _next_page(self):
+        """Get the next page in the iterator.
+
+        Returns:
+            Page: The next page in the iterator or :data:`None` if there are no
+                pages left.
+        """
+        if not self._has_next_page():
+            return None
+
+        if self.next_page_token is not None:
+            setattr(
+                self._request, self._request_token_field, self.next_page_token)
+
+        response = self._method(self._request)
+
+        self.next_page_token = getattr(response, self._response_token_field)
+        items = getattr(response, self._items_field)
+        page = Page(self, items, self._item_to_value)
+
+        return page
+
+    def _has_next_page(self):
+        """Determines whether or not there are more pages with results.
+
+        Returns:
+            bool: Whether the iterator has more pages.
+        """
+        if self.page_number == 0:
+            return True
+
+        if self.max_results is not None:
+            if self.num_results >= self.max_results:
+                return False
+
+        # Note: intentionally a falsy check instead of a None check. The RPC
+        # can return an empty string indicating no more pages.
+        return True if self.next_page_token else False
diff --git a/core/tests/unit/api_core/test_page_iterator.py b/core/tests/unit/api_core/test_page_iterator.py
index 82466579e37b4..541e60a61ffd0 100644
--- a/core/tests/unit/api_core/test_page_iterator.py
+++ b/core/tests/unit/api_core/test_page_iterator.py
@@ -408,6 +408,90 @@ def test__get_next_page_bad_http_method(self):
             iterator._get_next_page_response()
 
 
+class TestGRPCIterator(object):
+
+    def test_constructor(self):
+        client = mock.sentinel.client
+        items_field = 'items'
+        iterator = page_iterator.GRPCIterator(
+            client, mock.sentinel.method, mock.sentinel.request, items_field)
+
+        assert not iterator._started
+        assert iterator.client is client
+        assert iterator.max_results is None
+        assert iterator._method == mock.sentinel.method
+        assert iterator._request == mock.sentinel.request
+        assert iterator._items_field == items_field
+        assert iterator._item_to_value is page_iterator._item_to_value_identity
+        assert (iterator._request_token_field ==
+                page_iterator.GRPCIterator._DEFAULT_REQUEST_TOKEN_FIELD)
+        assert (iterator._response_token_field ==
+                page_iterator.GRPCIterator._DEFAULT_RESPONSE_TOKEN_FIELD)
+        # Changing attributes.
+        assert iterator.page_number == 0
+        assert iterator.next_page_token is None
+        assert iterator.num_results == 0
+
+    def test_constructor_options(self):
+        client = mock.sentinel.client
+        items_field = 'items'
+        request_field = 'request'
+        response_field = 'response'
+        iterator = page_iterator.GRPCIterator(
+            client, mock.sentinel.method, mock.sentinel.request, items_field,
+            item_to_value=mock.sentinel.item_to_value,
+            request_token_field=request_field,
+            response_token_field=response_field,
+            max_results=42)
+
+        assert iterator.client is client
+        assert iterator.max_results == 42
+        assert iterator._method == mock.sentinel.method
+        assert iterator._request == mock.sentinel.request
+        assert iterator._items_field == items_field
+        assert iterator._item_to_value is mock.sentinel.item_to_value
+        assert iterator._request_token_field == request_field
+        assert iterator._response_token_field == response_field
+
+    def test_iterate(self):
+        request = mock.Mock(spec=['page_token'], page_token=None)
+        response1 = mock.Mock(items=['a', 'b'], next_page_token='1')
+        response2 = mock.Mock(items=['c'], next_page_token='2')
+        response3 = mock.Mock(items=['d'], next_page_token='')
+        method = mock.Mock(side_effect=[response1, response2, response3])
+        iterator = page_iterator.GRPCIterator(
+            mock.sentinel.client, method, request, 'items')
+
+        assert iterator.num_results == 0
+
+        items = list(iterator)
+        assert items == ['a', 'b', 'c', 'd']
+
+        method.assert_called_with(request)
+        assert method.call_count == 3
+        assert request.page_token == '2'
+
+    def test_iterate_with_max_results(self):
+        request = mock.Mock(spec=['page_token'], page_token=None)
+        response1 = mock.Mock(items=['a', 'b'], next_page_token='1')
+        response2 = mock.Mock(items=['c'], next_page_token='2')
+        response3 = mock.Mock(items=['d'], next_page_token='')
+        method = mock.Mock(side_effect=[response1, response2, response3])
+        iterator = page_iterator.GRPCIterator(
+            mock.sentinel.client, method, request, 'items', max_results=3)
+
+        assert iterator.num_results == 0
+
+        items = list(iterator)
+
+        assert items == ['a', 'b', 'c']
+        assert iterator.num_results == 3
+
+        method.assert_called_with(request)
+        assert method.call_count == 2
+        assert request.page_token is '1'
+
+
 class GAXPageIterator(object):
     """Fake object that matches gax.PageIterator"""
     def __init__(self, pages, page_token=None):

From 7a8f5a934a1293413e3d382cb4cc0236e05bd97e Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Fri, 18 Aug 2017 14:37:32 -0700
Subject: [PATCH 208/211] BigQuery - add get_query_results method. (#3838)

This method calls the getQueryResults API directly and returns a
QueryResults object. Note: the response from this API does not include
the query, so I modified the constructor to make query optional in this
case.
---
 bigquery/google/cloud/bigquery/client.py | 35 +++++++++++++
 bigquery/google/cloud/bigquery/query.py  |  6 +++
 bigquery/tests/system.py                 |  7 +++
 bigquery/tests/unit/test_client.py       | 63 ++++++++++++++++++++++++
 4 files changed, 111 insertions(+)

diff --git a/bigquery/google/cloud/bigquery/client.py b/bigquery/google/cloud/bigquery/client.py
index d9ff17d717203..52c4622400979 100644
--- a/bigquery/google/cloud/bigquery/client.py
+++ b/bigquery/google/cloud/bigquery/client.py
@@ -162,6 +162,41 @@ def dataset(self, dataset_name, project=None):
         """
         return Dataset(dataset_name, client=self, project=project)
 
+    def get_query_results(self, job_id, project=None, timeout_ms=None):
+        """Get the query results object for a query job.
+
+        :type job_id: str
+        :param job_id: Name of the query job.
+
+        :type project: str
+        :param project:
+            (Optional) project ID for the query job (defaults to the project of
+            the client).
+
+        :type timeout_ms: int
+        :param timeout_ms:
+            (Optional) number of milliseconds the the API call should wait for
+            the query to complete before the request times out.
+
+        :rtype: :class:`google.cloud.bigquery.query.QueryResults`
+        :returns: a new ``QueryResults`` instance
+        """
+
+        extra_params = {'maxResults': 0}
+
+        if project is None:
+            project = self.project
+
+        if timeout_ms is not None:
+            extra_params['timeoutMs'] = timeout_ms
+
+        path = '/projects/{}/queries/{}'.format(project, job_id)
+
+        resource = self._connection.api_request(
+            method='GET', path=path, query_params=extra_params)
+
+        return QueryResults.from_api_repr(resource, self)
+
     def job_from_resource(self, resource):
         """Detect correct job type from resource and instantiate.
 
diff --git a/bigquery/google/cloud/bigquery/query.py b/bigquery/google/cloud/bigquery/query.py
index dfa0a422a68ae..c01017af0d30e 100644
--- a/bigquery/google/cloud/bigquery/query.py
+++ b/bigquery/google/cloud/bigquery/query.py
@@ -76,6 +76,12 @@ def __init__(self, query, client, udf_resources=(), query_parameters=()):
         self.query_parameters = query_parameters
         self._job = None
 
+    @classmethod
+    def from_api_repr(cls, api_response, client):
+        instance = cls(None, client)
+        instance._set_properties(api_response)
+        return instance
+
     @classmethod
     def from_query_job(cls, job):
         """Factory: construct from an existing job.
diff --git a/bigquery/tests/system.py b/bigquery/tests/system.py
index 5d0b38ffac41e..3cff1b0017319 100644
--- a/bigquery/tests/system.py
+++ b/bigquery/tests/system.py
@@ -599,6 +599,13 @@ def test_job_cancel(self):
         # raise an error, and that the job completed (in the `retry()`
         # above).
 
+    def test_get_query_results(self):
+        job_id = 'test-get-query-results-' + str(uuid.uuid4())
+        query_job = Config.CLIENT.run_async_query(job_id, 'SELECT 1')
+        query_job.begin()
+        results = Config.CLIENT.get_query_results(job_id)
+        self.assertEqual(results.total_rows, 1)
+
     def test_sync_query_w_legacy_sql_types(self):
         naive = datetime.datetime(2016, 12, 5, 12, 41, 9)
         stamp = '%s %s' % (naive.date().isoformat(), naive.time().isoformat())
diff --git a/bigquery/tests/unit/test_client.py b/bigquery/tests/unit/test_client.py
index e71f3b99fbe0f..33cd59513efc6 100644
--- a/bigquery/tests/unit/test_client.py
+++ b/bigquery/tests/unit/test_client.py
@@ -45,6 +45,64 @@ def test_ctor(self):
         self.assertIs(client._connection.credentials, creds)
         self.assertIs(client._connection.http, http)
 
+    def test_get_job_miss_w_explicit_project_and_timeout(self):
+        from google.cloud.exceptions import NotFound
+
+        project = 'PROJECT'
+        creds = _make_credentials()
+        client = self._make_one(project, creds)
+        conn = client._connection = _Connection()
+
+        with self.assertRaises(NotFound):
+            client.get_query_results(
+                'nothere', project='other-project', timeout_ms=500)
+
+        self.assertEqual(len(conn._requested), 1)
+        req = conn._requested[0]
+        self.assertEqual(req['method'], 'GET')
+        self.assertEqual(
+            req['path'], '/projects/other-project/queries/nothere')
+        self.assertEqual(
+            req['query_params'], {'maxResults': 0, 'timeoutMs': 500})
+
+    def test_get_query_results_hit(self):
+        project = 'PROJECT'
+        job_id = 'query_job'
+        data = {
+            'kind': 'bigquery#getQueryResultsResponse',
+            'etag': 'some-tag',
+            'schema': {
+                'fields': [
+                    {
+                        'name': 'title',
+                        'type': 'STRING',
+                        'mode': 'NULLABLE'
+                    },
+                    {
+                        'name': 'unique_words',
+                        'type': 'INTEGER',
+                        'mode': 'NULLABLE'
+                    }
+                ]
+            },
+            'jobReference': {
+                'projectId': project,
+                'jobId': job_id,
+            },
+            'totalRows': '10',
+            'totalBytesProcessed': '2464625',
+            'jobComplete': True,
+            'cacheHit': False,
+        }
+
+        creds = _make_credentials()
+        client = self._make_one(project, creds)
+        client._connection = _Connection(data)
+        query_results = client.get_query_results(job_id)
+
+        self.assertEqual(query_results.total_rows, 10)
+        self.assertTrue(query_results.complete)
+
     def test_list_projects_defaults(self):
         import six
         from google.cloud.bigquery.client import Project
@@ -607,6 +665,11 @@ def __init__(self, *responses):
         self._requested = []
 
     def api_request(self, **kw):
+        from google.cloud.exceptions import NotFound
         self._requested.append(kw)
+
+        if len(self._responses) == 0:
+            raise NotFound('miss')
+
         response, self._responses = self._responses[0], self._responses[1:]
         return response

From 5efa4bb143931ca257ac4d972c3d4ac3b6cc79a7 Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Mon, 21 Aug 2017 09:21:53 -0700
Subject: [PATCH 209/211] BigQuery: Poll via getQueryResults method. (#3844)

This modifies the QueryJob's Futures interface implementation to poll
using getQueryResults instead of jobs.get. This was recommended by
BigQuery engineers because getQueryResults does HTTP long-polling for
closer to realtime results.
---
 .../google/cloud/bigquery/dbapi/cursor.py     | 13 +--
 bigquery/google/cloud/bigquery/job.py         | 35 ++++----
 bigquery/tests/system.py                      |  3 +-
 bigquery/tests/unit/test_dbapi_cursor.py      |  3 +-
 bigquery/tests/unit/test_job.py               | 80 ++++++++++++++++---
 5 files changed, 97 insertions(+), 37 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/dbapi/cursor.py b/bigquery/google/cloud/bigquery/dbapi/cursor.py
index 167afb45e285f..a5f04e15c674d 100644
--- a/bigquery/google/cloud/bigquery/dbapi/cursor.py
+++ b/bigquery/google/cloud/bigquery/dbapi/cursor.py
@@ -154,20 +154,13 @@ def execute(self, operation, parameters=None, job_id=None):
             query_parameters=query_parameters)
         query_job.use_legacy_sql = False
 
+        # Wait for the query to finish.
         try:
-            query_results = query_job.result()
+            query_job = query_job.result()
         except google.cloud.exceptions.GoogleCloudError:
             raise exceptions.DatabaseError(query_job.errors)
 
-        # Force the iterator to run because the query_results doesn't
-        # have the total_rows populated. See:
-        # https://github.com/GoogleCloudPlatform/google-cloud-python/issues/3506
-        query_iterator = query_results.fetch_data()
-        try:
-            six.next(iter(query_iterator))
-        except StopIteration:
-            pass
-
+        query_results = query_job.query_results()
         self._query_data = iter(
             query_results.fetch_data(max_results=self.arraysize))
         self._set_rowcount(query_results)
diff --git a/bigquery/google/cloud/bigquery/job.py b/bigquery/google/cloud/bigquery/job.py
index 48d440063fa3e..a43aeecbb9316 100644
--- a/bigquery/google/cloud/bigquery/job.py
+++ b/bigquery/google/cloud/bigquery/job.py
@@ -1085,6 +1085,7 @@ def __init__(self, name, query, client,
         self.udf_resources = udf_resources
         self.query_parameters = query_parameters
         self._configuration = _AsyncQueryConfiguration()
+        self._query_results = None
 
     allow_large_results = _TypedProperty('allow_large_results', bool)
     """See
@@ -1284,23 +1285,25 @@ def query_results(self):
         :rtype: :class:`~google.cloud.bigquery.query.QueryResults`
         :returns: results instance
         """
-        from google.cloud.bigquery.query import QueryResults
-        return QueryResults.from_query_job(self)
+        if not self._query_results:
+            self._query_results = self._client.get_query_results(self.name)
+        return self._query_results
 
-    def result(self, timeout=None):
-        """Start the job and wait for it to complete and get the result.
+    def done(self):
+        """Refresh the job and checks if it is complete.
 
-        :type timeout: int
-        :param timeout: How long to wait for job to complete before raising
-            a :class:`TimeoutError`.
+        :rtype: bool
+        :returns: True if the job is complete, False otherwise.
+        """
+        # Do not refresh is the state is already done, as the job will not
+        # change once complete.
+        if self.state != _DONE_STATE:
+            self._query_results = self._client.get_query_results(self.name)
 
-        :rtype: :class:`~google.cloud.bigquery.query.QueryResults`
-        :returns: The query results.
+            # Only reload the job once we know the query is complete.
+            # This will ensure that fields such as the destination table are
+            # correctly populated.
+            if self._query_results.complete:
+                self.reload()
 
-        :raises: :class:`~google.cloud.exceptions.GoogleCloudError` if the job
-            failed or  :class:`TimeoutError` if the job did not complete in the
-            given timeout.
-        """
-        super(QueryJob, self).result(timeout=timeout)
-        # Return a QueryResults instance instead of returning the job.
-        return self.query_results()
+        return self.state == _DONE_STATE
diff --git a/bigquery/tests/system.py b/bigquery/tests/system.py
index 3cff1b0017319..fab7d4b175bd1 100644
--- a/bigquery/tests/system.py
+++ b/bigquery/tests/system.py
@@ -1093,7 +1093,8 @@ def test_async_query_future(self):
             str(uuid.uuid4()), 'SELECT 1')
         query_job.use_legacy_sql = False
 
-        iterator = query_job.result(timeout=JOB_TIMEOUT).fetch_data()
+        query_job = query_job.result(timeout=JOB_TIMEOUT)
+        iterator = query_job.query_results().fetch_data()
         rows = list(iterator)
         self.assertEqual(rows, [(1,)])
 
diff --git a/bigquery/tests/unit/test_dbapi_cursor.py b/bigquery/tests/unit/test_dbapi_cursor.py
index 49a332999f7e8..7351db8f670b8 100644
--- a/bigquery/tests/unit/test_dbapi_cursor.py
+++ b/bigquery/tests/unit/test_dbapi_cursor.py
@@ -42,7 +42,8 @@ def _mock_job(
         mock_job = mock.create_autospec(job.QueryJob)
         mock_job.error_result = None
         mock_job.state = 'DONE'
-        mock_job.result.return_value = self._mock_results(
+        mock_job.result.return_value = mock_job
+        mock_job.query_results.return_value = self._mock_results(
             rows=rows, schema=schema,
             num_dml_affected_rows=num_dml_affected_rows)
         return mock_job
diff --git a/bigquery/tests/unit/test_job.py b/bigquery/tests/unit/test_job.py
index 81d07b122eb00..2a324b3ee347b 100644
--- a/bigquery/tests/unit/test_job.py
+++ b/bigquery/tests/unit/test_job.py
@@ -171,6 +171,7 @@ def _makeResource(self, started=False, ended=False):
         }
 
         if ended:
+            resource['status'] = {'state': 'DONE'}
             resource['statistics']['load']['inputFiles'] = self.INPUT_FILES
             resource['statistics']['load']['inputFileBytes'] = self.INPUT_BYTES
             resource['statistics']['load']['outputBytes'] = self.OUTPUT_BYTES
@@ -310,6 +311,37 @@ def test_ctor_w_schema(self):
                              schema=[full_name, age])
         self.assertEqual(job.schema, [full_name, age])
 
+    def test_done(self):
+        client = _Client(self.PROJECT)
+        resource = self._makeResource(ended=True)
+        job = self._get_target_class().from_api_repr(resource, client)
+        self.assertTrue(job.done())
+
+    def test_result(self):
+        client = _Client(self.PROJECT)
+        resource = self._makeResource(ended=True)
+        job = self._get_target_class().from_api_repr(resource, client)
+
+        result = job.result()
+
+        self.assertIs(result, job)
+
+    def test_result_invokes_begins(self):
+        begun_resource = self._makeResource()
+        done_resource = copy.deepcopy(begun_resource)
+        done_resource['status'] = {'state': 'DONE'}
+        connection = _Connection(begun_resource, done_resource)
+        client = _Client(self.PROJECT, connection=connection)
+        table = _Table()
+        job = self._make_one(self.JOB_NAME, table, [self.SOURCE1], client)
+
+        job.result()
+
+        self.assertEqual(len(connection._requested), 2)
+        begin_request,  reload_request = connection._requested
+        self.assertEqual(begin_request['method'], 'POST')
+        self.assertEqual(reload_request['method'], 'GET')
+
     def test_schema_setter_non_list(self):
         client = _Client(self.PROJECT)
         table = _Table()
@@ -1421,6 +1453,10 @@ def _makeResource(self, started=False, ended=False):
             started, ended)
         config = resource['configuration']['query']
         config['query'] = self.QUERY
+
+        if ended:
+            resource['status'] = {'state': 'DONE'}
+
         return resource
 
     def _verifyBooleanResourceProperties(self, job, config):
@@ -1640,40 +1676,60 @@ def test_cancelled(self):
 
         self.assertTrue(job.cancelled())
 
+    def test_done(self):
+        client = _Client(self.PROJECT)
+        resource = self._makeResource(ended=True)
+        job = self._get_target_class().from_api_repr(resource, client)
+        self.assertTrue(job.done())
+
     def test_query_results(self):
         from google.cloud.bigquery.query import QueryResults
 
-        client = _Client(self.PROJECT)
+        query_resource = {'jobComplete': True}
+        connection = _Connection(query_resource)
+        client = _Client(self.PROJECT, connection=connection)
         job = self._make_one(self.JOB_NAME, self.QUERY, client)
         results = job.query_results()
         self.assertIsInstance(results, QueryResults)
-        self.assertIs(results._job, job)
 
-    def test_result(self):
+    def test_query_results_w_cached_value(self):
         from google.cloud.bigquery.query import QueryResults
 
         client = _Client(self.PROJECT)
         job = self._make_one(self.JOB_NAME, self.QUERY, client)
-        job._properties['status'] = {'state': 'DONE'}
+        query_results = QueryResults(None, client)
+        job._query_results = query_results
+
+        results = job.query_results()
+
+        self.assertIs(results, query_results)
+
+    def test_result(self):
+        client = _Client(self.PROJECT)
+        resource = self._makeResource(ended=True)
+        job = self._get_target_class().from_api_repr(resource, client)
 
         result = job.result()
 
-        self.assertIsInstance(result, QueryResults)
-        self.assertIs(result._job, job)
+        self.assertIs(result, job)
 
     def test_result_invokes_begins(self):
         begun_resource = self._makeResource()
+        incomplete_resource = {'jobComplete': False}
+        query_resource = {'jobComplete': True}
         done_resource = copy.deepcopy(begun_resource)
         done_resource['status'] = {'state': 'DONE'}
-        connection = _Connection(begun_resource, done_resource)
+        connection = _Connection(
+            begun_resource, incomplete_resource, query_resource, done_resource)
         client = _Client(self.PROJECT, connection=connection)
         job = self._make_one(self.JOB_NAME, self.QUERY, client)
 
         job.result()
 
-        self.assertEqual(len(connection._requested), 2)
-        begin_request, reload_request = connection._requested
+        self.assertEqual(len(connection._requested), 4)
+        begin_request, _, query_request, reload_request = connection._requested
         self.assertEqual(begin_request['method'], 'POST')
+        self.assertEqual(query_request['method'], 'GET')
         self.assertEqual(reload_request['method'], 'GET')
 
     def test_result_error(self):
@@ -2088,6 +2144,12 @@ def dataset(self, name):
 
         return Dataset(name, client=self)
 
+    def get_query_results(self, job_id):
+        from google.cloud.bigquery.query import QueryResults
+
+        resource = self._connection.api_request(method='GET')
+        return QueryResults.from_api_repr(resource, self)
+
 
 class _Table(object):
 

From f67bea450746db1f7e6a7bbc314599e7dec3004a Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Mon, 21 Aug 2017 12:11:12 -0700
Subject: [PATCH 210/211] Allow fetching more than the first page when
 max_results is set. (#3845)

* BigQuery: reproduce error fetching multiple results with DB-API.

Add a system test to call `fetchall()` when multiple rows are expected.

* BigQuery: system test to reproduce error of only fetching first page.

This error applies to all BigQuery iterators, not just DB-API.

* BigQuery: allow arraysize to be set after execute()

It was allowed before, but it didn't result in the correct behavior.

* max_results in BigQuery API had a different meaning from HTTPIterator.

In BigQuery it means the page size, but the HTTPIterator it meant "don't
fetch any more pages once you have these many rows."

* Fix lint errors
---
 .../google/cloud/bigquery/dbapi/cursor.py     | 40 +++++++++++--------
 bigquery/google/cloud/bigquery/query.py       |  7 ++--
 bigquery/google/cloud/bigquery/table.py       | 12 ++++--
 bigquery/tests/system.py                      | 12 +++++-
 bigquery/tests/unit/test_dbapi_cursor.py      |  2 +-
 core/google/api/core/page_iterator.py         |  9 +++--
 6 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/bigquery/google/cloud/bigquery/dbapi/cursor.py b/bigquery/google/cloud/bigquery/dbapi/cursor.py
index a5f04e15c674d..0c56d87231fe0 100644
--- a/bigquery/google/cloud/bigquery/dbapi/cursor.py
+++ b/bigquery/google/cloud/bigquery/dbapi/cursor.py
@@ -52,8 +52,7 @@ def __init__(self, connection):
         # a single row at a time.
         self.arraysize = 1
         self._query_data = None
-        self._page_token = None
-        self._has_fetched_all_rows = True
+        self._query_results = None
 
     def close(self):
         """No-op."""
@@ -133,9 +132,8 @@ def execute(self, operation, parameters=None, job_id=None):
         :param job_id: (Optional) The job_id to use. If not set, a job ID
             is generated at random.
         """
+        self._query_data = None
         self._query_results = None
-        self._page_token = None
-        self._has_fetched_all_rows = False
         client = self.connection._client
         if job_id is None:
             job_id = str(uuid.uuid4())
@@ -161,8 +159,7 @@ def execute(self, operation, parameters=None, job_id=None):
             raise exceptions.DatabaseError(query_job.errors)
 
         query_results = query_job.query_results()
-        self._query_data = iter(
-            query_results.fetch_data(max_results=self.arraysize))
+        self._query_results = query_results
         self._set_rowcount(query_results)
         self._set_description(query_results.schema)
 
@@ -178,6 +175,22 @@ def executemany(self, operation, seq_of_parameters):
         for parameters in seq_of_parameters:
             self.execute(operation, parameters)
 
+    def _try_fetch(self, size=None):
+        """Try to start fetching data, if not yet started.
+
+        Mutates self to indicate that iteration has started.
+        """
+        if self._query_results is None:
+            raise exceptions.InterfaceError(
+                'No query results: execute() must be called before fetch.')
+
+        if size is None:
+            size = self.arraysize
+
+        if self._query_data is None:
+            self._query_data = iter(
+                self._query_results.fetch_data(max_results=size))
+
     def fetchone(self):
         """Fetch a single row from the results of the last ``execute*()`` call.
 
@@ -188,10 +201,7 @@ def fetchone(self):
         :raises: :class:`~google.cloud.bigquery.dbapi.InterfaceError`
             if called before ``execute()``.
         """
-        if self._query_data is None:
-            raise exceptions.InterfaceError(
-                'No query results: execute() must be called before fetch.')
-
+        self._try_fetch()
         try:
             return six.next(self._query_data)
         except StopIteration:
@@ -215,17 +225,17 @@ def fetchmany(self, size=None):
         :raises: :class:`~google.cloud.bigquery.dbapi.InterfaceError`
             if called before ``execute()``.
         """
-        if self._query_data is None:
-            raise exceptions.InterfaceError(
-                'No query results: execute() must be called before fetch.')
         if size is None:
             size = self.arraysize
 
+        self._try_fetch(size=size)
         rows = []
+
         for row in self._query_data:
             rows.append(row)
             if len(rows) >= size:
                 break
+
         return rows
 
     def fetchall(self):
@@ -236,9 +246,7 @@ def fetchall(self):
         :raises: :class:`~google.cloud.bigquery.dbapi.InterfaceError`
             if called before ``execute()``.
         """
-        if self._query_data is None:
-            raise exceptions.InterfaceError(
-                'No query results: execute() must be called before fetch.')
+        self._try_fetch()
         return [row for row in self._query_data]
 
     def setinputsizes(self, sizes):
diff --git a/bigquery/google/cloud/bigquery/query.py b/bigquery/google/cloud/bigquery/query.py
index c01017af0d30e..185b68deb1046 100644
--- a/bigquery/google/cloud/bigquery/query.py
+++ b/bigquery/google/cloud/bigquery/query.py
@@ -440,6 +440,9 @@ def fetch_data(self, max_results=None, page_token=None, start_index=None,
         if timeout_ms is not None:
             params['timeoutMs'] = timeout_ms
 
+        if max_results is not None:
+            params['maxResults'] = max_results
+
         path = '/projects/%s/queries/%s' % (self.project, self.name)
         iterator = page_iterator.HTTPIterator(
             client=client,
@@ -448,12 +451,10 @@ def fetch_data(self, max_results=None, page_token=None, start_index=None,
             item_to_value=_item_to_row,
             items_key='rows',
             page_token=page_token,
-            max_results=max_results,
             page_start=_rows_page_start_query,
+            next_token='pageToken',
             extra_params=params)
         iterator.query_result = self
-        # Over-ride the key used to retrieve the next page token.
-        iterator._NEXT_TOKEN = 'pageToken'
         return iterator
 
 
diff --git a/bigquery/google/cloud/bigquery/table.py b/bigquery/google/cloud/bigquery/table.py
index b26125ec9ef4d..9d100c06c7113 100644
--- a/bigquery/google/cloud/bigquery/table.py
+++ b/bigquery/google/cloud/bigquery/table.py
@@ -722,6 +722,11 @@ def fetch_data(self, max_results=None, page_token=None, client=None):
         if len(self._schema) == 0:
             raise ValueError(_TABLE_HAS_NO_SCHEMA)
 
+        params = {}
+
+        if max_results is not None:
+            params['maxResults'] = max_results
+
         client = self._require_client(client)
         path = '%s/data' % (self.path,)
         iterator = page_iterator.HTTPIterator(
@@ -731,11 +736,10 @@ def fetch_data(self, max_results=None, page_token=None, client=None):
             item_to_value=_item_to_row,
             items_key='rows',
             page_token=page_token,
-            max_results=max_results,
-            page_start=_rows_page_start)
+            page_start=_rows_page_start,
+            next_token='pageToken',
+            extra_params=params)
         iterator.schema = self._schema
-        # Over-ride the key used to retrieve the next page token.
-        iterator._NEXT_TOKEN = 'pageToken'
         return iterator
 
     def row_from_mapping(self, mapping):
diff --git a/bigquery/tests/system.py b/bigquery/tests/system.py
index fab7d4b175bd1..701da91659db3 100644
--- a/bigquery/tests/system.py
+++ b/bigquery/tests/system.py
@@ -747,6 +747,16 @@ def test_dbapi_w_standard_sql_types(self):
             row = Config.CURSOR.fetchone()
             self.assertIsNone(row)
 
+    def test_dbapi_fetchall(self):
+        query = 'SELECT * FROM UNNEST([(1, 2), (3, 4), (5, 6)])'
+
+        for arraysize in range(1, 5):
+            Config.CURSOR.execute(query)
+            self.assertEqual(Config.CURSOR.rowcount, 3, "expected 3 rows")
+            Config.CURSOR.arraysize = arraysize
+            rows = Config.CURSOR.fetchall()
+            self.assertEqual(rows, [(1, 2), (3, 4), (5, 6)])
+
     def _load_table_for_dml(self, rows, dataset_name, table_name):
         from google.cloud._testing import _NamedTemporaryFile
 
@@ -1084,7 +1094,7 @@ def test_large_query_w_public_data(self):
         query.use_legacy_sql = False
         query.run()
 
-        iterator = query.fetch_data()
+        iterator = query.fetch_data(max_results=100)
         rows = list(iterator)
         self.assertEqual(len(rows), LIMIT)
 
diff --git a/bigquery/tests/unit/test_dbapi_cursor.py b/bigquery/tests/unit/test_dbapi_cursor.py
index 7351db8f670b8..be327a8962a27 100644
--- a/bigquery/tests/unit/test_dbapi_cursor.py
+++ b/bigquery/tests/unit/test_dbapi_cursor.py
@@ -141,8 +141,8 @@ def test_fetchmany_w_arraysize(self):
                     (7, 8, 9),
                 ]))
         cursor = connection.cursor()
-        cursor.arraysize = 2
         cursor.execute('SELECT a, b, c;')
+        cursor.arraysize = 2
         rows = cursor.fetchmany()
         self.assertEqual(len(rows), 2)
         self.assertEqual(rows[0], (1, 2, 3))
diff --git a/core/google/api/core/page_iterator.py b/core/google/api/core/page_iterator.py
index 23c469f9bc1d9..3a38c100cd952 100644
--- a/core/google/api/core/page_iterator.py
+++ b/core/google/api/core/page_iterator.py
@@ -275,6 +275,8 @@ class HTTPIterator(Iterator):
             signature takes the :class:`Iterator` that started the page,
             the :class:`Page` that was started and the dictionary containing
             the page response.
+        next_token (str): The name of the field used in the response for page
+            tokens.
 
     .. autoattribute:: pages
     """
@@ -283,13 +285,13 @@ class HTTPIterator(Iterator):
     _PAGE_TOKEN = 'pageToken'
     _MAX_RESULTS = 'maxResults'
     _NEXT_TOKEN = 'nextPageToken'
-    _RESERVED_PARAMS = frozenset([_PAGE_TOKEN, _MAX_RESULTS])
+    _RESERVED_PARAMS = frozenset([_PAGE_TOKEN])
     _HTTP_METHOD = 'GET'
 
     def __init__(self, client, api_request, path, item_to_value,
                  items_key=_DEFAULT_ITEMS_KEY,
                  page_token=None, max_results=None, extra_params=None,
-                 page_start=_do_nothing_page_start):
+                 page_start=_do_nothing_page_start, next_token=_NEXT_TOKEN):
         super(HTTPIterator, self).__init__(
             client, item_to_value, page_token=page_token,
             max_results=max_results)
@@ -298,6 +300,7 @@ def __init__(self, client, api_request, path, item_to_value,
         self._items_key = items_key
         self.extra_params = extra_params
         self._page_start = page_start
+        self._next_token = next_token
         # Verify inputs / provide defaults.
         if self.extra_params is None:
             self.extra_params = {}
@@ -327,7 +330,7 @@ def _next_page(self):
             items = response.get(self._items_key, ())
             page = Page(self, items, self._item_to_value)
             self._page_start(self, page, response)
-            self.next_page_token = response.get(self._NEXT_TOKEN)
+            self.next_page_token = response.get(self._next_token)
             return page
         else:
             return None

From 38aa94e866a826697358b598ed1b1e3940f0f96f Mon Sep 17 00:00:00 2001
From: Ernest Landrito <landrito@google.com>
Date: Tue, 22 Aug 2017 12:17:22 -0700
Subject: [PATCH 211/211] Add dlp to CI

---
 .circleci/config.yml |  6 ++++++
 dlp/nox.py           | 37 +++++++++++++++++++++++++++++++++++--
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2352d187edc1f..b9366a8685f6c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,6 +54,12 @@ jobs:
             if [[ -n $(grep datastore ~/target_packages) ]]; then
               nox -f datastore/nox.py
             fi
+      - run:
+          name: Run tests - google.cloud.dlp
+          command: |
+            if [[ -n $(grep dlp ~/target_packages)  ]]; then
+              nox -f dlp/nox.py
+            fi
       - run:
           name: Run tests - google.cloud.dns
           command: |
diff --git a/dlp/nox.py b/dlp/nox.py
index 0f6bd713afbe2..41ec26f1bed34 100644
--- a/dlp/nox.py
+++ b/dlp/nox.py
@@ -14,6 +14,8 @@
 
 from __future__ import absolute_import
 
+import os
+
 import nox
 
 
@@ -25,12 +27,43 @@ def unit_tests(session, python_version):
     # Run unit tests against all supported versions of Python.
     session.interpreter = 'python{}'.format(python_version)
 
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'unit-' + python_version
+
     # Install all test dependencies, then install this package in-place.
-    session.install('mock', 'pytest', 'pytest-cov')
+    session.install('mock', 'pytest')
     session.install('-e', '.')
 
     # Run py.test against the unit tests.
-    session.run('py.test', '--quiet', 'tests/')
+    session.run('py.test', '--quiet', os.path.join('tests', 'unit'))
+
+
+@nox.session
+@nox.parametrize('python_version', ['2.7', '3.6'])
+def system_tests(session, python_version):
+    """Run the system test suite."""
+
+    # Sanity check: Only run system tests if the environment variable is set.
+    if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
+        session.skip('Credentials must be set via environment variable.')
+
+    # Run unit tests against all supported versions of Python.
+    session.interpreter = 'python{}'.format(python_version)
+
+    # Set the virtualenv dirname.
+    session.virtualenv_dirname = 'sys-' + python_version
+
+    # Install all test dependencies, then install this package in-place.
+    session.install('pytest')
+    session.install('-e', '.')
+
+    # Run py.test against the unit tests.
+    session.run(
+        'py.test',
+        '--quiet',
+        os.path.join('tests', 'system'),
+        *session.posargs)
+
 
 @nox.session
 def lint_setup_py(session):