Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixing some more references
Change-Id: Ica99e2e27a9f6202c41fc234f3eeb0544b97e080
  • Loading branch information
Jon Wayne Parrott
Jon Wayne Parrott committed Sep 30, 2016
commit 7e46702d1b4d064a6fe7427094c73336e833eeb4
2 changes: 1 addition & 1 deletion bigquery/dml/insert_sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
# [START insert_sql]
import argparse

from gcloud import bigquery
from google.cloud import bigquery


def insert_sql(project, default_dataset, sql_path):
Expand Down
2 changes: 1 addition & 1 deletion bigquery/dml/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
flake8==3.0.4
gcloud==0.18.3
google-cloud-bigquery==0.20.0
PyMySQL==0.7.9
six==1.10.0
SQLAlchemy==1.1.0b3
12 changes: 6 additions & 6 deletions datastore/api/snippets.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import datetime
from pprint import pprint

import gcloud
import google.cloud.exceptions
from google.cloud import datastore


Expand Down Expand Up @@ -539,7 +539,7 @@ def inequality_invalid(client):

return list(query.fetch())

except gcloud.exceptions.BadRequest:
except google.cloud.exceptions.BadRequest:
pass


Expand Down Expand Up @@ -579,7 +579,7 @@ def inequality_sort_invalid_not_same(client):

return list(query.fetch())

except gcloud.exceptions.BadRequest:
except google.cloud.exceptions.BadRequest:
pass


Expand All @@ -593,7 +593,7 @@ def inequality_sort_invalid_not_first(client):

return list(query.fetch())

except gcloud.exceptions.BadRequest:
except google.cloud.exceptions.BadRequest:
pass


Expand Down Expand Up @@ -661,7 +661,7 @@ def transfer_funds(client, from_key, to_key, amount):
for _ in range(5):
try:
transfer_funds(client, account1.key, account2.key, 50)
except gcloud.exceptions.Conflict:
except google.cloud.exceptions.Conflict:
continue
# [END transactional_retry]

Expand Down Expand Up @@ -787,7 +787,7 @@ def property_by_kind_run_query(client):

def eventual_consistent_query(client):
# [START eventual_consistent_query]
# Read consistency cannot be specified in gcloud-python.
# Read consistency cannot be specified in google-cloud-python.
# [END eventual_consistent_query]
pass

Expand Down
8 changes: 4 additions & 4 deletions storage/cloud-client/acl_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

from google.cloud import storage
import gcloud.storage.acl
import google.cloud.storage.acl
import pytest

import acl
Expand All @@ -27,8 +27,8 @@
def test_bucket(cloud_config):
"""Yields a bucket that resets its acl after the test completes."""
bucket = storage.Client().bucket(cloud_config.storage_bucket)
acl = gcloud.storage.acl.BucketACL(bucket)
object_default_acl = gcloud.storage.acl.DefaultObjectACL(bucket)
acl = google.cloud.storage.acl.BucketACL(bucket)
object_default_acl = google.cloud.storage.acl.DefaultObjectACL(bucket)
acl.reload()
object_default_acl.reload()
yield bucket
Expand All @@ -42,7 +42,7 @@ def test_blob(cloud_config):
bucket = storage.Client().bucket(cloud_config.storage_bucket)
blob = bucket.blob('storage_acl_test_sigil')
blob.upload_from_string('Hello, is it me you\'re looking for?')
acl = gcloud.storage.acl.ObjectACL(blob)
acl = google.cloud.storage.acl.ObjectACL(blob)
acl.reload()
yield blob
acl.save()
Expand Down